From d744f3bad8ff8d29ba5500607b0021eb3b2b5265 Mon Sep 17 00:00:00 2001 From: Alexander Nozdrin Date: Wed, 19 Aug 2009 17:06:33 +0400 Subject: [PATCH 1/5] Fix default.conf --- .bzr-mysql/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bzr-mysql/default.conf b/.bzr-mysql/default.conf index f044f8e62da..39ebdda8d7a 100644 --- a/.bzr-mysql/default.conf +++ b/.bzr-mysql/default.conf @@ -1,4 +1,4 @@ [MYSQL] post_commit_to = "commits@lists.mysql.com" post_push_to = "commits@lists.mysql.com" -tree_name = "mysql-5.1" +tree_name = "mysql-5.4" From 55f7c2f35f35fb7e47bb24fc6f2962ed2178231e Mon Sep 17 00:00:00 2001 From: Joerg Bruehe Date: Thu, 20 Aug 2009 21:08:09 +0200 Subject: [PATCH 2/5] Get rid of manual pages which aren't used. This is a partial correction to the original fix for bug#37098 Get rid of "Installed (but unpackaged)" files in the RPM build which used a wrong variable. --- man/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/man/Makefile.am b/man/Makefile.am index d37ef81285b..7fdfc297f96 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -24,8 +24,8 @@ EXTRA_DIST = $(man1_MANS) $(man8_MANS) # 1) not needed in Unix binary packages, # 2) programs not generated in 5.0: install-data-hook: - rm -f $(DESTDIR)$(manlibdir)/man1/make_win_* - rm -f $(DESTDIR)$(manlibdir)/man1/ndb_print_* + rm -f $(DESTDIR)$(mandir)/man1/make_win_* + rm -f $(DESTDIR)$(mandir)/man1/ndb_print_* # Don't update the files from bitkeeper %::SCCS/s.% From 6c83ca3a98f6d5719c4ed29a633e11446cf4567b Mon Sep 17 00:00:00 2001 From: Alexander Nozdrin Date: Mon, 24 Aug 2009 10:48:57 +0400 Subject: [PATCH 3/5] Backporting patch for Bug#46650 (Innodb assertion autoinc_lock == lock in lock_table_remove_low on INSERT SELECT) to mysql-trunk. --- storage/innobase/lock/lock0lock.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c index fcd8d268331..0cc89336199 100644 --- a/storage/innobase/lock/lock0lock.c +++ b/storage/innobase/lock/lock0lock.c @@ -3574,7 +3574,8 @@ lock_table_remove_low( and lock_grant()). Therefore it can be empty and we need to check for that. */ - if (!ib_vector_is_empty(trx->autoinc_locks)) { + if (!lock_get_wait(lock) + && !ib_vector_is_empty(trx->autoinc_locks)) { lock_t* autoinc_lock; autoinc_lock = ib_vector_pop(trx->autoinc_locks); @@ -3647,8 +3648,10 @@ lock_table_enqueue_waiting( if (lock_deadlock_occurs(lock, trx)) { - lock_reset_lock_and_trx_wait(lock); + /* The order here is important, we don't want to + lose the state of the lock before calling remove. */ lock_table_remove_low(lock); + lock_reset_lock_and_trx_wait(lock); return(DB_DEADLOCK); } From 27d142386c0c38e59749bbf2aeef625d822fb239 Mon Sep 17 00:00:00 2001 From: Guilhem Bichot Date: Tue, 25 Aug 2009 17:12:44 +0200 Subject: [PATCH 4/5] Applying fix from Oracle (Marko) for Bug #46657 "InnoDB plugin: invalid read in index_merge_innodb test (Valgrind)" --- storage/innobase/handler/handler0alter.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index d1f64a1985c..5075b841879 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -863,6 +863,7 @@ error_handling: indexed_table->n_mysql_handles_opened++; error = row_merge_drop_table(trx, innodb_table); + innodb_table = indexed_table; goto convert_error; case DB_TOO_BIG_RECORD: From a8037cbf9de40fb5957c050c70420f1f42ac32ac Mon Sep 17 00:00:00 2001 From: "joerg.bruehe@sun.com" <> Date: Wed, 26 Aug 2009 11:59:49 +0200 Subject: [PATCH 5/5] Raise version number after cloning 5.4.2-beta --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index a291ce73210..2723286a405 100644 --- a/configure.in +++ b/configure.in @@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM # # When changing major version number please also check switch statement # in client/mysqlbinlog.cc:check_master_version(). -AM_INIT_AUTOMAKE(mysql, 5.4.2-beta) +AM_INIT_AUTOMAKE(mysql, 5.4.3-beta) AM_CONFIG_HEADER([include/config.h:config.h.in]) PROTOCOL_VERSION=10