From c4feaafdcbcd197bdd6b647a8f75a11a89fdb00b Mon Sep 17 00:00:00 2001
From: "joerg@mysql.com" <>
Date: Mon, 7 Mar 2005 16:23:55 +0100
Subject: [PATCH 01/17] Avoid empty build (failure) mails on Solaris (backport
 from 4.1).

---
 Build-tools/Do-compile | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile
index 1f83a9a37e1..5756d06a116 100755
--- a/Build-tools/Do-compile
+++ b/Build-tools/Do-compile
@@ -617,16 +617,20 @@ sub abort
 
   if ($opt_user)
   {
-    $mail_header_file="$opt_tmp/do-command.$$";
-    open(TMP,">$mail_header_file");
+    # Take the last 40 lines of the build log
+    open(LOG, "$log") or die $!;
+    my @log= <LOG>;
+    close LOG;
+    splice @log => 0, -40;
+    my $mail_file="$opt_tmp/do-command.$$";
+    open(TMP,">$mail_file") or die $!;
     print TMP "From: mysqldev\@$full_host_name\n";
     print TMP "To: $email\n";
     print TMP "Subject: $host($uname): $ver$opt_version_suffix compilation failed\n\n";
+    print TMP @log;
     close TMP;
-    system("tail -n 40 $log > $log.mail");
-    system("cat $mail_header_file $log.mail | $sendmail -t -f $email");
-    unlink($mail_header_file);
-    unlink("$log.mail");
+    system("$sendmail -t -f $email < $mail_file");
+    unlink($mail_file);
   }
   exit 1;
 }

From 00449b8f9c6fdb87caf7c5e683e605db4a3fee78 Mon Sep 17 00:00:00 2001
From: "gluh@gluh.mysql.r18.ru" <>
Date: Mon, 7 Mar 2005 18:56:18 +0300
Subject: [PATCH 02/17] Fix for bug#8978 : Crash on 'select format ...'

