maria-developers team mailing list archive

[Kristian Nielsen <knielsen@xxxxxxxxxxxxxxx>]

Vadim Tkachenko <vadim@xxxxxxxxxxx> 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