Re: [Maria-developers] XtraDB merge into MariaDB
Vadim Tkachenko <vadim@percona.com> writes:
Kristian,
Now lp:percona-xtradb/release-6 and lp:percona-xtradb should be synchronized and be up-to-date.
I still do not see that this is the case :-( - Last push to lp:percona-xtradb is from June 26, and does not appear up-to-date with latest XtraDB6 release. - lp:percona-xtradb/release-6 does not exist. Maybe a typo for lp:~percona-dev/percona-xtradb/release-6 ? - I diffed lp:~percona-dev/percona-xtradb/release-6 against the XtraDB source tarball on http://www.percona.com/mysql/xtradb/5.1.36-6/source/. They do not match. The bzr branch is missing two bug fixes, on the other hand the tarball has #define PERCONA_INNODB_VERSION 5a which seems to be wrong (diff appended at the end of the mail). Ok. To proceed, I have now committed the two missing bugfixes and pushed here: lp:~maria-captains/percona-xtradb/release-6-fixed I will use this as the basis for my merge. Maybe you can pull that into lp:~percona-dev/percona-xtradb/release-6, or I will handle the conflict if necessary in the next merge (should be no problem).
Please let me know if there something else from our side.
Only that I feel a bit stupid having these difficulties finding out what tree to merge. Seems to me there is something I do not understand correctly... is there some mailing list or IRC channel or something I should follow to better keep track of XtraDB development? - Kristian. ----------------------------------------------------------------------- $ diff -u --recursive . ../mysql-5.1.36-xtradb6/storage/innobase Only in .: .bzr diff -u --recursive ./dict/dict0dict.c ../mysql-5.1.36-xtradb6/storage/innobase/dict/dict0dict.c --- ./dict/dict0dict.c 2009-08-03 08:30:02.000000000 +0200 +++ ../mysql-5.1.36-xtradb6/storage/innobase/dict/dict0dict.c 2009-07-22 20:07:56.000000000 +0200 @@ -3049,7 +3049,7 @@ } else if (quote) { /* Within quotes: do not look for starting quotes or comments. */ - } else if (*sptr == '"' || *sptr == '`') { + } else if (*sptr == '"' || *sptr == '`' || *sptr == '\'') { /* Starting quote: remember the quote character. */ quote = *sptr; } else if (*sptr == '#' diff -u --recursive ./handler/ha_innodb.cc ../mysql-5.1.36-xtradb6/storage/innobase/handler/ha_innodb.cc --- ./handler/ha_innodb.cc 2009-08-03 08:30:02.000000000 +0200 +++ ../mysql-5.1.36-xtradb6/storage/innobase/handler/ha_innodb.cc 2009-07-22 20:07:56.000000000 +0200 @@ -9319,7 +9319,8 @@ /* Check that row format didn't change */ if ((info->used_fields & HA_CREATE_USED_ROW_FORMAT) && - get_row_type() != info->row_type) { + get_row_type() != ((info->row_type == ROW_TYPE_DEFAULT) + ? ROW_TYPE_COMPACT : info->row_type)) { return(COMPATIBLE_DATA_NO); } Only in ../mysql-5.1.36-xtradb6/storage/innobase/handler: ha_innodb.cc.orig Only in ../mysql-5.1.36-xtradb6/storage/innobase/handler: innodb_patch_info.h.orig Only in ../mysql-5.1.36-xtradb6/storage/innobase/handler: i_s.cc.orig diff -u --recursive ./include/univ.i ../mysql-5.1.36-xtradb6/storage/innobase/include/univ.i --- ./include/univ.i 2009-08-03 08:30:02.000000000 +0200 +++ ../mysql-5.1.36-xtradb6/storage/innobase/include/univ.i 2009-07-22 20:07:56.000000000 +0200 @@ -35,7 +35,7 @@ #define INNODB_VERSION_MAJOR 1 #define INNODB_VERSION_MINOR 0 #define INNODB_VERSION_BUGFIX 3 -#define PERCONA_INNODB_VERSION 6a +#define PERCONA_INNODB_VERSION 5a /* The following is the InnoDB version as shown in SELECT plugin_version FROM information_schema.plugins; Only in ./mysql-test/patches: mysqlbinlog_row_big.diff Only in ./mysql-test/patches: variables-big.diff
Kristian, That's strange, may be I mixed something when I did push. Yes, repositories are lp:percona-xtradb and lp:~percona-dev/percona-xtradb/release-6 I think all confusing comes from fact (you noticed) we do main development in lp:~percona-dev/percona-xtradb/extensions-1.0 working with patches, and after that periodically do sync of full source code into lp:percona-xtradb I will include your changes in lp:~maria-captains/percona-xtradb/release-6-fixed to lp:~percona-dev/percona-xtradb/release-6 We have maillist http://groups.google.com/group/percona-discussion which is not very active. So far best way to track development is to track changes in lp:~percona-dev/percona-xtradb/extensions-1.0 Kristian Nielsen wrote:
Vadim Tkachenko <vadim@percona.com> writes:
Kristian,
Now lp:percona-xtradb/release-6 and lp:percona-xtradb should be synchronized and be up-to-date.
I still do not see that this is the case :-(
- Last push to lp:percona-xtradb is from June 26, and does not appear up-to-date with latest XtraDB6 release.
- lp:percona-xtradb/release-6 does not exist. Maybe a typo for lp:~percona-dev/percona-xtradb/release-6 ?
- I diffed lp:~percona-dev/percona-xtradb/release-6 against the XtraDB source tarball on http://www.percona.com/mysql/xtradb/5.1.36-6/source/. They do not match. The bzr branch is missing two bug fixes, on the other hand the tarball has #define PERCONA_INNODB_VERSION 5a which seems to be wrong (diff appended at the end of the mail).
Ok. To proceed, I have now committed the two missing bugfixes and pushed here:
lp:~maria-captains/percona-xtradb/release-6-fixed
I will use this as the basis for my merge. Maybe you can pull that into lp:~percona-dev/percona-xtradb/release-6, or I will handle the conflict if necessary in the next merge (should be no problem).
Please let me know if there something else from our side.
Only that I feel a bit stupid having these difficulties finding out what tree to merge. Seems to me there is something I do not understand correctly... is there some mailing list or IRC channel or something I should follow to better keep track of XtraDB development?
- Kristian.
----------------------------------------------------------------------- $ diff -u --recursive . ../mysql-5.1.36-xtradb6/storage/innobase Only in .: .bzr diff -u --recursive ./dict/dict0dict.c ../mysql-5.1.36-xtradb6/storage/innobase/dict/dict0dict.c --- ./dict/dict0dict.c 2009-08-03 08:30:02.000000000 +0200 +++ ../mysql-5.1.36-xtradb6/storage/innobase/dict/dict0dict.c 2009-07-22 20:07:56.000000000 +0200 @@ -3049,7 +3049,7 @@ } else if (quote) { /* Within quotes: do not look for starting quotes or comments. */ - } else if (*sptr == '"' || *sptr == '`') { + } else if (*sptr == '"' || *sptr == '`' || *sptr == '\'') { /* Starting quote: remember the quote character. */ quote = *sptr; } else if (*sptr == '#' diff -u --recursive ./handler/ha_innodb.cc ../mysql-5.1.36-xtradb6/storage/innobase/handler/ha_innodb.cc --- ./handler/ha_innodb.cc 2009-08-03 08:30:02.000000000 +0200 +++ ../mysql-5.1.36-xtradb6/storage/innobase/handler/ha_innodb.cc 2009-07-22 20:07:56.000000000 +0200 @@ -9319,7 +9319,8 @@
/* Check that row format didn't change */ if ((info->used_fields & HA_CREATE_USED_ROW_FORMAT) && - get_row_type() != info->row_type) { + get_row_type() != ((info->row_type == ROW_TYPE_DEFAULT) + ? ROW_TYPE_COMPACT : info->row_type)) {
return(COMPATIBLE_DATA_NO); } Only in ../mysql-5.1.36-xtradb6/storage/innobase/handler: ha_innodb.cc.orig Only in ../mysql-5.1.36-xtradb6/storage/innobase/handler: innodb_patch_info.h.orig Only in ../mysql-5.1.36-xtradb6/storage/innobase/handler: i_s.cc.orig diff -u --recursive ./include/univ.i ../mysql-5.1.36-xtradb6/storage/innobase/include/univ.i --- ./include/univ.i 2009-08-03 08:30:02.000000000 +0200 +++ ../mysql-5.1.36-xtradb6/storage/innobase/include/univ.i 2009-07-22 20:07:56.000000000 +0200 @@ -35,7 +35,7 @@ #define INNODB_VERSION_MAJOR 1 #define INNODB_VERSION_MINOR 0 #define INNODB_VERSION_BUGFIX 3 -#define PERCONA_INNODB_VERSION 6a +#define PERCONA_INNODB_VERSION 5a
/* The following is the InnoDB version as shown in SELECT plugin_version FROM information_schema.plugins; Only in ./mysql-test/patches: mysqlbinlog_row_big.diff Only in ./mysql-test/patches: variables-big.diff
-- Vadim Tkachenko, CTO Percona Inc. ICQ: 369-510-335, Skype: vadimtk153, Phone +1-888-401-3403 MySQL Performance Blog - http://www.mysqlperformanceblog.com MySQL Consulting http://www.percona.com/
Ok, XtraDB 6 is now pushed to MariaDB, as a replacement for InnoDB! Merging was ok. There are a number of conflicts which need to be handled, but that seems inevitable, and bzr seems to handle things ok (if a bit clunky). There are no further issues know at the moment. Thanks for working with me to get this achieved! Vadim Tkachenko <vadim@percona.com> writes:
I think all confusing comes from fact (you noticed) we do main development in lp:~percona-dev/percona-xtradb/extensions-1.0 working with patches, and after that periodically do sync of full source code into lp:percona-xtradb
Yes, I agree. Understanding this, I think things will work a bit more smoothly going forward. I understand the need to do main development in extensions-1.0 as a quilt series. I think there is no better way than to continue to sync periodically of full source code into lp:percona-xtradb. Now that I better understand the issue I can also help with that as needed. It's just inherently complex to keep the code merged between MySQL, Oracle, Drizzle, Percona, and MariaDB, so current method is probably as good as it gets.
We have maillist http://groups.google.com/group/percona-discussion which is not very active. So far best way to track development is to track changes in lp:~percona-dev/percona-xtradb/extensions-1.0
Sounds good, I have subscribed to the maillist and the branch. - Kristian.
Kristian, Yes I saw. Thank you for help! I did blog about :) http://www.mysqlperformanceblog.com/2009/08/03/xtradb-has-been-commited-to-m... Kristian Nielsen wrote:
Ok, XtraDB 6 is now pushed to MariaDB, as a replacement for InnoDB!
Merging was ok. There are a number of conflicts which need to be handled, but that seems inevitable, and bzr seems to handle things ok (if a bit clunky).
There are no further issues know at the moment.
Thanks for working with me to get this achieved!
Vadim Tkachenko <vadim@percona.com> writes:
I think all confusing comes from fact (you noticed) we do main development in lp:~percona-dev/percona-xtradb/extensions-1.0 working with patches, and after that periodically do sync of full source code into lp:percona-xtradb
Yes, I agree. Understanding this, I think things will work a bit more smoothly going forward.
I understand the need to do main development in extensions-1.0 as a quilt series. I think there is no better way than to continue to sync periodically of full source code into lp:percona-xtradb. Now that I better understand the issue I can also help with that as needed.
It's just inherently complex to keep the code merged between MySQL, Oracle, Drizzle, Percona, and MariaDB, so current method is probably as good as it gets.
We have maillist http://groups.google.com/group/percona-discussion which is not very active. So far best way to track development is to track changes in lp:~percona-dev/percona-xtradb/extensions-1.0
Sounds good, I have subscribed to the maillist and the branch.
- Kristian.
-- Vadim Tkachenko, CTO Percona Inc. ICQ: 369-510-335, Skype: vadimtk153, Phone +1-888-401-3403 MySQL Performance Blog - http://www.mysqlperformanceblog.com MySQL Consulting http://www.percona.com/
participants (2)
-
Kristian Nielsen -
Vadim Tkachenko