---
 sql/item_strfunc.cc | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index aeb63d6af00..ec88f58aa93 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -1465,7 +1465,8 @@ Item_func_format::Item_func_format(Item *org,int dec) :Item_str_func(org)
 String *Item_func_format::val_str(String *str)
 {
   double nr	=args[0]->val();
-  uint32 diff,length,str_length;
+  uint32 length,str_length;
+  int diff;
   uint dec;
   if ((null_value=args[0]->null_value))
     return 0; /* purecov: inspected */
@@ -1483,17 +1484,17 @@ String *Item_func_format::val_str(String *str)
   if (str_length >= dec+4)
   {
     char *tmp,*pos;
-    length= str->length()+(diff=(str_length- dec-1)/3);
+    length= str->length()+(diff= (int)(str_length- dec-1)/3);
     str= copy_if_not_alloced(&tmp_str,str,length);
     str->length(length);
     tmp= (char*) str->ptr()+length - dec-1;
     for (pos= (char*) str->ptr()+length-1; pos != tmp; pos--)
-      pos[0]= pos[-(int) diff];
+      pos[0]= pos[-diff];
     while (diff)
     {
-      pos[0]=pos[-(int) diff]; pos--;
-      pos[0]=pos[-(int) diff]; pos--;
-      pos[0]=pos[-(int) diff]; pos--;
+      pos[0]=pos[-diff]; pos--;
+      pos[0]=pos[-diff]; pos--;
+      pos[0]=pos[-diff]; pos--;
       pos[0]=',';
       pos--;
       diff--;

From beea918092222adc26faac6d123c2c9019cd55bb Mon Sep 17 00:00:00 2001
From: "marko@hundin.mysql.fi" <>
Date: Tue, 8 Mar 2005 11:12:18 +0200
Subject: [PATCH 03/17] InnoDB: Win64 portability fix: add missing declaration
 and correct the definition of srv_max_buf_pool_modified_pct.

---
 innobase/include/srv0srv.h | 1 +
 innobase/srv/srv0srv.c     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/innobase/include/srv0srv.h b/innobase/include/srv0srv.h
index 30dd3db7bb1..e18ceb32bbe 100644
--- a/innobase/include/srv0srv.h
+++ b/innobase/include/srv0srv.h
@@ -101,6 +101,7 @@ extern ibool	srv_use_doublewrite_buf;
 extern ibool    srv_set_thread_priorities;
 extern int      srv_query_thread_priority;
 
+extern ulong	srv_max_buf_pool_modified_pct;
 extern ulong	srv_max_purge_lag;
 /*-------------------------------------------*/
 
diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c
index 5c5d62f777b..6ac8727ee26 100644
--- a/innobase/srv/srv0srv.c
+++ b/innobase/srv/srv0srv.c
@@ -165,7 +165,7 @@ in the buffer pool to all database pages in the buffer pool smaller than
 the following number. But it is not guaranteed that the value stays below
 that during a time of heavy update/insert activity. */
 
-ulint	srv_max_buf_pool_modified_pct	= 90;
+ulong	srv_max_buf_pool_modified_pct	= 90;
 
 /* If the following is != 0 we do not allow inserts etc. This protects
 the user from forgetting the innodb_force_recovery keyword to my.cnf */

From 8948e774f611211f7136ed1493d9d011145dbad5 Mon Sep 17 00:00:00 2001
From: "lenz@mysql.com" <>
Date: Tue, 8 Mar 2005 11:42:21 +0100
Subject: [PATCH 04/17] - bumped up version number in configure.in from 4.0.24
 -> 4.0.25 (ChangeSet 1.2073 was already tagged   as 4.0.24)

---
 configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 8b8c0690a55..36473de7ad1 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
-AM_INIT_AUTOMAKE(mysql, 4.0.24)
+AM_INIT_AUTOMAKE(mysql, 4.0.25)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10

From 63d01ae103c5fb93ba26b1b030ec0a56e38ffcfb Mon Sep 17 00:00:00 2001
From: "marko@hundin.mysql.fi" <>
Date: Tue, 8 Mar 2005 17:08:17 +0200
Subject: [PATCH 05/17] dict0load.c:   dict_load_table(): Remove the check for
 row_format=compact for now,   because the flag bit we used (high-order bit of
 mix_len)   has not been zero for at least two customers.

---
 innobase/dict/dict0load.c | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/innobase/dict/dict0load.c b/innobase/dict/dict0load.c
index 0bbf0511b57..a4637e09d07 100644
--- a/innobase/dict/dict0load.c
+++ b/innobase/dict/dict0load.c
@@ -647,22 +647,6 @@ dict_load_table(
 		return(NULL);
 	}
 
-#if MYSQL_VERSION_ID < 50300
-	/* Starting from MySQL 5.0.3, the high-order bit of MIX_LEN is the
-	"compact format" flag. */
-	field = rec_get_nth_field(rec, 7, &len);
-	if (mach_read_from_1(field) & 0x80) {
-		btr_pcur_close(&pcur);
-		mtr_commit(&mtr);
-		mem_heap_free(heap);
-		ut_print_timestamp(stderr);
-		fprintf(stderr,
-			"  InnoDB: table %s is in the new compact format\n"
-			"InnoDB: of MySQL 5.0.3 or later\n", name);
-		return(NULL);
-	}
-#endif /* MYSQL_VERSION_ID < 50300 */
-
 	ut_a(0 == ut_strcmp((char *) "SPACE",
 		dict_field_get_col(
 		dict_index_get_nth_field(

From a9c062eba00f1b6de55a70fe4ee944642552afd6 Mon Sep 17 00:00:00 2001
From: "jani@ua141d10.elisa.omakaista.fi" <>
Date: Tue, 8 Mar 2005 18:18:53 +0200
Subject: [PATCH 06/17] Netware build environment script related patch.

---
 netware/BUILD/mwenv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/netware/BUILD/mwenv b/netware/BUILD/mwenv
index 88491446c43..674c148a399 100755
--- a/netware/BUILD/mwenv
+++ b/netware/BUILD/mwenv
@@ -7,13 +7,13 @@
 export MYDEV="F:/mydev"
 
 export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/fs64/headers;$MYDEV/zlib-1.1.4;$MYDEV"
-export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/fs64/imports;$MYDEV/zlib-1.1.4;$MYDEV/mysql-4.0.21/netware/BUILD"
+export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/fs64/imports;$MYDEV/zlib-1.1.4;$MYDEV/mysql-VERSION/netware/BUILD"
 export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib;libz.a;neb.imp;zPublics.imp;knetware.imp"
 
 export WINEPATH="$MYDEV/mw/bin"
 
 # the default added path is "$HOME/mydev/mysql-x.x-x/netware/BUILD"
-export PATH="$PATH:/home/kp/mydev/mysql-4.0.21/netware/BUILD"
+export PATH="$PATH:BUILD_DIR/mysql-VERSION/netware/BUILD"
 
 export AR='mwldnlm'
 export AR_FLAGS='-type library -o'

From e3d32c9e2dfc36c20936e1e51eda8de09e7d69cc Mon Sep 17 00:00:00 2001
From: "paul@kite-hub.kitebird.com" <>
Date: Tue, 8 Mar 2005 10:43:44 -0600
Subject: [PATCH 07/17] Add dummy changelog file. It should merge upward
 without conflict.

---
 Docs/changelog-4.0.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100755 Docs/changelog-4.0.xml

diff --git a/Docs/changelog-4.0.xml b/Docs/changelog-4.0.xml
new file mode 100755
index 00000000000..fc33b3fdb5e
--- /dev/null
+++ b/Docs/changelog-4.0.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+<!--
+This is a dummy changelog file. Don't use it yet.
+It merges upward without conflict.
+-->
+<appendix id="news-4-0-x">
+
+ <title>
+  Changes in release 4.0.x
+ </title>
+
+ <para>
+  This is a dummy changelog file. Don't use it yet.
+ </para>
+
+</appendix>

From 323d1356847bd4e1b9ad6e3eb46217f054f9cf3b Mon Sep 17 00:00:00 2001
From: "paul@kite-hub.kitebird.com" <>
Date: Tue, 8 Mar 2005 11:49:56 -0600
Subject: [PATCH 08/17] changelog-4.0.xml:   Fix bad root element name in
 DOCTYPE.  Sheesh.

---
 Docs/changelog-4.0.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Docs/changelog-4.0.xml b/Docs/changelog-4.0.xml
index fc33b3fdb5e..f0f9aa881f1 100755
--- a/Docs/changelog-4.0.xml
+++ b/Docs/changelog-4.0.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 <!--
 This is a dummy changelog file. Don't use it yet.

From 4559fb998b8b9cc76e7801933889fbbeba05eb3a Mon Sep 17 00:00:00 2001
From: "igor@rurik.mysql.com" <>
Date: Wed, 9 Mar 2005 00:15:51 -0800
Subject: [PATCH 09/17] func_str.result, func_str.test:   Added a test case for
 bug #8669. item_strfunc.cc:   Fixed bug #8669.   Function AES_DECRYPT can
 return NULL value.

---
 mysql-test/r/func_str.result | 15 +++++++++++++++
 mysql-test/t/func_str.test   | 17 +++++++++++++++++
 sql/item_strfunc.cc          |  1 +
 3 files changed, 33 insertions(+)

diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result
index 9392f152bb4..6fe71f97edd 100644
--- a/mysql-test/r/func_str.result
+++ b/mysql-test/r/func_str.result
@@ -304,3 +304,18 @@ QUOTE('A')
 'A'
 'A'
 DROP TABLE t1;
+CREATE TABLE t1 (id int PRIMARY KEY, str char(255) NOT NULL);
+CREATE TABLE t2 (id int NOT NULL UNIQUE);
+INSERT INTO t2 VALUES (1),(2);
+INSERT INTO t1 VALUES (1, aes_encrypt('foo', 'bar'));
+INSERT INTO t1 VALUES (2, 'not valid');
+SELECT t1.id, aes_decrypt(str, 'bar') FROM t1, t2 WHERE t1.id = t2.id;
+id	aes_decrypt(str, 'bar')
+1	foo
+2	NULL
+SELECT t1.id, aes_decrypt(str, 'bar') FROM t1, t2 WHERE t1.id = t2.id
+ORDER BY t1.id;
+id	aes_decrypt(str, 'bar')
+1	foo
+2	NULL
+DROP TABLE t1, t2;
diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test
index 6c2abd27551..9dac1d823d9 100644
--- a/mysql-test/t/func_str.test
+++ b/mysql-test/t/func_str.test
@@ -198,3 +198,20 @@ select quote(trim(concat('    ', 'a')));
 CREATE TABLE t1 SELECT 1 UNION SELECT 2 UNION SELECT 3;
 SELECT QUOTE('A') FROM t1;
 DROP TABLE t1;
+
+#
+# Test case for bug #8669: null aes_decrypt result in order by query
+#
+
+CREATE TABLE t1 (id int PRIMARY KEY, str char(255) NOT NULL);
+CREATE TABLE t2 (id int NOT NULL UNIQUE);
+INSERT INTO t2 VALUES (1),(2);
+INSERT INTO t1 VALUES (1, aes_encrypt('foo', 'bar'));
+INSERT INTO t1 VALUES (2, 'not valid');
+
+SELECT t1.id, aes_decrypt(str, 'bar') FROM t1, t2 WHERE t1.id = t2.id;
+SELECT t1.id, aes_decrypt(str, 'bar') FROM t1, t2 WHERE t1.id = t2.id
+ ORDER BY t1.id;
+
+DROP TABLE t1, t2;
+
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index ec88f58aa93..930014de771 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -208,6 +208,7 @@ String *Item_func_aes_decrypt::val_str(String *str)
 void Item_func_aes_decrypt::fix_length_and_dec()
 {
    max_length=args[0]->max_length;
+   maybe_null= 1;
 }
 
 

From 5d865045c93e3429819c7840cbce0cd587331b17 Mon Sep 17 00:00:00 2001
From: "sergefp@mysql.com" <>
Date: Fri, 11 Mar 2005 02:17:03 +0300
Subject: [PATCH 10/17] Fix for BUG#8711: "<=>" may have true value for NULL
 arguments, so make Item_func_equal::not_null_tables() always return 0.

---
 mysql-test/r/join_outer.result | 20 ++++++++++++++++++++
 mysql-test/t/join_outer.test   | 13 +++++++++++++
 sql/item_cmpfunc.h             |  1 +
 3 files changed, 34 insertions(+)

diff --git a/mysql-test/r/join_outer.result b/mysql-test/r/join_outer.result
index 5778b2f9b72..d6ce93e632b 100644
--- a/mysql-test/r/join_outer.result
+++ b/mysql-test/r/join_outer.result
@@ -684,3 +684,23 @@ t1	ALL	NULL	NULL	NULL	NULL	3
 t2	ALL	NULL	NULL	NULL	NULL	2	
 t3	ALL	NULL	NULL	NULL	NULL	2	
 drop table t1, t2, t3;
+create table t1 (
+a int(11),
+b char(10),
+key (a)
+);
+insert into t1 (a) values (1),(2),(3),(4);
+create table t2 (a int);
+select * from t1 left join t2 on t1.a=t2.a where not (t2.a <=> t1.a);
+a	b	a
+1	NULL	NULL
+2	NULL	NULL
+3	NULL	NULL
+4	NULL	NULL
+select * from t1 left join t2 on t1.a=t2.a having not (t2.a <=> t1.a);
+a	b	a
+1	NULL	NULL
+2	NULL	NULL
+3	NULL	NULL
+4	NULL	NULL
+drop table t1,t2;
diff --git a/mysql-test/t/join_outer.test b/mysql-test/t/join_outer.test
index bed4d4b033b..f32cc9d56ac 100644
--- a/mysql-test/t/join_outer.test
+++ b/mysql-test/t/join_outer.test
@@ -450,3 +450,16 @@ select * from t1 left join t2  on  b1 = a1 left join t3  on  c1 = a1  and  b1 is
 explain select * from t1 left join t2  on  b1 = a1 left join t3  on  c1 = a1  and  b1 is null;
 
 drop table t1, t2, t3;
+
+# Test for BUG#8711 '<=>' was considered to be a NULL-rejecting predicate.
+create table t1 (
+  a int(11),
+  b char(10),
+  key (a)
+);
+insert into t1 (a) values (1),(2),(3),(4);
+create table t2 (a int);
+
+select * from t1 left join t2 on t1.a=t2.a where not (t2.a <=> t1.a);
+select * from t1 left join t2 on t1.a=t2.a having not (t2.a <=> t1.a);
+drop table t1,t2;
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index 8f1aa525190..a1977e76f67 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -78,6 +78,7 @@ public:
   Item_func_equal(Item *a,Item *b) :Item_bool_func2(a,b) { };
   longlong val_int();
   void fix_length_and_dec();
+  table_map not_null_tables() const { return 0; }
   enum Functype functype() const { return EQUAL_FUNC; }
   enum Functype rev_functype() const { return EQUAL_FUNC; }
   cond_result eq_cmp_result() const { return COND_TRUE; }

From d5c1475db6286cf214693d3bc4f564bfe3278302 Mon Sep 17 00:00:00 2001
From: "marko@hundin.mysql.fi" <>
Date: Mon, 14 Mar 2005 12:43:22 +0200
Subject: [PATCH 11/17] dict0load.c:   dict_load_table(): Refuse to open
 ROW_FORMAT=COMPACT tables   of MySQL 5.0.3 and later.

---
 innobase/dict/dict0load.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/innobase/dict/dict0load.c b/innobase/dict/dict0load.c
index a4637e09d07..a39ffe37ffd 100644
--- a/innobase/dict/dict0load.c
+++ b/innobase/dict/dict0load.c
@@ -639,7 +639,7 @@ dict_load_table(
 
 	/* Check if the table name in record is the searched one */
 	if (len != ut_strlen(name) || ut_memcmp(name, field, len) != 0) {
-
+	err_exit:
 		btr_pcur_close(&pcur);
 		mtr_commit(&mtr);
 		mem_heap_free(heap);
@@ -662,6 +662,13 @@ dict_load_table(
 
 	field = rec_get_nth_field(rec, 4, &len);
 	n_cols = mach_read_from_4(field);
+	if (n_cols & 0x80000000UL) {
+		ut_print_timestamp(stderr);
+		fprintf(stderr,
+			"  InnoDB: table %s is in the new compact format\n"
+			"InnoDB: of MySQL 5.0.3 or later\n", name);
+		goto err_exit;
+	}
 
 	table = dict_mem_table_create(name, space, n_cols);
 

From 4af3c8a23a6036a57e46c54ae93356dda18624f4 Mon Sep 17 00:00:00 2001
From: "paul@snake-hub.snake.net" <>
Date: Mon, 14 Mar 2005 19:59:00 -0600
Subject: [PATCH 12/17] mysql.1.in:   Fix path that needs no parameterization.

---
 BitKeeper/etc/logging_ok | 1 +
 man/mysql.1.in           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index f8621170f64..ef04f36c433 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -112,6 +112,7 @@ paul@central.snake.net
 paul@ice.local
 paul@ice.snake.net
 paul@kite-hub.kitebird.com
+paul@snake-hub.snake.net
 paul@teton.kitebird.com
 pem@mysql.com
 peter@linux.local
diff --git a/man/mysql.1.in b/man/mysql.1.in
index 35ff48693e1..7330ac8125b 100644
--- a/man/mysql.1.in
+++ b/man/mysql.1.in
@@ -107,7 +107,7 @@ version number and exit.
 Wait and retry if the database server connection is down.
 .SH FILES
 .TP 2.2i
-.I @sysconfdir@/my.cnf
+.I /etc/my.cnf
 MySQL configuration file
 .TP
 .I @bindir@/mysql

From a773916238d9bece75458b9548e08fac303cdc8a Mon Sep 17 00:00:00 2001
From: "ramil@mysql.com" <>
Date: Thu, 17 Mar 2005 10:24:50 +0400
Subject: [PATCH 13/17] A fix (bug #8942: SUBSTRING_INDEX in UPDATE causes
 internal loop).

---
 mysql-test/r/update.result |  7 +++++++
 mysql-test/t/update.test   | 10 ++++++++++
 sql/key.cc                 |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/update.result b/mysql-test/r/update.result
index 7810d52d156..9ca92fe75df 100644
--- a/mysql-test/r/update.result
+++ b/mysql-test/r/update.result
@@ -209,3 +209,10 @@ insert into t1 values (1, "t1c2-1", 10), (2, "t1c2-2", 20);
 update t1 left join t2 on t1.c1 = t2.c1 set t2.c2 = "t2c2-1";
 update t1 left join t2 on t1.c1 = t2.c1 set t2.c2 = "t2c2-1" where t1.c3 = 10;
 drop table t1, t2;
+create table t1 (a int, b char(255), key(a, b(20)));
+insert into t1 values (0, '1');
+update t1 set b = b + 1 where a = 0;
+select * from t1;
+a	b
+0	2
+drop table t1;
diff --git a/mysql-test/t/update.test b/mysql-test/t/update.test
index 62439dcc51b..6c7b450f763 100644
--- a/mysql-test/t/update.test
+++ b/mysql-test/t/update.test
@@ -164,3 +164,13 @@ insert into t1 values (1, "t1c2-1", 10), (2, "t1c2-2", 20);
 update t1 left join t2 on t1.c1 = t2.c1 set t2.c2 = "t2c2-1";
 update t1 left join t2 on t1.c1 = t2.c1 set t2.c2 = "t2c2-1" where t1.c3 = 10;
 drop table t1, t2;
+
+#
+# Bug #8942: a problem with update and partial key part
+#
+
+create table t1 (a int, b char(255), key(a, b(20)));
+insert into t1 values (0, '1');
+update t1 set b = b + 1 where a = 0;
+select * from t1;
+drop table t1;
diff --git a/sql/key.cc b/sql/key.cc
index 0a5937fc881..52eb108a5df 100644
--- a/sql/key.cc
+++ b/sql/key.cc
@@ -265,7 +265,7 @@ bool check_if_key_used(TABLE *table, uint idx, List<Item> &fields)
     f.rewind();
     while ((field=(Item_field*) f++))
     {
-      if (key_part->field == field->field)
+      if (key_part->field->eq(field->field))
 	return 1;
     }
   }

From d823bee92ad718f1cb6471c1e036018eaecc7e17 Mon Sep 17 00:00:00 2001
From: "gbichot@quadxeon.mysql.com" <>
Date: Thu, 17 Mar 2005 14:39:39 +0100
Subject: [PATCH 14/17] safer creation of temp files used in replication of
 LOAD DATA INFILE. When we come to create these, they may already exist and
 it's necessary to delete these old, useless copies.

---
 BitKeeper/etc/logging_ok |  1 +
 sql/log_event.cc         | 16 ++++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index f8621170f64..6f044ff530d 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -29,6 +29,7 @@ dellis@goetia.(none)
 dlenev@brandersnatch.localdomain
 dlenev@build.mysql.com
 dlenev@mysql.com
+gbichot@quadxeon.mysql.com
 gerberb@ou800.zenez.com
 gluh@gluh.(none)
 gluh@gluh.mysql.r18.ru
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 007bb6e7b85..d1321b878bf 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -2360,8 +2360,10 @@ int Create_file_log_event::exec_event(struct st_relay_log_info* rli)
   strmov(p, ".info");			// strmov takes less code than memcpy
   strnmov(proc_info, "Making temp file ", 17); // no end 0
   thd->proc_info= proc_info;
-  if ((fd = my_open(fname_buf, O_WRONLY|O_CREAT|O_BINARY|O_TRUNC,
-		    MYF(MY_WME))) < 0 ||
+  my_delete(fname_buf, MYF(0)); // old copy may exist already
+  if ((fd= my_create(fname_buf, CREATE_MODE,
+		     O_WRONLY | O_BINARY | O_EXCL | O_NOFOLLOW,
+		     MYF(MY_WME))) < 0 ||
       init_io_cache(&file, fd, IO_SIZE, WRITE_CACHE, (my_off_t)0, 0,
 		    MYF(MY_WME|MY_NABP)))
   {
@@ -2383,8 +2385,10 @@ int Create_file_log_event::exec_event(struct st_relay_log_info* rli)
   my_close(fd, MYF(0));
   
   // fname_buf now already has .data, not .info, because we did our trick
-  if ((fd = my_open(fname_buf, O_WRONLY|O_CREAT|O_BINARY|O_TRUNC,
-		    MYF(MY_WME))) < 0)
+  my_delete(fname_buf, MYF(0)); // old copy may exist already
+  if ((fd= my_create(fname_buf, CREATE_MODE,
+		     O_WRONLY | O_BINARY | O_EXCL | O_NOFOLLOW,
+		     MYF(MY_WME))) < 0)
   {
     slave_print_error(rli,my_errno, "Error in Create_file event: could not open file '%s'", fname_buf);
     goto err;
@@ -2426,7 +2430,7 @@ int Append_block_log_event::exec_event(struct st_relay_log_info* rli)
   memcpy(p, ".data", 6);
   strnmov(proc_info, "Making temp file ", 17); // no end 0
   thd->proc_info= proc_info;
-  if ((fd = my_open(fname, O_WRONLY|O_APPEND|O_BINARY, MYF(MY_WME))) < 0)
+  if ((fd = my_open(fname, O_WRONLY|O_APPEND|O_BINARY|O_NOFOLLOW, MYF(MY_WME))) < 0)
   {
     slave_print_error(rli,my_errno, "Error in Append_block event: could not open file '%s'", fname);
     goto err;
@@ -2455,7 +2459,7 @@ int Execute_load_log_event::exec_event(struct st_relay_log_info* rli)
   Load_log_event* lev = 0;
 
   memcpy(p, ".info", 6);
-  if ((fd = my_open(fname, O_RDONLY|O_BINARY, MYF(MY_WME))) < 0 ||
+  if ((fd = my_open(fname, O_RDONLY|O_BINARY|O_NOFOLLOW, MYF(MY_WME))) < 0 ||
       init_io_cache(&file, fd, IO_SIZE, READ_CACHE, (my_off_t)0, 0,
 		    MYF(MY_WME|MY_NABP)))
   {

From 86f9b7775697a8e722a6cf4fc7b7d4e32f1043de Mon Sep 17 00:00:00 2001
From: "paul@frost.snake.net" <>
Date: Thu, 17 Mar 2005 11:33:07 -0600
Subject: [PATCH 15/17] Update URL.

---
 BitKeeper/etc/logging_ok            | 1 +
 man/isamchk.1.in                    | 2 +-
 man/isamlog.1.in                    | 2 +-
 man/mysql.1.in                      | 2 +-
 man/mysql_fix_privilege_tables.1.in | 2 +-
 man/mysql_zap.1.in                  | 2 +-
 man/mysqlaccess.1.in                | 2 +-
 man/mysqladmin.1.in                 | 2 +-
 man/mysqld.1.in                     | 2 +-
 man/mysqld_multi.1.in               | 2 +-
 man/mysqld_safe.1.in                | 2 +-
 man/mysqldump.1.in                  | 2 +-
 man/mysqlshow.1.in                  | 2 +-
 man/perror.1.in                     | 2 +-
 man/replace.1.in                    | 2 +-
 15 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index ef04f36c433..cbcfe51a3ff 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -109,6 +109,7 @@ nick@mysql.com
 nick@nick.leippe.com
 patg@krsna.patg.net
 paul@central.snake.net
+paul@frost.snake.net
 paul@ice.local
 paul@ice.snake.net
 paul@kite-hub.kitebird.com
diff --git a/man/isamchk.1.in b/man/isamchk.1.in
index cad1303ee55..15616ba475f 100644
--- a/man/isamchk.1.in
+++ b/man/isamchk.1.in
@@ -130,7 +130,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR
diff --git a/man/isamlog.1.in b/man/isamlog.1.in
index 6040f6c4ad8..0b1d3e8ca28 100644
--- a/man/isamlog.1.in
+++ b/man/isamlog.1.in
@@ -87,7 +87,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 
diff --git a/man/mysql.1.in b/man/mysql.1.in
index 7330ac8125b..60b582061a7 100644
--- a/man/mysql.1.in
+++ b/man/mysql.1.in
@@ -145,7 +145,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR
diff --git a/man/mysql_fix_privilege_tables.1.in b/man/mysql_fix_privilege_tables.1.in
index 1d42681f298..7996f4bb9e7 100644
--- a/man/mysql_fix_privilege_tables.1.in
+++ b/man/mysql_fix_privilege_tables.1.in
@@ -30,7 +30,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR
diff --git a/man/mysql_zap.1.in b/man/mysql_zap.1.in
index 511a8feaa7c..b8c61a83159 100644
--- a/man/mysql_zap.1.in
+++ b/man/mysql_zap.1.in
@@ -44,7 +44,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR 
diff --git a/man/mysqlaccess.1.in b/man/mysqlaccess.1.in
index cf2e0658a1c..323065c264b 100644
--- a/man/mysqlaccess.1.in
+++ b/man/mysqlaccess.1.in
@@ -110,7 +110,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR
diff --git a/man/mysqladmin.1.in b/man/mysqladmin.1.in
index a549f1c0e22..84f771da1e0 100644
--- a/man/mysqladmin.1.in
+++ b/man/mysqladmin.1.in
@@ -194,7 +194,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR
diff --git a/man/mysqld.1.in b/man/mysqld.1.in
index 719711edca2..771e919f306 100644
--- a/man/mysqld.1.in
+++ b/man/mysqld.1.in
@@ -219,7 +219,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR
diff --git a/man/mysqld_multi.1.in b/man/mysqld_multi.1.in
index 26e7a091b60..e5030477d39 100644
--- a/man/mysqld_multi.1.in
+++ b/man/mysqld_multi.1.in
@@ -74,7 +74,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 
diff --git a/man/mysqld_safe.1.in b/man/mysqld_safe.1.in
index 641f34677c7..2c300c6e73a 100644
--- a/man/mysqld_safe.1.in
+++ b/man/mysqld_safe.1.in
@@ -76,7 +76,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR
diff --git a/man/mysqldump.1.in b/man/mysqldump.1.in
index 6d1cc80c837..35508d0b65b 100644
--- a/man/mysqldump.1.in
+++ b/man/mysqldump.1.in
@@ -263,7 +263,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR
diff --git a/man/mysqlshow.1.in b/man/mysqlshow.1.in
index 903d9620fd6..a8bfb44cce1 100644
--- a/man/mysqlshow.1.in
+++ b/man/mysqlshow.1.in
@@ -83,7 +83,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR
diff --git a/man/perror.1.in b/man/perror.1.in
index f9efb48510b..286c9459569 100644
--- a/man/perror.1.in
+++ b/man/perror.1.in
@@ -43,7 +43,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR
diff --git a/man/replace.1.in b/man/replace.1.in
index 395411f7e9f..e8b0f286277 100644
--- a/man/replace.1.in
+++ b/man/replace.1.in
@@ -57,7 +57,7 @@ perror(1),
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR 

From 256c04dcd850070d9fd10ea18a1919cf889e7458 Mon Sep 17 00:00:00 2001
From: "paul@frost.snake.net" <>
Date: Thu, 17 Mar 2005 11:40:41 -0600
Subject: [PATCH 16/17] Update URL.

---
 man/isamchk.1.in                    | 2 +-
 man/isamlog.1.in                    | 2 +-
 man/mysql.1.in                      | 2 +-
 man/mysql_fix_privilege_tables.1.in | 2 +-
 man/mysql_zap.1.in                  | 2 +-
 man/mysqlaccess.1.in                | 2 +-
 man/mysqladmin.1.in                 | 2 +-
 man/mysqld.1.in                     | 2 +-
 man/mysqld_multi.1.in               | 2 +-
 man/mysqld_safe.1.in                | 2 +-
 man/mysqldump.1.in                  | 2 +-
 man/mysqlman.1.in                   | 2 +-
 man/mysqlshow.1.in                  | 2 +-
 man/perror.1.in                     | 2 +-
 man/replace.1.in                    | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/man/isamchk.1.in b/man/isamchk.1.in
index 15616ba475f..d908e8af3ee 100644
--- a/man/isamchk.1.in
+++ b/man/isamchk.1.in
@@ -130,7 +130,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://dev.mysql.com/doc/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR
diff --git a/man/isamlog.1.in b/man/isamlog.1.in
index 0b1d3e8ca28..5f69e70297a 100644
--- a/man/isamlog.1.in
+++ b/man/isamlog.1.in
@@ -87,7 +87,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://dev.mysql.com/doc/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 
diff --git a/man/mysql.1.in b/man/mysql.1.in
index 60b582061a7..c4463aa658b 100644
--- a/man/mysql.1.in
+++ b/man/mysql.1.in
@@ -145,7 +145,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://dev.mysql.com/doc/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR
diff --git a/man/mysql_fix_privilege_tables.1.in b/man/mysql_fix_privilege_tables.1.in
index 7996f4bb9e7..fe1016e8d98 100644
--- a/man/mysql_fix_privilege_tables.1.in
+++ b/man/mysql_fix_privilege_tables.1.in
@@ -30,7 +30,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://dev.mysql.com/doc/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR
diff --git a/man/mysql_zap.1.in b/man/mysql_zap.1.in
index b8c61a83159..fb030427dc2 100644
--- a/man/mysql_zap.1.in
+++ b/man/mysql_zap.1.in
@@ -44,7 +44,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://dev.mysql.com/doc/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR 
diff --git a/man/mysqlaccess.1.in b/man/mysqlaccess.1.in
index 323065c264b..e0b3d314a10 100644
--- a/man/mysqlaccess.1.in
+++ b/man/mysqlaccess.1.in
@@ -110,7 +110,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://dev.mysql.com/doc/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR
diff --git a/man/mysqladmin.1.in b/man/mysqladmin.1.in
index 84f771da1e0..e62cb32dc78 100644
--- a/man/mysqladmin.1.in
+++ b/man/mysqladmin.1.in
@@ -194,7 +194,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://dev.mysql.com/doc/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR
diff --git a/man/mysqld.1.in b/man/mysqld.1.in
index 771e919f306..73f07337f25 100644
--- a/man/mysqld.1.in
+++ b/man/mysqld.1.in
@@ -219,7 +219,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://dev.mysql.com/doc/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR
diff --git a/man/mysqld_multi.1.in b/man/mysqld_multi.1.in
index e5030477d39..58e5c71d01d 100644
--- a/man/mysqld_multi.1.in
+++ b/man/mysqld_multi.1.in
@@ -74,7 +74,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://dev.mysql.com/doc/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 
diff --git a/man/mysqld_safe.1.in b/man/mysqld_safe.1.in
index 2c300c6e73a..5aabd232a11 100644
--- a/man/mysqld_safe.1.in
+++ b/man/mysqld_safe.1.in
@@ -76,7 +76,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://dev.mysql.com/doc/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR
diff --git a/man/mysqldump.1.in b/man/mysqldump.1.in
index 35508d0b65b..4d841117e59 100644
--- a/man/mysqldump.1.in
+++ b/man/mysqldump.1.in
@@ -263,7 +263,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://dev.mysql.com/doc/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR
diff --git a/man/mysqlman.1.in b/man/mysqlman.1.in
index 610a64da198..b09b01ca759 100644
--- a/man/mysqlman.1.in
+++ b/man/mysqlman.1.in
@@ -9,7 +9,7 @@ In most cases, you can run the executable from the command line with a "--help"
 argument to display a brief summary of the executable's arguments and function.
 For more information about MySQL, please refer to the MySQL reference manual,
 which may already be installed locally and which is also available online at
-http://dev.mysql.com/doc/
+http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .\" end of man page
diff --git a/man/mysqlshow.1.in b/man/mysqlshow.1.in
index a8bfb44cce1..2db79ae070e 100644
--- a/man/mysqlshow.1.in
+++ b/man/mysqlshow.1.in
@@ -83,7 +83,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://dev.mysql.com/doc/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR
diff --git a/man/perror.1.in b/man/perror.1.in
index 286c9459569..45b343a9c3f 100644
--- a/man/perror.1.in
+++ b/man/perror.1.in
@@ -43,7 +43,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://dev.mysql.com/doc/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR
diff --git a/man/replace.1.in b/man/replace.1.in
index e8b0f286277..618ed0f5bea 100644
--- a/man/replace.1.in
+++ b/man/replace.1.in
@@ -57,7 +57,7 @@ perror(1),
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://dev.mysql.com/doc/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR 

From 3f378c52324271a1ee53c3fc81355aef13e5119d Mon Sep 17 00:00:00 2001
From: "heikki@hundin.mysql.fi" <>
Date: Mon, 21 Mar 2005 22:10:42 +0200
Subject: [PATCH 17/17] trx0trx.c, trx0trx.h:   If MySQL wrote to its binlog,
 but for some reason trx->update_undo and trx->insert_undo were NULL in
 InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log
 flush of trx_commit_complete_for_mysql() (Bug #9277)

---
 innobase/include/trx0trx.h |  6 ++++++
 innobase/trx/trx0trx.c     | 10 +++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/innobase/include/trx0trx.h b/innobase/include/trx0trx.h
index 3be16e8f46d..4c93f25009f 100644
--- a/innobase/include/trx0trx.h
+++ b/innobase/include/trx0trx.h
@@ -346,6 +346,12 @@ struct trx_struct{
 					in MySQL's binlog write, we will
 					flush the log to disk later in
 					a separate call */
+	ibool		must_flush_log_later;/* this flag is set to TRUE in
+					trx_commit_off_kernel() if
+					flush_log_later was TRUE, and there
+					were modifications by the transaction;
+					in that case we must flush the log
+					in trx_commit_complete_for_mysql() */
 	dulint		commit_lsn;	/* lsn at the time of the commit */
 	ibool		dict_operation;	/* TRUE if the trx is used to create
 					a table, create an index, or drop a
diff --git a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c
index 576827966ab..e2a24c2f63c 100644
--- a/innobase/trx/trx0trx.c
+++ b/innobase/trx/trx0trx.c
@@ -96,6 +96,7 @@ trx_create(
 	trx->check_unique_secondary = TRUE;
 
 	trx->flush_log_later = FALSE;
+	trx->must_flush_log_later = FALSE;
 
 	trx->dict_operation = FALSE;
 
@@ -634,6 +635,8 @@ trx_commit_off_kernel(
 #endif /* UNIV_SYNC_DEBUG */
 
 	rseg = trx->rseg;
+
+	trx->must_flush_log_later = FALSE;
 	
 	if (trx->insert_undo != NULL || trx->update_undo != NULL) {
 
@@ -798,6 +801,7 @@ trx_commit_off_kernel(
 
                 if (trx->flush_log_later) {
                         /* Do nothing yet */
+			trx->must_flush_log_later = TRUE;
                 } else if (srv_flush_log_at_trx_commit == 0) {
                         /* Do nothing */
                 } else if (srv_flush_log_at_trx_commit == 1) {
@@ -1516,7 +1520,9 @@ trx_commit_complete_for_mysql(
 	
 	trx->op_info = (char*)"flushing log";
 
-        if (srv_flush_log_at_trx_commit == 0) {
+	if (!trx->must_flush_log_later) {
+		/* Do nothing */
+	} if (srv_flush_log_at_trx_commit == 0) {
                 /* Do nothing */
         } else if (srv_flush_log_at_trx_commit == 1) {
                 if (srv_unix_file_flush_method == SRV_UNIX_NOSYNC) {
@@ -1538,6 +1544,8 @@ trx_commit_complete_for_mysql(
                 ut_error;
         }
 
+	trx->must_flush_log_later = FALSE;
+
 	trx->op_info = (char*)"";
 
         return(0);