{"action":"created","issue":{"url":"https://api.github.com/repos/percona/percona-server/issues/125","labels_url":"https://api.github.com/repos/percona/percona-server/issues/125/labels{/name}","comments_url":"https://api.github.com/repos/percona/percona-server/issues/125/comments","events_url":"https://api.github.com/repos/percona/percona-server/issues/125/events","html_url":"https://github.com/percona/percona-server/pull/125","id":99613305,"number":125,"title":"TokuDB merge with Percona Server (BLD-287)","user":{"login":"tplavcic","id":4625195,"avatar_url":"https://avatars.githubusercontent.com/u/4625195?v=3","gravatar_id":"","url":"https://api.github.com/users/tplavcic","html_url":"https://github.com/tplavcic","followers_url":"https://api.github.com/users/tplavcic/followers","following_url":"https://api.github.com/users/tplavcic/following{/other_user}","gists_url":"https://api.github.com/users/tplavcic/gists{/gist_id}","starred_url":"https://api.github.com/users/tplavcic/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tplavcic/subscriptions","organizations_url":"https://api.github.com/users/tplavcic/orgs","repos_url":"https://api.github.com/users/tplavcic/repos","events_url":"https://api.github.com/users/tplavcic/events{/privacy}","received_events_url":"https://api.github.com/users/tplavcic/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":{"login":"laurynas-biveinis","id":58894,"avatar_url":"https://avatars.githubusercontent.com/u/58894?v=3","gravatar_id":"","url":"https://api.github.com/users/laurynas-biveinis","html_url":"https://github.com/laurynas-biveinis","followers_url":"https://api.github.com/users/laurynas-biveinis/followers","following_url":"https://api.github.com/users/laurynas-biveinis/following{/other_user}","gists_url":"https://api.github.com/users/laurynas-biveinis/gists{/gist_id}","starred_url":"https://api.github.com/users/laurynas-biveinis/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/laurynas-biveinis/subscriptions","organizations_url":"https://api.github.com/users/laurynas-biveinis/orgs","repos_url":"https://api.github.com/users/laurynas-biveinis/repos","events_url":"https://api.github.com/users/laurynas-biveinis/events{/privacy}","received_events_url":"https://api.github.com/users/laurynas-biveinis/received_events","type":"User","site_admin":false},"milestone":null,"comments":17,"created_at":"2015-08-07T09:26:35Z","updated_at":"2015-09-08T18:46:54Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/percona/percona-server/pulls/125","html_url":"https://github.com/percona/percona-server/pull/125","diff_url":"https://github.com/percona/percona-server/pull/125.diff","patch_url":"https://github.com/percona/percona-server/pull/125.patch"},"body":"**TICKET: BLD-287 - TokuDB merge with percona server**\r\nMerge TokuDB repositories to Percona Server source\r\nCheckout two other repositories in build jobs as they are needed also\r\nAdded PerconaFT and Percona-TokuBackup repositories as submodules\r\n\"tokutek-merge-pkg-changes\" branch has one commit for build/packaging changes which are needed also.\r\n\r\nMERGED REPOS:\r\nhttps://github.com/percona/tokudb-engine.git\r\nhttps://github.com/percona/tokudb-percona-server-5.6.git\r\nhttps://github.com/percona/tokudb-backup-plugin.git\r\n\r\nREPOS ADDED AS SUBMODULES:\r\nhttps://github.com/percona/Percona-TokuBackup.git => plugin/tokudb_backup/Percona-TokuBackup\r\nhttps://github.com/percona/PerconaFT.git => storage/tokudb/PerconaFT\r\n\r\n**FULL OUTPUT OF GIT COMMANDS USED TO CREATE THIS MERGE BRANCH:**\r\n*NOTICE: History seems to be preserved but there's no tags (in chat with George it was concluded we don't need them)*\r\n*Also on the branch there's one last commit which is not from merge but to remove not needed files*\r\n**1:**\r\ngit checkout 5.6\r\ngit checkout -b tokutek-merge\r\ngit remote add repo-tokudb-engine https://github.com/percona/tokudb-engine.git\r\ngit fetch repo-tokudb-engine\r\ngit checkout -b tokudb-engine repo-tokudb-engine/master\r\nmkdir tokudb-engine\r\ngit mv COPYING tokudb-engine\r\ngit mv doc tokudb-engine\r\ngit mv mysql-test/suite/rpl mysql-test/suite/tokudb.rpl\r\ngit mv tools tokudb-engine\r\ngit mv scripts tokudb-engine\r\ngit mv README.md tokudb-engine\r\ngit add .\r\ngit commit -m \"Merged tokudb-engine repo and created temp tokudb-engine directory\"\r\ngit checkout tokutek-merge\r\ngit merge -m \"Merge branch 'tokudb-engine' into tokutek-merge\" tokudb-engine\r\ngit checkout --ours .gitignore\r\ngit add .gitignore\r\ngit commit -m \"Merge branch 'tokudb-engine' into tokutek-merge\"\r\n\r\n**2:**\r\ngit remote add repo-tokudb-percona-server-5.6 https://github.com/percona/tokudb-percona-server-5.6.git\r\ngit fetch repo-tokudb-percona-server-5.6\r\ngit checkout -b tokudb-percona-server-5.6 repo-tokudb-percona-server-5.6/master\r\nmkdir tokudb-percona-server-5.6\r\ngit mv mysql-test/suite/rpl mysql-test/suite/tokudb.rpl\r\ngit mv mysql-test/suite/parts mysql-test/suite/tokudb.parts\r\ngit mv *.bash tokudb-percona-server-5.6\r\ngit add .\r\ngit commit -m \"Checked out tokudb-percona-server-5.6 repo into tokudb-percona-server-5.6 branch\"\r\ngit checkout tokutek-merge\r\ngit merge -s theirs -m \"Merge branch 'tokudb-percona-server-5.6' into tokutek-merge\" tokudb-percona-server-5.6\r\n\r\n**3:**\r\ngit remote add repo-tokudb-backup-plugin https://github.com/percona/tokudb-backup-plugin.git\r\ngit fetch repo-tokudb-backup-plugin\r\ngit checkout -b tokudb-backup-plugin repo-tokudb-backup-plugin/master\r\nmkdir -p plugin/tokudb-backup-plugin\r\ngit mv backup plugin/tokudb-backup-plugin\r\ngit mv CMakeLists.txt plugin/tokudb-backup-plugin\r\ngit mv COPYING plugin/tokudb-backup-plugin\r\ngit mv README.md plugin/tokudb-backup-plugin\r\ngit mv README_tokudb_backup plugin/tokudb-backup-plugin\r\ngit mv tokudb_backup.cc plugin/tokudb-backup-plugin\r\ngit add .\r\ngit commit -m \"Checked out tokudb-backup-plugin repo into tokudb-backup-plugin branch\"\r\ngit checkout tokutek-merge\r\ngit merge -m \"Merge branch 'tokudb-backup-plugin' into tokutek-merge\" tokudb-backup-plugin\r\n\r\n**TEST BUILDS:**\r\nRELEASE BUILD (new job): http://jenkins.percona.com/view/TEST/job/percona-server-5.6-RELEASE-new/12/\r\nPARAM BUILD (changed existing job): http://jenkins.percona.com/job/percona-server-5.6-param/933/\r\n*The builds have been run on the \"tokutek-merge-pkg-changes\" branch since there's at least one change there which is needed for it to work fully*\r\nThere seemed to be some issue on debian 7 - release build only (param build) - but I think it was temporary only, so I'll rerun that to check\r\n"},"comment":{"url":"https://api.github.com/repos/percona/percona-server/issues/comments/138666082","html_url":"https://github.com/percona/percona-server/pull/125#issuecomment-138666082","issue_url":"https://api.github.com/repos/percona/percona-server/issues/125","id":138666082,"user":{"login":"georgelorchpercona","id":5247783,"avatar_url":"https://avatars.githubusercontent.com/u/5247783?v=3","gravatar_id":"","url":"https://api.github.com/users/georgelorchpercona","html_url":"https://github.com/georgelorchpercona","followers_url":"https://api.github.com/users/georgelorchpercona/followers","following_url":"https://api.github.com/users/georgelorchpercona/following{/other_user}","gists_url":"https://api.github.com/users/georgelorchpercona/gists{/gist_id}","starred_url":"https://api.github.com/users/georgelorchpercona/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/georgelorchpercona/subscriptions","organizations_url":"https://api.github.com/users/georgelorchpercona/orgs","repos_url":"https://api.github.com/users/georgelorchpercona/repos","events_url":"https://api.github.com/users/georgelorchpercona/events{/privacy}","received_events_url":"https://api.github.com/users/georgelorchpercona/received_events","type":"User","site_admin":false},"created_at":"2015-09-08T18:46:54Z","updated_at":"2015-09-08T18:46:54Z","body":"+1"}}