Re: [Maria-developers] XtraDB merge into MariaDB
Kristian, Yes I saw. Thank you for help! I did blog about :) http://www.mysqlperformanceblog.com/2009/08/03/xtradb-has-been-commited-to-mariadb/ 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 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/ ___ Mailing list: https://launchpad.net/~maria-developers Post to : maria-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~maria-developers More help : https://help.launchpad.net/ListHelp
Re: [Maria-developers] XtraDB merge into MariaDB
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 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. ___ Mailing list: https://launchpad.net/~maria-developers Post to : maria-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~maria-developers More help : https://help.launchpad.net/ListHelp
Re: [Maria-developers] XtraDB merge into MariaDB
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 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.0 +0200
> +++ ../mysql-5.1.36-xtradb6/storage/innobase/dict/dict0dict.c 2009-07-22
> 20:07:56.0 +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.0 +0200
> +++ ../mysql-5.1.36-xtradb6/storage/innobase/handler/ha_innodb.cc
> 2009-07-22 20:07:56.0 +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.i2009-08-03 08:30:02.0 +0200
> +++ ../mysql-5.1.36-xtradb6/storage/innobase/include/univ.i 2009-07-22
> 20:07:56.0 +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/
Re: [Maria-developers] XtraDB merge into MariaDB
Vadim Tkachenko 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.0 +0200
+++ ../mysql-5.1.36-xtradb6/storage/innobase/dict/dict0dict.c 2009-07-22
20:07:56.0 +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.0 +0200
+++ ../mysql-5.1.36-xtradb6/storage/innobase/handler/ha_innodb.cc
2009-07-22 20:07:56.0 +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.i2009-08-03 08:30:02.0 +0200
+++ ../mysql-5.1.36-xtradb6/storage/innobase/include/univ.i 2009-07-22
20:07:56.0 +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
___
Mailing list: https://launchpad.net/~maria-developers
Post to : maria-developers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~maria-developers
More help : https://help.launchpad.net/ListHelp
Re: [Maria-developers] XtraDB merge into MariaDB
Kristian Nielsen writes: > lp:~maria-captains/maria/mariadb-xtradb6-merge is missing all of the changes > outside of storage/xtradb (except one CMakeLists.txt). These missing changes > should not go in stand-alone xtradb, but are needed in MariaDB. > > lp:xtradb does not exist. lp:percona-xtradb/release-6 exists, but seems to be > missing some things that are in > lp:~maria-captains/maria/mariadb-xtradb-merge2, > including things like #define PERCONA_INNODB_VERSION 6, > /* bugfix: http://bugs.mysql.com/bug.php?id=43948 */, ... > > So I am confused about what needs to be merged ... > > What I need from you is the name of the branch that contains the stand-alone > XtraDB 6 release. That is the crucial thing. Vadim, any updates on this? All I need is the name of the branch of XtraDB you used as the base when you created lp:~maria-captains/maria/mariadb-xtradb6-merge, in other words the branch that contains release 6 of the stand-alone XtraDB. No extra work needed on your part (except to push it to Launchpad if you forgot) :-) Would be good to get this today, as I'm about to start a three week vacation, and I really want to get XtraDB merged ... - Kristian. ___ Mailing list: https://launchpad.net/~maria-developers Post to : maria-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~maria-developers More help : https://help.launchpad.net/ListHelp
Re: [Maria-developers] XtraDB merge into MariaDB
Kristian Nielsen writes: > Vadim Tkachenko writes: > >> Ok, let's try to figure out how to merge it properly :) >> >> I tried to include all your changes, but seems failed. >> >> Actually all latest changes should be in lp:xtradb. > > Hm, we must have been misunderstanding each other? > > lp:~maria-captains/maria/mariadb-xtradb6-merge is missing all of the changes > outside of storage/xtradb (except one CMakeLists.txt). These missing changes > should not go in stand-alone xtradb, but are needed in MariaDB. > > lp:xtradb does not exist. lp:percona-xtradb/release-6 exists, but seems to be > missing some things that are in > lp:~maria-captains/maria/mariadb-xtradb-merge2, > including things like #define PERCONA_INNODB_VERSION 6, > /* bugfix: http://bugs.mysql.com/bug.php?id=43948 */, ... > > So I am confused about what needs to be merged ... > > What I need from you is the name of the branch that contains the stand-alone > XtraDB 6 release. That is the crucial thing. And to clarify further, once we have that branch (say "lp:XXX"), here is the exact procedure that will be needed to do the merge: bzr branch lp:~maria-captains/maria/mariadb-xtradb-merge2 mybranch cd mybranch bzr merge lp:XXX # Resolve any conflicts... # Compile + run tests, and fix any errors... bzr commit -m "Merge XtraDB 6 into MariaDB." bzr push lp:~maria-captains/maria/mariadb-xtradb-merge2 So as you see, I just need to know what to replace for "XXX". After that, it would be good if you could look at the test failure in main.innodb_xtradb_bug317074 seen in our buildbot here: https://askmonty.org/buildbot/builders/hardy-amd64-dbg/builds/69/steps/test/logs/stdio But let's get the merge confusion solved first :) - Kristian. ___ Mailing list: https://launchpad.net/~maria-developers Post to : maria-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~maria-developers More help : https://help.launchpad.net/ListHelp
Re: [Maria-developers] XtraDB merge into MariaDB
Vadim Tkachenko writes: > Ok, let's try to figure out how to merge it properly :) > > I tried to include all your changes, but seems failed. > > Actually all latest changes should be in lp:xtradb. Hm, we must have been misunderstanding each other? lp:~maria-captains/maria/mariadb-xtradb6-merge is missing all of the changes outside of storage/xtradb (except one CMakeLists.txt). These missing changes should not go in stand-alone xtradb, but are needed in MariaDB. lp:xtradb does not exist. lp:percona-xtradb/release-6 exists, but seems to be missing some things that are in lp:~maria-captains/maria/mariadb-xtradb-merge2, including things like #define PERCONA_INNODB_VERSION 6, /* bugfix: http://bugs.mysql.com/bug.php?id=43948 */, ... So I am confused about what needs to be merged ... What I need from you is the name of the branch that contains the stand-alone XtraDB 6 release. That is the crucial thing. - Kristian. > Kristian Nielsen wrote: >> Vadim Tkachenko writes: >> >>> I made push to >>> >>> lp:~maria-captains/maria/mariadb-xtradb6-merge >>> >>> (not proposed for merge yet). >>> >>> If everything is fine we can merge it to maria. >> >> I am now looking into this. >> >> I have a hard time understanding this merge. It seems you just applied >> manually a patch against latest lp:maria, omitting most (but not all?) of the >> necessary fixes I already made in the tree >> >> lp:~maria-captains/maria/mariadb-xtradb-merge2 >> >> I think we need to work instead from my merged tree, as that includes the >> full >> bzr history of both lp:maria and lp:percona-xtradb. This is necessary to >> allow >> smooth merging of future changes in XtraDB (and MariaDB). >> >> Basically, the merge should be a simple `bzr merge` from the xtradb6 branch >> into my mariadb-xtradb-merge2 branch, and then a merge of that result into >> lp:maria. However, I do not know which branch contains the xtradb6 code (is >> it >> pushed to Launchpad yet?). I assumed 'lp:percona-xtradb/release-6', but that >> code seems to be missing the changes listed below compared to >> mariadb-xtradb-merge. >> >> Can you tell me which branch to merge to get the correct changes? >> >> - 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/ ___ Mailing list: https://launchpad.net/~maria-developers Post to : maria-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~maria-developers More help : https://help.launchpad.net/ListHelp
Re: [Maria-developers] XtraDB merge into MariaDB
Kristian, Ok, let's try to figure out how to merge it properly :) I tried to include all your changes, but seems failed. Actually all latest changes should be in lp:xtradb. Will it work for simple merge ? Thanks, Vadim Kristian Nielsen wrote: > Vadim Tkachenko writes: > >> I made push to >> >> lp:~maria-captains/maria/mariadb-xtradb6-merge >> >> (not proposed for merge yet). >> >> If everything is fine we can merge it to maria. > > I am now looking into this. > > I have a hard time understanding this merge. It seems you just applied > manually a patch against latest lp:maria, omitting most (but not all?) of the > necessary fixes I already made in the tree > > lp:~maria-captains/maria/mariadb-xtradb-merge2 > > I think we need to work instead from my merged tree, as that includes the full > bzr history of both lp:maria and lp:percona-xtradb. This is necessary to allow > smooth merging of future changes in XtraDB (and MariaDB). > > Basically, the merge should be a simple `bzr merge` from the xtradb6 branch > into my mariadb-xtradb-merge2 branch, and then a merge of that result into > lp:maria. However, I do not know which branch contains the xtradb6 code (is it > pushed to Launchpad yet?). I assumed 'lp:percona-xtradb/release-6', but that > code seems to be missing the changes listed below compared to > mariadb-xtradb-merge. > > Can you tell me which branch to merge to get the correct changes? > > - 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/ ___ Mailing list: https://launchpad.net/~maria-developers Post to : maria-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~maria-developers More help : https://help.launchpad.net/ListHelp
Re: [Maria-developers] XtraDB merge into MariaDB
Vadim Tkachenko writes:
> I made push to
>
> lp:~maria-captains/maria/mariadb-xtradb6-merge
>
> (not proposed for merge yet).
>
> If everything is fine we can merge it to maria.
I am now looking into this.
I have a hard time understanding this merge. It seems you just applied
manually a patch against latest lp:maria, omitting most (but not all?) of the
necessary fixes I already made in the tree
lp:~maria-captains/maria/mariadb-xtradb-merge2
I think we need to work instead from my merged tree, as that includes the full
bzr history of both lp:maria and lp:percona-xtradb. This is necessary to allow
smooth merging of future changes in XtraDB (and MariaDB).
Basically, the merge should be a simple `bzr merge` from the xtradb6 branch
into my mariadb-xtradb-merge2 branch, and then a merge of that result into
lp:maria. However, I do not know which branch contains the xtradb6 code (is it
pushed to Launchpad yet?). I assumed 'lp:percona-xtradb/release-6', but that
code seems to be missing the changes listed below compared to
mariadb-xtradb-merge.
Can you tell me which branch to merge to get the correct changes?
- Kristian.
---
diff -u --recursive ./buf/buf0rea.c
../mariadb-xtradb6-merge/storage/xtradb/buf/buf0rea.c
--- ./buf/buf0rea.c 2009-07-07 14:08:24.0 +0200
+++ ../mariadb-xtradb6-merge/storage/xtradb/buf/buf0rea.c 2009-07-07
14:02:21.0 +0200
@@ -134,6 +134,46 @@
bpage = buf_page_init_for_read(err, mode, space, zip_size, unzip,
tablespace_version, offset);
if (bpage == NULL) {
+ /* bugfix: http://bugs.mysql.com/bug.php?id=43948 */
+ if (recv_recovery_is_on() && *err == DB_TABLESPACE_DELETED) {
+ /* hashed log recs must be treated here */
+ recv_addr_t*recv_addr;
+
+ mutex_enter(&(recv_sys->mutex));
+
+ if (recv_sys->apply_log_recs == FALSE) {
+ mutex_exit(&(recv_sys->mutex));
+ goto not_to_recover;
+ }
+
+ /* recv_get_fil_addr_struct() */
+ recv_addr = HASH_GET_FIRST(recv_sys->addr_hash,
+
hash_calc_hash(ut_fold_ulint_pair(space, offset),
+ recv_sys->addr_hash));
+ while (recv_addr) {
+ if ((recv_addr->space == space)
+ && (recv_addr->page_no == offset)) {
+ break;
+ }
+ recv_addr = HASH_GET_NEXT(addr_hash, recv_addr);
+ }
+
+ if ((recv_addr == NULL)
+ || (recv_addr->state == RECV_BEING_PROCESSED)
+ || (recv_addr->state == RECV_PROCESSED)) {
+ mutex_exit(&(recv_sys->mutex));
+ goto not_to_recover;
+ }
+
+ fprintf(stderr, " (cannot find space: %lu)", space);
+ recv_addr->state = RECV_PROCESSED;
+
+ ut_a(recv_sys->n_addrs);
+ recv_sys->n_addrs--;
+
+ mutex_exit(&(recv_sys->mutex));
+ }
+not_to_recover:
return(0);
}
@@ -784,11 +824,11 @@
while (buf_pool->n_pend_reads >= recv_n_pool_free_frames / 2) {
os_aio_simulated_wake_handler_threads();
- os_thread_sleep(50);
+ os_thread_sleep(1);
count++;
- if (count > 100) {
+ if (count > 5000) {
fprintf(stderr,
"InnoDB: Error: InnoDB has waited for"
" 50 seconds for pending\n"
diff -u --recursive ./handler/innodb_patch_info.h
../mariadb-xtradb6-merge/storage/xtradb/handler/innodb_patch_info.h
--- ./handler/innodb_patch_info.h 2009-07-07 14:08:24.0 +0200
+++ ../mariadb-xtradb6-merge/storage/xtradb/handler/innodb_patch_info.h
2009-07-07 14:02:21.0 +0200
@@ -37,5 +37,6 @@
{"innodb_dict_size_limit","Limit dictionary cache size","Variable
innodb_dict_size_limit in
bytes","http://www.percona.com/docs/wiki/percona-xtradb"},
{"innodb_split_buf_pool_mutex","More fix of buffer_pool mutex","Spliting
buf_pool_mutex and optimizing based on
innodb_opt_lru_count","http://www.percona.com/docs/wiki/percona-xtradb"},
{"innodb_stats","Additional features about InnoDB
statistics/optimizer","","http://www.percona.com/docs/wiki/percona-xtradb"},
+{"innodb_recovery_patches","Bugfixes and adjustments a
Re: [Maria-developers] XtraDB merge into MariaDB
Kristian, I made push to lp:~maria-captains/maria/mariadb-xtradb6-merge (not proposed for merge yet). If everything is fine we can merge it to maria. Thanks, Vadim Kristian Nielsen wrote: > Vadim Tkachenko writes: > >> We are about to finalize xtradb-release6, I think it makes sense to push >> this new release. > > Yes, that sounds reasonable. Unless there are substantial changes compared to > latest bzr a few days ago, it should be simple to merge it. > >> I am trying to incorporate your changes, but >> bzr branch lp:~maria-captains/maria/mariadb-xtradb-merge2 >> takes ages and it failed twice for me due "broken connection" error, so >> I had no success here yet. > > It will greatly help if you run the branch command in a shared repository that > already has a branch of mariadb (or failing that, mysql). This will make it > only need to download the changes, not the whole history. > > (A shared repository is created with `bzr init-repo` if you didn't know > already; it makes working with Launchpad much less painful.) > > But Launchpad seems to have been somewhat unstable these last few days, so > that may also be the cause of the trouble. > > - 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/ ___ Mailing list: https://launchpad.net/~maria-developers Post to : maria-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~maria-developers More help : https://help.launchpad.net/ListHelp
Re: [Maria-developers] XtraDB merge into MariaDB
Vadim Tkachenko writes: > We are about to finalize xtradb-release6, I think it makes sense to push > this new release. Yes, that sounds reasonable. Unless there are substantial changes compared to latest bzr a few days ago, it should be simple to merge it. > I am trying to incorporate your changes, but > bzr branch lp:~maria-captains/maria/mariadb-xtradb-merge2 > takes ages and it failed twice for me due "broken connection" error, so > I had no success here yet. It will greatly help if you run the branch command in a shared repository that already has a branch of mariadb (or failing that, mysql). This will make it only need to download the changes, not the whole history. (A shared repository is created with `bzr init-repo` if you didn't know already; it makes working with Launchpad much less painful.) But Launchpad seems to have been somewhat unstable these last few days, so that may also be the cause of the trouble. - Kristian. ___ Mailing list: https://launchpad.net/~maria-developers Post to : maria-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~maria-developers More help : https://help.launchpad.net/ListHelp
Re: [Maria-developers] XtraDB merge into MariaDB
Kristian, We are about to finalize xtradb-release6, I think it makes sense to push this new release. I am trying to incorporate your changes, but bzr branch lp:~maria-captains/maria/mariadb-xtradb-merge2 takes ages and it failed twice for me due "broken connection" error, so I had no success here yet. Kristian Nielsen wrote: > Regarding the XtraDB merge into MariaDB, I am now finally getting ready to > push the merge, after lots of small fixes in different areas. > > The code is available in the mariadb-xtradb-merge2 branch: > > https://code.launchpad.net/~maria-captains/maria/mariadb-xtradb-merge2 > > The buildbot testing is here: > > https://askmonty.org/buildbot/waterfall?branch=mariadb-xtradb-merge2 > > Vadim, there is one remaining issue that I need Percona to look into. This is > a hang in the innodb_xtradb_bug317074 test case on host > hardy-amd64-dbg. Test output is included at the end of this mail, and full log > is here: > > > https://askmonty.org/buildbot/builders/hardy-amd64-dbg/builds/69/steps/test/logs/stdio > > Please take a look and see what it could be. The failure seems to be > repeatable on that host. If needed, we can probably talk to archivist (who > runs that build slave) on getting access to debug etc. > > I would also like your opinion on whether this is something that should block > pushing the merge into MariaDB, as it is the last remaining known issue. > > Also, I was wondering if there is some way that Percona and MariaDB engineers > could be on the same IRC channel(s)? That might be useful for some of the > discussions. MariaDB engineers already hang out in #maria on FreeNode. > > > Vadim Tkachenko writes: > >> I will look how we can backport your changes. >> We need to have xtradb compiled against standard 5.1, if it is not >> broken - it should be not problem to include your fixes. > > I am pretty sure there are no changes that would not work with 5.1. There are > of course a number of changes that should _not_ go into the Percona XtraDB > repository, like the replacing of innodb with xtradb etc. > > Here is an annotated list of the changes I think you should consider including > upstream in XtraDB. If you choose to include any of them, it would be a help > if you can do them in one (or a few) separate commits without any other > changes. This will allow a simple null-merge to deal with merge conflits in > any following xtradb->mariadb merges. > > > Revision: 2716 > http://bazaar.launchpad.net/~maria-captains/maria/mariadb-xtradb-merge2/revision/2716 > > The fix in mysql-test/t/innodb_information_schema.test would be relevant > to merge into XtraDB. > > > Revision: 2714 > http://bazaar.launchpad.net/~maria-captains/maria/mariadb-xtradb-merge2/revision/2714 > > Here the test case fixes may be relevant. And there is a bug fix for ALTER > TABLE in ha_innodb.cc ha_innobase::check_if_incompatible_data() that is > needed to work with latest MySQL 5.1 sources (should also be ok with older > 5.1 versions). > > There are also a few minor merges of changes from MySQL 5.1 to innodb not > in the innodb plugin, which may or may not make sense for XtraDB to merge > (probably doesn't matter). > > > Revision: 2697.3.4 > http://bazaar.launchpad.net/~maria-captains/maria/mariadb-xtradb-merge2/revision/2697.3.4 > > This is fixes for test suite failures. I think most are not relevant, > however changes to these files fixes a test failure: > > mysql-test/t/innodb-zip.test > mysql-test/r/innodb-zip.result > > > As far as I can tell, remaining changes are either outside the innobase > storage engine code (so cannot be meaningfully merged into XtraDB), or fixes > mainly relevant for the merge into MariaDB. > > - Kristian. > > --- > main.innodb_xtradb_bug317074 [ fail ] timeout after 900 seconds > Test ended at 2009-06-23 15:20:52 > > Test case timeout after 900 seconds > > == > /home/archivist/archivist-amd64/archivist-amd64/build/mysql-test/var/1/log/innodb_xtradb_bug317074.log > == > SET @save_innodb_file_format=@@global.innodb_file_format; > SET @save_innodb_file_format_check=@@global.innodb_file_format_check; > SET @save_innodb_file_per_table=@@global.innodb_file_per_table; > SET GLOBAL innodb_file_format='Barracuda'; > SET GLOBAL innodb_file_per_table=ON; > -- 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/ ___ Mailing list: https://launchpad.net/~maria-developers Post to : maria-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~maria-developers More help : https://help.launchpad.net/ListHelp
Re: [Maria-developers] XtraDB merge into MariaDB
Regarding the XtraDB merge into MariaDB, I am now finally getting ready to push the merge, after lots of small fixes in different areas. The code is available in the mariadb-xtradb-merge2 branch: https://code.launchpad.net/~maria-captains/maria/mariadb-xtradb-merge2 The buildbot testing is here: https://askmonty.org/buildbot/waterfall?branch=mariadb-xtradb-merge2 Vadim, there is one remaining issue that I need Percona to look into. This is a hang in the innodb_xtradb_bug317074 test case on host hardy-amd64-dbg. Test output is included at the end of this mail, and full log is here: https://askmonty.org/buildbot/builders/hardy-amd64-dbg/builds/69/steps/test/logs/stdio Please take a look and see what it could be. The failure seems to be repeatable on that host. If needed, we can probably talk to archivist (who runs that build slave) on getting access to debug etc. I would also like your opinion on whether this is something that should block pushing the merge into MariaDB, as it is the last remaining known issue. Also, I was wondering if there is some way that Percona and MariaDB engineers could be on the same IRC channel(s)? That might be useful for some of the discussions. MariaDB engineers already hang out in #maria on FreeNode. Vadim Tkachenko writes: > I will look how we can backport your changes. > We need to have xtradb compiled against standard 5.1, if it is not > broken - it should be not problem to include your fixes. I am pretty sure there are no changes that would not work with 5.1. There are of course a number of changes that should _not_ go into the Percona XtraDB repository, like the replacing of innodb with xtradb etc. Here is an annotated list of the changes I think you should consider including upstream in XtraDB. If you choose to include any of them, it would be a help if you can do them in one (or a few) separate commits without any other changes. This will allow a simple null-merge to deal with merge conflits in any following xtradb->mariadb merges. Revision: 2716 http://bazaar.launchpad.net/~maria-captains/maria/mariadb-xtradb-merge2/revision/2716 The fix in mysql-test/t/innodb_information_schema.test would be relevant to merge into XtraDB. Revision: 2714 http://bazaar.launchpad.net/~maria-captains/maria/mariadb-xtradb-merge2/revision/2714 Here the test case fixes may be relevant. And there is a bug fix for ALTER TABLE in ha_innodb.cc ha_innobase::check_if_incompatible_data() that is needed to work with latest MySQL 5.1 sources (should also be ok with older 5.1 versions). There are also a few minor merges of changes from MySQL 5.1 to innodb not in the innodb plugin, which may or may not make sense for XtraDB to merge (probably doesn't matter). Revision: 2697.3.4 http://bazaar.launchpad.net/~maria-captains/maria/mariadb-xtradb-merge2/revision/2697.3.4 This is fixes for test suite failures. I think most are not relevant, however changes to these files fixes a test failure: mysql-test/t/innodb-zip.test mysql-test/r/innodb-zip.result As far as I can tell, remaining changes are either outside the innobase storage engine code (so cannot be meaningfully merged into XtraDB), or fixes mainly relevant for the merge into MariaDB. - Kristian. --- main.innodb_xtradb_bug317074 [ fail ] timeout after 900 seconds Test ended at 2009-06-23 15:20:52 Test case timeout after 900 seconds == /home/archivist/archivist-amd64/archivist-amd64/build/mysql-test/var/1/log/innodb_xtradb_bug317074.log == SET @save_innodb_file_format=@@global.innodb_file_format; SET @save_innodb_file_format_check=@@global.innodb_file_format_check; SET @save_innodb_file_per_table=@@global.innodb_file_per_table; SET GLOBAL innodb_file_format='Barracuda'; SET GLOBAL innodb_file_per_table=ON; == /home/archivist/archivist-amd64/archivist-amd64/build/mysql-test/var/1/tmp/analyze-timeout-mysqld.1.err == mysqltest: Could not open connection 'default' after 500 attempts: 2002 Can't connect to local MySQL server through socket '/home/archivist/archivist-amd64/archivist-amd64/build/mysql-test/var/tmp/1/mysqld.1.sock' (111) - saving '/home/archivist/archivist-amd64/archivist-amd64/build/mysql-test/var/1/log/main.innodb_xtradb_bug317074/' to '/home/archivist/archivist-amd64/archivist-amd64/build/mysql-test/var/log/main.innodb_xtradb_bug317074/' - found 'core.21388' (0/5) Trying 'dbx' to get a backtrace Trying 'gdb' to get a backtrace Core generated by '/home/archivist/archivist-amd64/archivist-amd64/build/sql/mysqld' Output from gdb follows. The first stack trace is from the failing thread. The following stack traces are from all threads (so the failing one is duplicated). -- warning: Can't read pathname for load map: Input/output error. Core was generated by `/home/archivist/archivist-amd64/archivist-amd64/build/sql/
