From 59d20e26d57e9fc33cf44ada4ce511f507e3d623 Mon Sep 17 00:00:00 2001
From: "dlenev@mysql.com" <>
Date: Fri, 16 Jun 2006 20:21:25 +0400
Subject: [PATCH 01/14] Fix for bug#13479 "REPLACE activates UPDATE trigger,
 not the DELETE and INSERT triggers".

In cases when REPLACE was internally executed via update and table had
on update (on delete) triggers defined we exposed the fact that such
optimization used by callng on update (not calling on delete) triggers.
Such behavior contradicts our documentation which describes REPLACE as
INSERT with optional DELETE.

This fix just disables this optimization for tables with on delete triggers.
The optimization is still applied for tables which have on update but have
no on delete triggers, we just don't invoke on update triggers in this case
and thus don't expose information about optimization to user.

Also added test coverage for values returned by ROW_COUNT() function (and
thus for values returned by mysql_affected_rows()) for various forms of
INSERT.
---
 mysql-test/r/insert.result  | 26 ++++++++++++++++++++++
 mysql-test/r/trigger.result | 32 +++++++++------------------
 mysql-test/t/insert.test    | 23 ++++++++++++++++++++
 mysql-test/t/trigger.test   | 40 +++++++++++++++-------------------
 sql/sql_insert.cc           | 43 +++++++++++++++++--------------------
 5 files changed, 96 insertions(+), 68 deletions(-)

diff --git a/mysql-test/r/insert.result b/mysql-test/r/insert.result
index 00a987c9254..82fad8e912c 100644
--- a/mysql-test/r/insert.result
+++ b/mysql-test/r/insert.result
@@ -305,3 +305,29 @@ insert delayed into v1 values (1);
 ERROR HY000: 'test.v1' is not BASE TABLE
 drop table t1;
 drop view  v1;
+create table t1 (id int primary key, data int);
+insert into t1 values (1, 1), (2, 2), (3, 3);
+select row_count();
+row_count()
+3
+insert ignore into t1 values (1, 1);
+select row_count();
+row_count()
+0
+replace into t1 values (1, 11);
+select row_count();
+row_count()
+2
+replace into t1 values (4, 4);
+select row_count();
+row_count()
+1
+insert into t1 values (2, 2) on duplicate key update data= data + 10;
+select row_count();
+row_count()
+2
+insert into t1 values (5, 5) on duplicate key update data= data + 10;
+select row_count();
+row_count()
+1
+drop table t1;
diff --git a/mysql-test/r/trigger.result b/mysql-test/r/trigger.result
index 8b4aba367fb..d4791c6b117 100644
--- a/mysql-test/r/trigger.result
+++ b/mysql-test/r/trigger.result
@@ -169,21 +169,22 @@ select @log;
 @log
 (BEFORE_INSERT: new=(id=1, data=2))
 set @log:= "";
-replace t1 values (1, 3), (2, 2);
+insert into t1 (id, data) values (1, 3), (2, 2) on duplicate key update data= data + 1;
 select @log;
 @log
-(BEFORE_INSERT: new=(id=1, data=3))(BEFORE_UPDATE: old=(id=1, data=1) new=(id=1, data=3))(AFTER_UPDATE: old=(id=1, data=1) new=(id=1, data=3))(BEFORE_INSERT: new=(id=2, data=2))(AFTER_INSERT: new=(id=2, data=2))
-alter table t1 add ts timestamp default now();
+(BEFORE_INSERT: new=(id=1, data=3))(BEFORE_UPDATE: old=(id=1, data=1) new=(id=1, data=2))(AFTER_UPDATE: old=(id=1, data=1) new=(id=1, data=2))(BEFORE_INSERT: new=(id=2, data=2))(AFTER_INSERT: new=(id=2, data=2))
 set @log:= "";
-replace t1 (id, data) values (1, 4);
+replace t1 values (1, 4), (3, 3);
 select @log;
 @log
-(BEFORE_INSERT: new=(id=1, data=4))(BEFORE_DELETE: old=(id=1, data=3))(AFTER_DELETE: old=(id=1, data=3))(AFTER_INSERT: new=(id=1, data=4))
+(BEFORE_INSERT: new=(id=1, data=4))(BEFORE_DELETE: old=(id=1, data=2))(AFTER_DELETE: old=(id=1, data=2))(AFTER_INSERT: new=(id=1, data=4))(BEFORE_INSERT: new=(id=3, data=3))(AFTER_INSERT: new=(id=3, data=3))
+drop trigger t1_bd;
+drop trigger t1_ad;
 set @log:= "";
-insert into t1 (id, data) values (1, 5), (3, 3) on duplicate key update data= data + 2;
+replace t1 values (1, 5);
 select @log;
 @log
-(BEFORE_INSERT: new=(id=1, data=5))(BEFORE_UPDATE: old=(id=1, data=4) new=(id=1, data=6))(AFTER_UPDATE: old=(id=1, data=4) new=(id=1, data=6))(BEFORE_INSERT: new=(id=3, data=3))(AFTER_INSERT: new=(id=3, data=3))
+(BEFORE_INSERT: new=(id=1, data=5))(AFTER_INSERT: new=(id=1, data=5))
 drop table t1;
 create table t1 (id int primary key, data varchar(10), fk int);
 create table t2 (event varchar(100));
@@ -493,15 +494,9 @@ select * from t1;
 i	k
 3	13
 replace into t1 values (3, 3);
-ERROR 42S22: Unknown column 'at' in 'NEW'
-select * from t1;
-i	k
-3	3
-alter table t1 add ts timestamp default now();
-replace into t1 (i, k) values (3, 13);
 ERROR 42S22: Unknown column 'at' in 'OLD'
 select * from t1;
-i	k	ts
+i	k
 drop table t1, t2;
 create table t1 (i int, bt int, k int, key(k)) engine=myisam;
 create table t2 (i int);
@@ -574,18 +569,11 @@ i	k
 1	1
 2	2
 replace into t1 values (2, 4);
-ERROR 42S22: Unknown column 'bt' in 'NEW'
+ERROR 42S22: Unknown column 'bt' in 'OLD'
 select * from t1;
 i	k
 1	1
 2	2
-alter table t1 add ts timestamp default now();
-replace into t1 (i, k) values (2, 11);
-ERROR 42S22: Unknown column 'bt' in 'OLD'
-select * from t1;
-i	k	ts
-1	1	0000-00-00 00:00:00
-2	2	0000-00-00 00:00:00
 drop table t1, t2;
 drop function if exists bug5893;
 create table t1 (col1 int, col2 int);
diff --git a/mysql-test/t/insert.test b/mysql-test/t/insert.test
index 0c64dd80bec..ac43d0bc818 100644
--- a/mysql-test/t/insert.test
+++ b/mysql-test/t/insert.test
@@ -187,3 +187,26 @@ create view  v1 as select * from t1;
 insert delayed into v1 values (1);
 drop table t1;
 drop view  v1;
+
+#
+# Test for values returned by ROW_COUNT() function
+# (and thus for values returned by mysql_affected_rows())
+# for various forms of INSERT
+#
+create table t1 (id int primary key, data int);
+insert into t1 values (1, 1), (2, 2), (3, 3);
+select row_count();
+insert ignore into t1 values (1, 1);
+select row_count();
+# Reports that 2 rows are affected (1 deleted + 1 inserted)
+replace into t1 values (1, 11);
+select row_count();
+replace into t1 values (4, 4);
+select row_count();
+# Reports that 2 rows are affected. This conforms to documentation.
+# (Useful for differentiating inserts from updates).
+insert into t1 values (2, 2) on duplicate key update data= data + 10;
+select row_count();
+insert into t1 values (5, 5) on duplicate key update data= data + 10;
+select row_count();
+drop table t1;
diff --git a/mysql-test/t/trigger.test b/mysql-test/t/trigger.test
index a5bd2ba0b38..3743d8f5c76 100644
--- a/mysql-test/t/trigger.test
+++ b/mysql-test/t/trigger.test
@@ -185,24 +185,26 @@ select @log;
 set @log:= "";
 insert ignore t1 values (1, 2);
 select @log;
-# REPLACE: before insert trigger should be called for both records,
-#          but then for first one update will be executed (and both update
-#          triggers should fire). For second after insert trigger will be
-#          called as for usual insert
+# INSERT ... ON DUPLICATE KEY UPDATE ...
 set @log:= "";
-replace t1 values (1, 3), (2, 2);
+insert into t1 (id, data) values (1, 3), (2, 2) on duplicate key update data= data + 1;
 select @log;
-# Now let us change table in such way that REPLACE on won't be executed
-# using update.
-alter table t1 add ts timestamp default now();
+# REPLACE (also test for bug#13479 "REPLACE activates UPDATE trigger,
+#          not the DELETE and INSERT triggers")
+# We define REPLACE as INSERT which DELETEs old rows which conflict with
+# row being inserted. So for the first record in statement below we will
+# call before insert trigger, then delete will be executed (and both delete
+# triggers should fire). Finally after insert trigger will be called.
+# For the second record we will just call both on insert triggers.
 set @log:= "";
-# This REPLACE should be executed via DELETE and INSERT so proper 
-# triggers should be invoked.
-replace t1 (id, data) values (1, 4);
+replace t1 values (1, 4), (3, 3);
 select @log;
-# Finally let us test INSERT ... ON DUPLICATE KEY UPDATE ...
+# Now we will drop ON DELETE triggers to test REPLACE which is internally
+# executed via update
+drop trigger t1_bd;
+drop trigger t1_ad;
 set @log:= "";
-insert into t1 (id, data) values (1, 5), (3, 3) on duplicate key update data= data + 2; 
+replace t1 values (1, 5);
 select @log;
 
 # This also drops associated triggers
@@ -531,14 +533,11 @@ alter table t1 add primary key (i);
 --error 1054
 insert into t1 values (3, 4) on duplicate key update k= k + 10;
 select * from t1;
+# The following statement will delete old row and won't
+# insert new one since after delete trigger will fail.
 --error 1054
 replace into t1 values (3, 3);
 select * from t1;
-# Change table in such way that REPLACE will delete row
-alter table t1 add ts timestamp default now();
---error 1054
-replace into t1 (i, k) values (3, 13);
-select * from t1;
 # Also drops all triggers
 drop table t1, t2;
 
@@ -594,11 +593,6 @@ select * from t1;
 --error 1054
 replace into t1 values (2, 4);
 select * from t1;
-# Change table in such way that REPLACE will delete row
-alter table t1 add ts timestamp default now();
---error 1054
-replace into t1 (i, k) values (2, 11);
-select * from t1;
 # Also drops all triggers
 drop table t1, t2;
 
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 26f3b6f5faa..87483b17a99 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -1057,16 +1057,19 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
 	  to convert the latter operation internally to an UPDATE.
           We also should not perform this conversion if we have 
           timestamp field with ON UPDATE which is different from DEFAULT.
+          Another case when conversion should not be performed is when
+          we have ON DELETE trigger on table so user may notice that
+          we cheat here. Note that it is ok to do such conversion for
+          tables which have ON UPDATE but have no ON DELETE triggers,
+          we just should not expose this fact to users by invoking
+          ON UPDATE triggers.
 	*/
 	if (last_uniq_key(table,key_nr) &&
 	    !table->file->referenced_by_foreign_key() &&
             (table->timestamp_field_type == TIMESTAMP_NO_AUTO_SET ||
-             table->timestamp_field_type == TIMESTAMP_AUTO_SET_ON_BOTH))
+             table->timestamp_field_type == TIMESTAMP_AUTO_SET_ON_BOTH) &&
+            (!table->triggers || !table->triggers->has_delete_triggers()))
         {
-          if (table->triggers &&
-              table->triggers->process_triggers(thd, TRG_EVENT_UPDATE,
-                                                TRG_ACTION_BEFORE, TRUE))
-            goto before_trg_err;
           if (thd->clear_next_insert_id)
           {
             /* Reset auto-increment cacheing if we do an update */
@@ -1077,13 +1080,11 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
 					     table->record[0])))
             goto err;
           info->deleted++;
-          trg_error= (table->triggers &&
-                      table->triggers->process_triggers(thd, TRG_EVENT_UPDATE,
-                                                        TRG_ACTION_AFTER,
-                                                        TRUE));
-          /* Update logfile and count */
-          info->copied++;
-          goto ok_or_after_trg_err;
+          /*
+            Since we pretend that we have done insert we should call
+            its after triggers.
+          */
+          goto after_trg_n_copied_inc;
         }
         else
         {
@@ -1107,10 +1108,6 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
         }
       }
     }
-    info->copied++;
-    trg_error= (table->triggers &&
-                table->triggers->process_triggers(thd, TRG_EVENT_INSERT,
-                                                  TRG_ACTION_AFTER, TRUE));
   }
   else if ((error=table->file->write_row(table->record[0])))
   {
@@ -1118,14 +1115,14 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
 	(error != HA_ERR_FOUND_DUPP_KEY && error != HA_ERR_FOUND_DUPP_UNIQUE))
       goto err;
     table->file->restore_auto_increment();
+    goto ok_or_after_trg_err;
   }
-  else
-  {
-    info->copied++;
-    trg_error= (table->triggers &&
-                table->triggers->process_triggers(thd, TRG_EVENT_INSERT,
-                                                  TRG_ACTION_AFTER, TRUE));
-  }
+
+after_trg_n_copied_inc:
+  info->copied++;
+  trg_error= (table->triggers &&
+              table->triggers->process_triggers(thd, TRG_EVENT_INSERT,
+                                                TRG_ACTION_AFTER, TRUE));
 
 ok_or_after_trg_err:
   if (key)

From 2e56e821801c9303be9b6695ae2589289079e118 Mon Sep 17 00:00:00 2001
From: "anozdrin@mysql.com" <>
Date: Mon, 19 Jun 2006 14:13:34 +0400
Subject: [PATCH 02/14] Fix of test suite in scope of fixing BUG#18023: IM:
 instance can be started several times; monitor interval must be > 2sec

---
 mysql-test/r/im_daemon_life_cycle.result |   1 +
 mysql-test/r/im_life_cycle.result        |  76 ++++++------
 mysql-test/r/im_utils.result             |   3 +
 mysql-test/t/im_daemon_life_cycle-im.opt |   1 +
 mysql-test/t/im_daemon_life_cycle.imtest |  18 ++-
 mysql-test/t/im_life_cycle-im.opt        |   1 +
 mysql-test/t/im_life_cycle.imtest        | 140 ++++++++++++++++-------
 mysql-test/t/im_utils-im.opt             |   1 +
 mysql-test/t/im_utils.imtest             |  16 ++-
 mysql-test/t/kill_n_check.sh             | 115 +++++++++++++------
 mysql-test/t/wait_for_process.sh         |  66 +++++++++++
 11 files changed, 323 insertions(+), 115 deletions(-)
 create mode 100644 mysql-test/t/im_life_cycle-im.opt
 create mode 100644 mysql-test/t/im_utils-im.opt
 create mode 100755 mysql-test/t/wait_for_process.sh

diff --git a/mysql-test/r/im_daemon_life_cycle.result b/mysql-test/r/im_daemon_life_cycle.result
index d0a76b450fe..ea27fcb6db1 100644
--- a/mysql-test/r/im_daemon_life_cycle.result
+++ b/mysql-test/r/im_daemon_life_cycle.result
@@ -1,3 +1,4 @@
+Success: the process has been started.
 SHOW INSTANCES;
 instance_name	status
 mysqld1	online
diff --git a/mysql-test/r/im_life_cycle.result b/mysql-test/r/im_life_cycle.result
index 36277f6aa28..a9f78aea7d3 100644
--- a/mysql-test/r/im_life_cycle.result
+++ b/mysql-test/r/im_life_cycle.result
@@ -1,44 +1,45 @@
+
+--------------------------------------------------------------------
+-- 1.1.1.
+--------------------------------------------------------------------
+Success: the process has been started.
 SHOW INSTANCES;
 instance_name	status
 mysqld1	online
 mysqld2	offline
-SHOW INSTANCE STATUS mysqld1;
-instance_name	status	version
-mysqld1	online	VERSION
-SHOW INSTANCE STATUS mysqld2;
-instance_name	status	version
-mysqld2	offline	VERSION
+
+--------------------------------------------------------------------
+-- 1.1.2.
+--------------------------------------------------------------------
 START INSTANCE mysqld2;
-SHOW INSTANCES;
-instance_name	status
-mysqld1	online
-mysqld2	online
-SHOW INSTANCE STATUS mysqld1;
-instance_name	status	version
-mysqld1	online	VERSION
-SHOW INSTANCE STATUS mysqld2;
-instance_name	status	version
-mysqld2	online	VERSION
+Success: the process has been started.
 SHOW VARIABLES LIKE 'port';
 Variable_name	Value
-port	IM_MYSQLD1_PORT
+port	IM_MYSQLD2_PORT
+
+--------------------------------------------------------------------
+-- 1.1.3.
+--------------------------------------------------------------------
 STOP INSTANCE mysqld2;
-SHOW INSTANCES;
-instance_name	status
-mysqld1	online
-mysqld2	offline
-SHOW INSTANCE STATUS mysqld1;
-instance_name	status	version
-mysqld1	online	VERSION
-SHOW INSTANCE STATUS mysqld2;
-instance_name	status	version
-mysqld2	offline	VERSION
+Success: the process has been stopped.
+
+--------------------------------------------------------------------
+-- 1.1.4.
+--------------------------------------------------------------------
 START INSTANCE mysqld3;
 ERROR HY000: Bad instance name. Check that the instance with such a name exists
 START INSTANCE mysqld1;
 ERROR HY000: The instance is already started
+
+--------------------------------------------------------------------
+-- 1.1.5.
+--------------------------------------------------------------------
 STOP INSTANCE mysqld3;
 ERROR HY000: Bad instance name. Check that the instance with such a name exists
+
+--------------------------------------------------------------------
+-- 1.1.6.
+--------------------------------------------------------------------
 SHOW INSTANCES;
 instance_name	status
 mysqld1	online
@@ -50,20 +51,25 @@ SHOW INSTANCES;
 instance_name	status
 mysqld1	online
 mysqld2	offline
+
+--------------------------------------------------------------------
+-- 1.1.7.
+--------------------------------------------------------------------
 START INSTANCE mysqld2;
-SHOW INSTANCES;
-instance_name	status
-mysqld1	online
-mysqld2	online
+Success: the process has been started.
 Killing the process...
 Sleeping...
 Success: the process was killed.
-SHOW INSTANCES;
-instance_name	status
-mysqld1	online
-mysqld2	offline
+
+--------------------------------------------------------------------
+-- 1.1.8.
+--------------------------------------------------------------------
 SHOW INSTANCE STATUS;
 ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use
+
+--------------------------------------------------------------------
+-- BUG#12813
+--------------------------------------------------------------------
 START INSTANCE mysqld1,mysqld2,mysqld3;
 ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use
 STOP INSTANCE mysqld1,mysqld2,mysqld3;
diff --git a/mysql-test/r/im_utils.result b/mysql-test/r/im_utils.result
index fbfaeaebcac..e6a5e007ed4 100644
--- a/mysql-test/r/im_utils.result
+++ b/mysql-test/r/im_utils.result
@@ -1,3 +1,4 @@
+Success: the process has been started.
 SHOW INSTANCES;
 instance_name	status
 mysqld1	online
@@ -42,7 +43,9 @@ skip-innodb	VALUE
 skip-bdb	VALUE
 skip-ndbcluster	VALUE
 START INSTANCE mysqld2;
+Success: the process has been started.
 STOP INSTANCE mysqld2;
+Success: the process has been stopped.
 SHOW mysqld1 LOG FILES;
 Logfile	Path	File size
 ERROR LOG	PATH	FILE_SIZE
diff --git a/mysql-test/t/im_daemon_life_cycle-im.opt b/mysql-test/t/im_daemon_life_cycle-im.opt
index 21c01191e4c..3a45c7a41f7 100644
--- a/mysql-test/t/im_daemon_life_cycle-im.opt
+++ b/mysql-test/t/im_daemon_life_cycle-im.opt
@@ -1,2 +1,3 @@
 --run-as-service
 --log=$MYSQLTEST_VARDIR/log/im.log
+--monitoring-interval=1
diff --git a/mysql-test/t/im_daemon_life_cycle.imtest b/mysql-test/t/im_daemon_life_cycle.imtest
index 87388d7c1e6..3afc36935f8 100644
--- a/mysql-test/t/im_daemon_life_cycle.imtest
+++ b/mysql-test/t/im_daemon_life_cycle.imtest
@@ -10,6 +10,22 @@
 
 ###########################################################################
 
+# Wait for mysqld1 (guarded instance) to start.
+
+--exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD1_PATH_PID 30 started
+
+# Let IM detect that mysqld1 is online. This delay should be longer than
+# monitoring interval.
+
+--sleep 3
+
+# Check that start conditions are as expected.
+
 SHOW INSTANCES;
 
---exec $MYSQL_TEST_DIR/t/kill_n_check.sh $IM_PATH_PID restarted
+###########################################################################
+
+# Kill the IM main process and check that the IM Angel will restart the main
+# process.
+
+--exec $MYSQL_TEST_DIR/t/kill_n_check.sh $IM_PATH_PID restarted 30
diff --git a/mysql-test/t/im_life_cycle-im.opt b/mysql-test/t/im_life_cycle-im.opt
new file mode 100644
index 00000000000..34b74ce0c95
--- /dev/null
+++ b/mysql-test/t/im_life_cycle-im.opt
@@ -0,0 +1 @@
+--monitoring-interval=1
diff --git a/mysql-test/t/im_life_cycle.imtest b/mysql-test/t/im_life_cycle.imtest
index 445ae7f72fa..2cbe53a7b28 100644
--- a/mysql-test/t/im_life_cycle.imtest
+++ b/mysql-test/t/im_life_cycle.imtest
@@ -17,11 +17,23 @@
 #
 ###########################################################################
 
+--echo
+--echo --------------------------------------------------------------------
+--echo -- 1.1.1.
+--echo --------------------------------------------------------------------
+
+# Wait for mysqld1 (guarded instance) to start.
+
+--exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD1_PATH_PID 30 started
+
+# Let IM detect that mysqld1 is online. This delay should be longer than
+# monitoring interval.
+
+--sleep 3
+
+# Check that start conditions are as expected.
+
 SHOW INSTANCES;
---replace_column 3 VERSION
-SHOW INSTANCE STATUS mysqld1;
---replace_column 3 VERSION
-SHOW INSTANCE STATUS mysqld2;
 
 ###########################################################################
 #
@@ -33,20 +45,24 @@ SHOW INSTANCE STATUS mysqld2;
 #
 ###########################################################################
 
+--echo
+--echo --------------------------------------------------------------------
+--echo -- 1.1.2.
+--echo --------------------------------------------------------------------
+
 START INSTANCE mysqld2;
-# FIXME
---sleep 3
+# FIXME: START INSTANCE should be synchronous.
+--exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 started
 
-SHOW INSTANCES;
---replace_column 3 VERSION
-SHOW INSTANCE STATUS mysqld1;
---replace_column 3 VERSION
-SHOW INSTANCE STATUS mysqld2;
+# FIXME: SHOW INSTANCES is not deterministic unless START INSTANCE is
+# synchronous. Even waiting for mysqld to start by looking at its pid file is
+# not enough, because IM may not detect that mysqld has started.
+# SHOW INSTANCES;
 
---connect (mysql_con,localhost,root,,mysql,$IM_MYSQLD1_PORT,$IM_MYSQLD1_SOCK)
+--connect (mysql_con,localhost,root,,mysql,$IM_MYSQLD2_PORT,$IM_MYSQLD2_SOCK)
 --connection mysql_con
 
---replace_result $IM_MYSQLD1_PORT IM_MYSQLD1_PORT
+--replace_result $IM_MYSQLD2_PORT IM_MYSQLD2_PORT
 SHOW VARIABLES LIKE 'port';
 
 --connection default
@@ -61,15 +77,19 @@ SHOW VARIABLES LIKE 'port';
 #
 ###########################################################################
 
-STOP INSTANCE mysqld2;
-# FIXME
---sleep 3
+--echo
+--echo --------------------------------------------------------------------
+--echo -- 1.1.3.
+--echo --------------------------------------------------------------------
 
-SHOW INSTANCES;
---replace_column 3 VERSION
-SHOW INSTANCE STATUS mysqld1;
---replace_column 3 VERSION
-SHOW INSTANCE STATUS mysqld2;
+STOP INSTANCE mysqld2;
+# FIXME: STOP INSTANCE should be synchronous.
+--exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 stopped
+
+# FIXME: SHOW INSTANCES is not deterministic unless START INSTANCE is
+# synchronous. Even waiting for mysqld to start by looking at its pid file is
+# not enough, because IM may not detect that mysqld has started.
+# SHOW INSTANCES;
 
 ###########################################################################
 #
@@ -81,16 +101,17 @@ SHOW INSTANCE STATUS mysqld2;
 #
 ###########################################################################
 
---error 3000
+--echo
+--echo --------------------------------------------------------------------
+--echo -- 1.1.4.
+--echo --------------------------------------------------------------------
+
+--error 3000 # ER_BAD_INSTANCE_NAME
 START INSTANCE mysqld3;
 
---error 3002
+--error 3002 # ER_INSTANCE_ALREADY_STARTED
 START INSTANCE mysqld1;
 
-# FIXME TODO
-# BUG#12813: START/STOP INSTANCE commands accept a list as argument
-# START INSTANCE mysqld1, mysqld2;
-
 ###########################################################################
 #
 # 1.1.5. Check that Instance Manager reports correct errors for 'STOP INSTANCE'
@@ -101,27 +122,40 @@ START INSTANCE mysqld1;
 #
 ###########################################################################
 
---error 3000
+--echo
+--echo --------------------------------------------------------------------
+--echo -- 1.1.5.
+--echo --------------------------------------------------------------------
+
+--error 3000 # ER_BAD_INSTANCE_NAME
 STOP INSTANCE mysqld3;
 
 # TODO: IM should be fixed.
 # BUG#12673: Instance Manager allows to stop the instance many times
-# --error 3002
+# --error 3002 # ER_INSTANCE_ALREADY_STARTED
 # STOP INSTANCE mysqld2;
 
-# FIXME TODO
-# BUG#12813: START/STOP INSTANCE commands accept a list as argument
-# STOP INSTANCE mysqld1, mysqld2;
-
 ###########################################################################
 #
 # 1.1.6. Check that Instance Manager is able to restart guarded instances.
 #
 ###########################################################################
 
+--echo
+--echo --------------------------------------------------------------------
+--echo -- 1.1.6.
+--echo --------------------------------------------------------------------
+
 SHOW INSTANCES;
 
---exec $MYSQL_TEST_DIR/t/kill_n_check.sh $IM_MYSQLD1_PATH_PID restarted
+--exec $MYSQL_TEST_DIR/t/kill_n_check.sh $IM_MYSQLD1_PATH_PID restarted 30
+
+# Give some time to IM to detect that mysqld was restarted. It should be longer
+# than monitoring interval.
+
+--sleep 3
+
+SHOW INSTANCES;
 
 ###########################################################################
 #
@@ -129,17 +163,26 @@ SHOW INSTANCES;
 #
 ###########################################################################
 
-SHOW INSTANCES;
+--echo
+--echo --------------------------------------------------------------------
+--echo -- 1.1.7.
+--echo --------------------------------------------------------------------
 
 START INSTANCE mysqld2;
-# FIXME
---sleep 3
+# FIXME: START INSTANCE should be synchronous.
+--exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 started
 
-SHOW INSTANCES;
+# FIXME: SHOW INSTANCES is not deterministic unless START INSTANCE is
+# synchronous. Even waiting for mysqld to start by looking at its pid file is
+# not enough, because IM may not detect that mysqld has started.
+# SHOW INSTANCES;
 
---exec $MYSQL_TEST_DIR/t/kill_n_check.sh $IM_MYSQLD2_PATH_PID killed
+--exec $MYSQL_TEST_DIR/t/kill_n_check.sh $IM_MYSQLD2_PATH_PID killed 10
 
-SHOW INSTANCES;
+# FIXME: SHOW INSTANCES is not deterministic unless START INSTANCE is
+# synchronous. Even waiting for mysqld to start by looking at its pid file is
+# not enough, because IM may not detect that mysqld has started.
+# SHOW INSTANCES;
 
 ###########################################################################
 #
@@ -147,7 +190,13 @@ SHOW INSTANCES;
 # incomplete SHOW INSTANCE STATUS command.
 #
 ###########################################################################
---error 1149
+
+--echo
+--echo --------------------------------------------------------------------
+--echo -- 1.1.8.
+--echo --------------------------------------------------------------------
+
+--error ER_SYNTAX_ERROR
 SHOW INSTANCE STATUS;
 
 #
@@ -159,8 +208,13 @@ SHOW INSTANCE STATUS;
 #                                 a list as argument.
 #
 
---error 1149
+--echo
+--echo --------------------------------------------------------------------
+--echo -- BUG#12813
+--echo --------------------------------------------------------------------
+
+--error ER_SYNTAX_ERROR
 START INSTANCE mysqld1,mysqld2,mysqld3;
 
---error 1149
+--error ER_SYNTAX_ERROR
 STOP INSTANCE mysqld1,mysqld2,mysqld3;
diff --git a/mysql-test/t/im_utils-im.opt b/mysql-test/t/im_utils-im.opt
new file mode 100644
index 00000000000..34b74ce0c95
--- /dev/null
+++ b/mysql-test/t/im_utils-im.opt
@@ -0,0 +1 @@
+--monitoring-interval=1
diff --git a/mysql-test/t/im_utils.imtest b/mysql-test/t/im_utils.imtest
index dc6fb93c4ff..47902eeba52 100644
--- a/mysql-test/t/im_utils.imtest
+++ b/mysql-test/t/im_utils.imtest
@@ -17,6 +17,17 @@
 #  - the second instance is offline;
 #
 
+# Wait for mysqld1 (guarded instance) to start.
+
+--exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD1_PATH_PID 30 started
+
+# Let IM detect that mysqld1 is online. This delay should be longer than
+# monitoring interval.
+
+--sleep 3
+
+# Check that start conditions are as expected.
+
 SHOW INSTANCES;
 
 #
@@ -40,11 +51,10 @@ SHOW INSTANCE OPTIONS mysqld2;
 #
 
 START INSTANCE mysqld2;
-
-# FIXME
--- sleep 3
+--exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 started
 
 STOP INSTANCE mysqld2;
+--exec $MYSQL_TEST_DIR/t/wait_for_process.sh $IM_MYSQLD2_PATH_PID 30 stopped
 
 #
 # Check 'SHOW LOG FILES' command:
diff --git a/mysql-test/t/kill_n_check.sh b/mysql-test/t/kill_n_check.sh
index e722b3a180d..64cc869d1ec 100755
--- a/mysql-test/t/kill_n_check.sh
+++ b/mysql-test/t/kill_n_check.sh
@@ -1,66 +1,115 @@
 #!/bin/sh
 
-if [ $# -ne 2 ]; then
-  echo "Usage: kill_n_check.sh <pid file path> killed|restarted"
+###########################################################################
+
+# NOTE: this script returns 0 (success) even in case of failure. This is
+# because this script is executed under mysql-test-run[.pl] and it's better to
+# examine particular problem in log file, than just having said that the test
+# case has failed.
+
+###########################################################################
+
+check_restart()
+{
+  if [ ! -r "$pid_path" ]; then
+    user_msg='the process was killed'
+    return 1
+  fi
+
+  new_pid=`cat "$pid_path" 2>/dev/null`
+
+  if [ $? -eq 0 -a "$original_pid" = "$new_pid" ]; then
+    user_msg='the process was not restarted'
+    return 1
+  fi
+
+  user_msg='the process was restarted'
+  return 0
+}
+
+###########################################################################
+
+if [ $# -ne 3 ]; then
+  echo "Usage: kill_n_check.sh <pid file path> killed|restarted <timeout>"
   exit 0
 fi
 
 pid_path="$1"
 expected_result="$2"
+total_timeout="$3"
 
-if [ -z "$pid_path" -o ! -r "$pid_path" ]; then
-  echo "Error: invalid PID path ($pid_path) or PID file does not exist."
+if [ "$expected_result" != 'killed' -a \
+     "$expected_result" != 'restarted' ]; then
+  echo "Error: invalid second argument ('killed' or 'restarted' expected)."
   exit 0
 fi
 
-if [ "$expected_result" != "killed" -a \
-     "$expected_result" != "restarted" ]; then
-  echo "Error: expected result must be either 'killed' or 'restarted'."
+if [ -z "$pid_path" ]; then
+  echo "Error: invalid PID path ($pid_path)."
   exit 0
 fi
 
-# echo "PID path: '$pid_path'"
+if [ $expected_result = 'killed' -a ! -r "$pid_path" ]; then
+  echo "Error: PID file ($pid_path) does not exist."
+  exit 0
+fi
+
+if [ -z "$total_timeout" ]; then
+  echo "Error: timeout is not specified."
+  exit 0
+fi
+
+###########################################################################
 
 original_pid=`cat "$pid_path"`
 
-# echo "Original PID: $original_pid"
-
 echo "Killing the process..."
 
 kill -9 $original_pid
 
+###########################################################################
+
 echo "Sleeping..."
 
-sleep 3
-
-new_pid=""
-
-[ -r "$pid_path" ] && new_pid=`cat "$pid_path"`
-
-# echo "New PID: $new_pid"
-
 if [ "$expected_result" = "restarted" ]; then
 
-  if [ -z "$new_pid" ]; then
-    echo "Error: the process was killed."
-    exit 0
-  fi
+  # Wait for the process to restart.
 
-  if [ "$original_pid" -eq "$new_pid" ]; then
-    echo "Error: the process was not restarted."
-    exit 0
-  fi
-  
-  echo "Success: the process was restarted."
+  cur_attempt=1
+
+  while true; do
+
+    if check_restart; then
+      echo "Success: $user_msg."
+      exit 0
+    fi
+
+    [ $cur_attempt -ge $total_timeout ] && break
+
+    sleep 1
+
+    cur_attempt=`expr $cur_attempt + 1`
+
+  done
+
+  echo "Error: $user_msg."
   exit 0
-  
-else # $expected_result = killed
-    
+
+else # $expected_result == killed
+
+  # Here we have to sleep for some long time to ensure that the process will
+  # not be restarted.
+
+  sleep $total_timeout
+
+  new_pid=`cat "$pid_path" 2>/dev/null`
+
   if [ "$new_pid" -a "$new_pid" -ne "$original_pid" ]; then
     echo "Error: the process was restarted."
-    exit 0
+  else
+    echo "Success: the process was killed."
   fi
 
-  echo "Success: the process was killed."
   exit 0
+
 fi
diff --git a/mysql-test/t/wait_for_process.sh b/mysql-test/t/wait_for_process.sh
new file mode 100755
index 00000000000..df0f4a17e3a
--- /dev/null
+++ b/mysql-test/t/wait_for_process.sh
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+###########################################################################
+
+pid_path="$1"
+total_attempts="$2"
+event="$3"
+
+case "$3" in
+  started)
+    check_fn='check_started';
+    ;;
+
+  stopped)
+    check_fn='check_stopped';
+    ;;
+
+  *)
+    echo "Error: invalid third argument ('started' or 'stopped' expected)."
+    exit 0
+esac
+
+###########################################################################
+
+check_started()
+{
+  [ ! -r "$pid_path" ] && return 1
+
+  new_pid=`cat "$pid_path" 2>/dev/null`
+
+  [ $? -eq 0 -a "$original_pid" = "$new_pid" ] && return 1
+
+  return 0
+}
+
+###########################################################################
+
+check_stopped()
+{
+  [ -r "$pid_path" ] && return 1
+
+  return 0
+}
+
+###########################################################################
+
+cur_attempt=1
+
+while true; do
+
+  if ( eval $check_fn ); then
+    echo "Success: the process has been $event."
+    exit 0
+  fi
+
+  [ $cur_attempt -ge $total_attempts ] && break
+
+  sleep 1
+
+  cur_attempt=`expr $cur_attempt + 1`
+
+done
+
+echo "Error: the process has not been $event in $total_attempts secs."
+exit 0
+

From a142a4d97bdb82351852a1c78afa611f4cc8946a Mon Sep 17 00:00:00 2001
From: "anozdrin@mysql.com" <>
Date: Mon, 19 Jun 2006 14:15:26 +0400
Subject: [PATCH 03/14] Small fix for test suite:   - fix for IM stopping
 routine;   - polishing.

---
 mysql-test/lib/mtr_process.pl | 17 ++++++++---
 mysql-test/mysql-test-run.pl  | 54 +++++++++++++++++++++++++++++++----
 2 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl
index 6fa6bc73bdb..0ca16b61fc2 100644
--- a/mysql-test/lib/mtr_process.pl
+++ b/mysql-test/lib/mtr_process.pl
@@ -890,19 +890,28 @@ sub mtr_kill_processes ($) {
 sub mtr_kill_process ($$$$) {
   my $pid= shift;
   my $signal= shift;
-  my $retries= shift;
+  my $total_retries= shift;
   my $timeout= shift;
 
-  while (1)
+  for (my $cur_attempt= 1; $cur_attempt <= $total_retries; ++$cur_attempt)
   {
+    mtr_debug("Sending $signal to $pid...");
+
     kill($signal, $pid);
 
-    last unless kill (0, $pid) and $retries--;
+    unless (kill (0, $pid))
+    {
+      mtr_debug("Process $pid died.");
+      return;
+    }
 
-    mtr_debug("Sleep $timeout second waiting for processes to die");
+    mtr_debug("Sleeping $timeout second(s) waiting for processes to die...");
 
     sleep($timeout);
   }
+
+  mtr_debug("Process $pid is still alive after $total_retries " .
+            "of sending signal $signal.");
 }
 
 ##############################################################################
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 4a9628c0721..24e0cbb6699 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2843,22 +2843,58 @@ sub im_stop($) {
 
   # Try graceful shutdown.
 
+  mtr_debug("IM-main pid: $instance_manager->{'pid'}");
+  mtr_debug("Stopping IM-main...");
+
   mtr_kill_process($instance_manager->{'pid'}, 'TERM', 10, 1);
 
+  # If necessary, wait for angel process to die.
+
+  if (defined $instance_manager->{'angel_pid'})
+  {
+    mtr_debug("IM-angel pid: $instance_manager->{'angel_pid'}");
+    mtr_debug("Waiting for IM-angel to die...");
+
+    my $total_attempts= 10;
+
+    for (my $cur_attempt=1; $cur_attempt <= $total_attempts; ++$cur_attempt)
+    {
+      unless (kill (0, $instance_manager->{'angel_pid'}))
+      {
+        mtr_debug("IM-angel died.");
+        last;
+      }
+
+      sleep(1);
+    }
+  }
+
   # Check that all processes died.
 
   my $clean_shutdown= 0;
 
   while (1)
   {
-    last if kill (0, $instance_manager->{'pid'});
+    if (kill (0, $instance_manager->{'pid'}))
+    {
+      mtr_debug("IM-main is still alive.");
+      last;
+    }
 
-    last if (defined $instance_manager->{'angel_pid'}) &&
-            kill (0, $instance_manager->{'angel_pid'});
+    if (defined $instance_manager->{'angel_pid'} &&
+        kill (0, $instance_manager->{'angel_pid'}))
+    {
+      mtr_debug("IM-angel is still alive.");
+      last;
+    }
 
     foreach my $pid (@mysqld_pids)
     {
-      last if kill (0, $pid);
+      if (kill (0, $pid))
+      {
+        mtr_debug("Guarded mysqld ($pid) is still alive.");
+        last;
+      }
     }
 
     $clean_shutdown= 1;
@@ -2869,15 +2905,21 @@ sub im_stop($) {
 
   unless ($clean_shutdown)
   {
-    mtr_kill_process($instance_manager->{'angel_pid'}, 'KILL', 10, 1)
-      if defined $instance_manager->{'angel_pid'};
+
+    if (defined $instance_manager->{'angel_pid'})
+    {
+      mtr_debug("Killing IM-angel...");
+      mtr_kill_process($instance_manager->{'angel_pid'}, 'KILL', 10, 1)
+    }
     
+    mtr_debug("Killing IM-main...");
     mtr_kill_process($instance_manager->{'pid'}, 'KILL', 10, 1);
 
     # Shutdown managed mysqld-processes. Some of them may be nonguarded, so IM
     # will not stop them on shutdown. So, we should firstly try to end them
     # legally.
 
+    mtr_debug("Killing guarded mysqld(s)...");
     mtr_kill_processes(\@mysqld_pids);
 
     # Complain in error log so that a warning will be shown.

From a992833d837cc77b6749ae8b468d0b596a84d7e8 Mon Sep 17 00:00:00 2001
From: "anozdrin@mysql.com" <>
Date: Mon, 19 Jun 2006 14:16:10 +0400
Subject: [PATCH 04/14] The second fix for BUG#19391: IM fails to start after
 two executions.

---
 server-tools/instance-manager/guardian.cc     |  3 --
 server-tools/instance-manager/instance_map.cc |  2 +-
 server-tools/instance-manager/manager.cc      | 43 +++++++++++++------
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/server-tools/instance-manager/guardian.cc b/server-tools/instance-manager/guardian.cc
index fa9d877fde6..24844e05776 100644
--- a/server-tools/instance-manager/guardian.cc
+++ b/server-tools/instance-manager/guardian.cc
@@ -271,10 +271,7 @@ int Guardian_thread::init()
   {
     if (!(instance->options.nonguarded))
       if (guard(instance, TRUE))                /* do not lock guardian */
-      {
-        instance_map->unlock();
         return 1;
-      }
   }
 
   return 0;
diff --git a/server-tools/instance-manager/instance_map.cc b/server-tools/instance-manager/instance_map.cc
index 543c9c31bfa..3b7f58d8a09 100644
--- a/server-tools/instance-manager/instance_map.cc
+++ b/server-tools/instance-manager/instance_map.cc
@@ -215,7 +215,7 @@ int Instance_map::flush_instances()
   hash_init(&hash, default_charset_info, START_HASH_SIZE, 0, 0,
             get_instance_key, delete_instance, 0);
   rc= load();
-  guardian->init();
+  guardian->init(); // TODO: check error status.
   pthread_mutex_unlock(&LOCK_instance_map);
   guardian->unlock();
   return rc;
diff --git a/server-tools/instance-manager/manager.cc b/server-tools/instance-manager/manager.cc
index 00ef50a84e1..353dfcf64dc 100644
--- a/server-tools/instance-manager/manager.cc
+++ b/server-tools/instance-manager/manager.cc
@@ -147,6 +147,25 @@ void manager(const Options &options)
   if (create_pid_file(options.pid_file_name, manager_pid))
     return;
 
+  /*
+    Initialize signals and alarm-infrastructure.
+
+    NOTE: To work nicely with LinuxThreads, the signal thread is the first
+    thread in the process.
+
+    NOTE:
+      After init_thr_alarm() call it's possible to call thr_alarm() (from
+      different threads), that results in sending ALARM signal to the alarm
+      thread (which can be the main thread). That signal can interrupt
+      blocking calls.
+
+      In other words, a blocking call can be interrupted in the main thread
+      after init_thr_alarm().
+  */
+
+  sigset_t mask;
+  set_signals(&mask);
+
   /* create guardian thread */
   {
     pthread_t guardian_thd_id;
@@ -154,9 +173,16 @@ void manager(const Options &options)
     int rc;
 
     /*
-       NOTE: Guardian should be shutdown first. Only then all other threads
-       need to be stopped. This should be done, as guardian is responsible for
-       shutting down the instances, and this is a long operation.
+      NOTE: Guardian should be shutdown first. Only then all other threads
+      need to be stopped. This should be done, as guardian is responsible
+      for shutting down the instances, and this is a long operation.
+
+      NOTE: Guardian uses thr_alarm() when detects current state of
+      instances (is_running()), but it is not interfere with
+      flush_instances() later in the code, because until flush_instances()
+      complete in the main thread, Guardian thread is not permitted to
+      process instances. And before flush_instances() there is no instances
+      to proceed.
     */
 
     pthread_attr_init(&guardian_thd_attr);
@@ -172,10 +198,8 @@ void manager(const Options &options)
 
   }
 
-  /*
-    To work nicely with LinuxThreads, the signal thread is the first thread
-    in the process.
-  */
+  /* Load instances. */
+
   int signo;
   bool shutdown_complete;
 
@@ -189,11 +213,6 @@ void manager(const Options &options)
     return;
   }
 
-  /* Initialize signals and alarm-infrastructure. */
-
-  sigset_t mask;
-  set_signals(&mask);
-
   /* create the listener */
   {
     pthread_t listener_thd_id;

From 0f55e30fa834083237423cacd3db51c2ff999c06 Mon Sep 17 00:00:00 2001
From: "tomas@poseidon.ndb.mysql.com" <>
Date: Tue, 20 Jun 2006 15:45:17 +0200
Subject: [PATCH 05/14] Bug #19543 Out REDO log on subscription creation during
 startup, missing error message - add error message

---
 storage/ndb/src/kernel/blocks/suma/Suma.cpp    | 15 +++++++++++++++
 storage/ndb/src/kernel/error/ndbd_exit_codes.c |  4 ++++
 2 files changed, 19 insertions(+)

diff --git a/storage/ndb/src/kernel/blocks/suma/Suma.cpp b/storage/ndb/src/kernel/blocks/suma/Suma.cpp
index 91f0fab06f8..686ae476879 100644
--- a/storage/ndb/src/kernel/blocks/suma/Suma.cpp
+++ b/storage/ndb/src/kernel/blocks/suma/Suma.cpp
@@ -410,7 +410,22 @@ Suma::createSequenceReply(Signal* signal,
   jam();
 
   if (ref != NULL)
+  {
+    switch ((UtilSequenceRef::ErrorCode)ref->errorCode)
+    {
+      case UtilSequenceRef::NoSuchSequence:
+        ndbrequire(false);
+      case UtilSequenceRef::TCError:
+      {
+        char buf[128];
+        snprintf(buf, sizeof(buf),
+                 "Startup failed during sequence creation. TC error %d",
+                 ref->TCErrorCode);
+        progError(__LINE__, NDBD_EXIT_RESOURCE_ALLOC_ERROR, buf);
+      }
+    }
     ndbrequire(false);
+  }
 
   sendSTTORRY(signal);
 }
diff --git a/storage/ndb/src/kernel/error/ndbd_exit_codes.c b/storage/ndb/src/kernel/error/ndbd_exit_codes.c
index 6a14d8b7ffd..005bf830a69 100644
--- a/storage/ndb/src/kernel/error/ndbd_exit_codes.c
+++ b/storage/ndb/src/kernel/error/ndbd_exit_codes.c
@@ -80,6 +80,10 @@ static const ErrStruct errArray[] =
    /* this error message is complemented by additional info when generated */
    {NDBD_EXIT_INVALID_CONFIG, XCE,
     "Invalid configuration received from Management Server"},
+
+   {NDBD_EXIT_RESOURCE_ALLOC_ERROR, XCE,
+    "Resource allocation error, please review the configuration"},
+
    /* this error message is complemented by additional info when
       generated, such as signal, and text
    */

From 75164ffc2fcd7ea8735d0739b6a2d55ee5329233 Mon Sep 17 00:00:00 2001
From: "evgen@moonbone.local" <>
Date: Tue, 20 Jun 2006 20:11:08 +0400
Subject: [PATCH 06/14] rpl_ndb_log.result:   Fixed failing test case

---
 mysql-test/r/rpl_ndb_log.result | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/mysql-test/r/rpl_ndb_log.result b/mysql-test/r/rpl_ndb_log.result
index c435fb37531..74ecd8e7879 100644
--- a/mysql-test/r/rpl_ndb_log.result
+++ b/mysql-test/r/rpl_ndb_log.result
@@ -132,3 +132,19 @@ ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find tar
 DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;
+create table t1(a int auto_increment primary key, b int);
+insert into t1 values (NULL, 1);
+reset master;
+set insert_id=5;
+insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
+show binlog events;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
+slave-bin.000001	#	Table_map	2	#	table_id: 29 (test.t1)
+slave-bin.000001	#	Write_rows	2	#	table_id: 29 flags: STMT_END_F
+select * from t1;
+a	b
+1	1
+5	1
+6	1
+drop table t1;

From f5f9f471d1ada04b1bac10369d88d518dc8c6a73 Mon Sep 17 00:00:00 2001
From: "tomas@poseidon.ndb.mysql.com" <>
Date: Tue, 20 Jun 2006 19:13:46 +0200
Subject: [PATCH 07/14] Bug #17297 Fix error messages

---
 ndb/src/common/transporter/TransporterRegistry.cpp | 2 +-
 ndb/src/kernel/blocks/dbdih/DbdihMain.cpp          | 2 +-
 ndb/src/kernel/blocks/dblqh/DblqhMain.cpp          | 3 ++-
 ndb/src/kernel/error/ndbd_exit_codes.c             | 7 ++++---
 ndb/src/ndbapi/ndberror.c                          | 1 +
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ndb/src/common/transporter/TransporterRegistry.cpp b/ndb/src/common/transporter/TransporterRegistry.cpp
index f0e50729f8d..cd78bc52027 100644
--- a/ndb/src/common/transporter/TransporterRegistry.cpp
+++ b/ndb/src/common/transporter/TransporterRegistry.cpp
@@ -1322,7 +1322,7 @@ TransporterRegistry::start_clients_thread()
 	      else
 	      {
 		ndbout_c("Management server closed connection early. "
-			 "It is probably being shut down (or has crashed). "
+			 "It is probably being shut down (or has problems). "
 			 "We will retry the connection.");
 	      }
 	    }
diff --git a/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp b/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
index c8254052a56..b2390a37985 100644
--- a/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
+++ b/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
@@ -8330,7 +8330,7 @@ Dbdih::resetReplicaSr(TabRecordPtr tabPtr){
 	     *--------_----------------------------------------------------- */
 	    const Uint32 nextCrashed = noCrashedReplicas + 1;
 	    replicaPtr.p->noCrashedReplicas = nextCrashed;
-	    arrGuard(nextCrashed, 8);
+	    arrGuardErr(nextCrashed, 8, NDBD_EXIT_MAX_CRASHED_REPLICAS);
 	    replicaPtr.p->createGci[nextCrashed] = newestRestorableGCI + 1;
 	    ndbrequire(newestRestorableGCI + 1 != 0xF1F1F1F1);
 	    replicaPtr.p->replicaLastGci[nextCrashed] = (Uint32)-1;
diff --git a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
index 19a003f00fc..56e93e6ee01 100644
--- a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+++ b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
@@ -17989,7 +17989,8 @@ void Dblqh::stepAhead(Signal* signal, Uint32 stepAheadWords)
     logFilePtr.p->currentLogpage = logPagePtr.p->logPageWord[ZNEXT_PAGE];
     logPagePtr.i = logPagePtr.p->logPageWord[ZNEXT_PAGE];
     logFilePtr.p->currentFilepage++;
-    ptrCheckGuard(logPagePtr, clogPageFileSize, logPageRecord);
+    ptrCheckGuardErr(logPagePtr, clogPageFileSize, logPageRecord,
+                     NDBD_EXIT_SR_REDOLOG);
     logPagePtr.p->logPageWord[ZCURR_PAGE_INDEX] = ZPAGE_HEADER_SIZE;
     logPartPtr.p->execSrPagesRead--;
     logPartPtr.p->execSrPagesExecuted++;
diff --git a/ndb/src/kernel/error/ndbd_exit_codes.c b/ndb/src/kernel/error/ndbd_exit_codes.c
index 6a14d8b7ffd..257af4c5b1b 100644
--- a/ndb/src/kernel/error/ndbd_exit_codes.c
+++ b/ndb/src/kernel/error/ndbd_exit_codes.c
@@ -51,8 +51,9 @@ static const ErrStruct errArray[] =
    {NDBD_EXIT_SYSTEM_ERROR, XIE,
     "System error, node killed during node restart by other node"},
    {NDBD_EXIT_INDEX_NOTINRANGE, XIE, "Array index out of range"},
-   {NDBD_EXIT_ARBIT_SHUTDOWN, XAE, "Arbitrator shutdown, "
-    "please investigate error(s) on other node(s)"},
+   {NDBD_EXIT_ARBIT_SHUTDOWN, XAE, "Node lost connection to other nodes and "
+    "can not form a unpartitioned cluster, please investigate if there are "
+    "error(s) on other node(s)"},
    {NDBD_EXIT_POINTER_NOTINRANGE, XIE, "Pointer too large"},
    {NDBD_EXIT_SR_OTHERNODEFAILED, XRE, "Another node failed during system "
     "restart, please investigate error(s) on other node(s)"},
@@ -94,7 +95,7 @@ static const ErrStruct errArray[] =
    {NDBD_EXIT_WATCHDOG_TERMINATE, XIE, "WatchDog terminate, internal error "
     "or massive overload on the machine running this node"},
    {NDBD_EXIT_SIGNAL_LOST_SEND_BUFFER_FULL, XCR,
-    "Signal lost, out of send buffer memory, please increase SendBufferMemory"},
+    "Signal lost, out of send buffer memory, please increase SendBufferMemory or lower the load"},
    {NDBD_EXIT_SIGNAL_LOST,    XIE, "Signal lost (unknown reason)"},
    {NDBD_EXIT_ILLEGAL_SIGNAL, XIE,
     "Illegal signal (version mismatch a possibility)"},
diff --git a/ndb/src/ndbapi/ndberror.c b/ndb/src/ndbapi/ndberror.c
index 5ca8ad7be60..3653db95e08 100644
--- a/ndb/src/ndbapi/ndberror.c
+++ b/ndb/src/ndbapi/ndberror.c
@@ -266,6 +266,7 @@ ErrorBundle ErrorCodes[] = {
   /**
    * Application error
    */
+  { 763,  AE, "Alter table requires cluster nodes to have exact same version" },
   { 823,  AE, "Too much attrinfo from application in tuple manager" },
   { 831,  AE, "Too many nullable/bitfields in table definition" },
   { 876,  AE, "876" },

From 7be42667f02dbdc43df4278f83ed611c1e38efe2 Mon Sep 17 00:00:00 2001
From: "tomas@poseidon.ndb.mysql.com" <>
Date: Tue, 20 Jun 2006 19:17:07 +0200
Subject: [PATCH 08/14] Bug #17297 Fix error messages

---
 storage/ndb/include/mgmapi/ndbd_exit_codes.h    | 4 ++++
 storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp | 5 +++--
 storage/ndb/src/kernel/error/ndbd_exit_codes.c  | 1 +
 storage/ndb/src/ndbapi/ndberror.c               | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/storage/ndb/include/mgmapi/ndbd_exit_codes.h b/storage/ndb/include/mgmapi/ndbd_exit_codes.h
index 686641ebef5..b16f1a63a8d 100644
--- a/storage/ndb/include/mgmapi/ndbd_exit_codes.h
+++ b/storage/ndb/include/mgmapi/ndbd_exit_codes.h
@@ -77,6 +77,7 @@ typedef ndbd_exit_classification_enum ndbd_exit_classification;
 #define NDBD_EXIT_SR_RESTARTCONFLICT          2311
 #define NDBD_EXIT_NO_MORE_UNDOLOG             2312 
 #define NDBD_EXIT_SR_UNDOLOG                  2313 
+#define NDBD_EXIT_SR_SCHEMAFILE               2310
 #define NDBD_EXIT_MEMALLOC                    2327
 #define NDBD_EXIT_BLOCK_JBUFCONGESTION        2334
 #define NDBD_EXIT_TIME_QUEUE_SHORT            2335
@@ -91,6 +92,9 @@ typedef ndbd_exit_classification_enum ndbd_exit_classification;
 #define NDBD_EXIT_INVALID_CONFIG              2350
 #define NDBD_EXIT_OUT_OF_LONG_SIGNAL_MEMORY   2351
 
+/* Errorcodes for fatal resource errors */
+#define NDBD_EXIT_RESOURCE_ALLOC_ERROR        2500
+
 #define NDBD_EXIT_OS_SIGNAL_RECEIVED          6000
 
 /* VM 6050-> */
diff --git a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
index ef08c06822f..e9d2fce5e18 100644
--- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
@@ -1355,10 +1355,11 @@ void Dbdict::readSchemaConf(Signal* signal,
       sf->FileSize == sf0->FileSize &&
       sf->PageNumber == n &&
       computeChecksum((Uint32*)sf, NDB_SF_PAGE_SIZE_IN_WORDS) == 0;
-    ndbrequire(ok || !crashInd);
+    ndbrequireErr(ok || !crashInd, NDBD_EXIT_SR_SCHEMAFILE);
     if (! ok) {
       jam();
-      ndbrequire(fsPtr.p->fsState == FsConnectRecord::READ_SCHEMA1);
+      ndbrequireErr(fsPtr.p->fsState == FsConnectRecord::READ_SCHEMA1,
+                    NDBD_EXIT_SR_SCHEMAFILE);
       readSchemaRef(signal, fsPtr);
       return;
     }
diff --git a/storage/ndb/src/kernel/error/ndbd_exit_codes.c b/storage/ndb/src/kernel/error/ndbd_exit_codes.c
index 005bf830a69..cc60edf9509 100644
--- a/storage/ndb/src/kernel/error/ndbd_exit_codes.c
+++ b/storage/ndb/src/kernel/error/ndbd_exit_codes.c
@@ -59,6 +59,7 @@ static const ErrStruct errArray[] =
    {NDBD_EXIT_NODE_NOT_DEAD, XRE, "Internal node state conflict, "
     "most probably resolved by restarting node again"},
    {NDBD_EXIT_SR_REDOLOG, XFI, "Error while reading the REDO log"},
+   {NDBD_EXIT_SR_SCHEMAFILE, XFI, "Error while reading the schema file"},
    /* Currently unused? */
    {2311, XIE, "Conflict when selecting restart type"},
    {NDBD_EXIT_NO_MORE_UNDOLOG, XCR,
diff --git a/storage/ndb/src/ndbapi/ndberror.c b/storage/ndb/src/ndbapi/ndberror.c
index 22252960e21..d3b18898b21 100644
--- a/storage/ndb/src/ndbapi/ndberror.c
+++ b/storage/ndb/src/ndbapi/ndberror.c
@@ -344,6 +344,7 @@ ErrorBundle ErrorCodes[] = {
   /**
    * SchemaError
    */
+  { 311,  DMEC, IE, "Undefined fragment" },
   { 703,  DMEC, SE, "Invalid table format" },
   { 704,  DMEC, SE, "Attribute name too long" },
   { 705,  DMEC, SE, "Table name too long" },

From 6b694bcd589b8a3c2c97e3a9b8fac701708b059f Mon Sep 17 00:00:00 2001
From: "evgen@moonbone.local" <>
Date: Wed, 21 Jun 2006 00:45:01 +0400
Subject: [PATCH 09/14] rpl_ndb_log.result:   Corrected test case result

---
 mysql-test/r/rpl_ndb_log.result | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/rpl_ndb_log.result b/mysql-test/r/rpl_ndb_log.result
index 74ecd8e7879..b88af325397 100644
--- a/mysql-test/r/rpl_ndb_log.result
+++ b/mysql-test/r/rpl_ndb_log.result
@@ -140,8 +140,8 @@ insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
-slave-bin.000001	#	Table_map	2	#	table_id: 29 (test.t1)
-slave-bin.000001	#	Write_rows	2	#	table_id: 29 flags: STMT_END_F
+slave-bin.000001	#	Table_map	2	#	table_id: 30 (test.t1)
+slave-bin.000001	#	Write_rows	2	#	table_id: 30 flags: STMT_END_F
 select * from t1;
 a	b
 1	1

From ddaebd13dc5cabd6bf92187328d1fe6365aa5744 Mon Sep 17 00:00:00 2001
From: "anozdrin@mysql.com" <>
Date: Wed, 21 Jun 2006 02:16:38 +0400
Subject: [PATCH 10/14] Fix merge 5.0 -> 5.1.

---
 mysql-test/r/im_life_cycle.result | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mysql-test/r/im_life_cycle.result b/mysql-test/r/im_life_cycle.result
index aa26b355aff..b6d3bb8361c 100644
--- a/mysql-test/r/im_life_cycle.result
+++ b/mysql-test/r/im_life_cycle.result
@@ -47,10 +47,6 @@ mysqld2	offline
 Killing the process...
 Sleeping...
 Success: the process was restarted.
-
---------------------------------------------------------------------
--- 1.1.7.
---------------------------------------------------------------------
 SHOW INSTANCES;
 instance_name	state
 mysqld1	online

From bb94cb24c51270ab43c63b57bb17eafa94e093eb Mon Sep 17 00:00:00 2001
From: "anozdrin@mysql.com" <>
Date: Wed, 21 Jun 2006 02:17:39 +0400
Subject: [PATCH 11/14] Re-enable IM tests.

---
 mysql-test/t/disabled.def | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 96f31133e65..b4bd53fb1bc 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -13,9 +13,9 @@
 #events_stress            : BUG#17619 2006-02-21 andrey  Race conditions
 #events                   : BUG#17619 2006-02-21 andrey  Race conditions
 #events_scheduling        : BUG#19170 2006-04-26 andrey  Test case of 19170 fails on some platforms. Has to be checked.
-im_instance_conf          : Bug#20294 2006-06-06 monty   Instance manager test im_instance_conf fails randomly
-im_options                : Bug#20294 2006-06-06 monty   Instance manager test im_instance_conf fails randomly
-im_life_cycle             : Bug#20368 2006-06-10 alik    im_life_cycle test fails
+#im_instance_conf         : Bug#20294 2006-06-06 monty   Instance manager test im_instance_conf fails randomly
+#im_options               : Bug#20294 2006-06-06 monty   Instance manager test im_instance_conf fails randomly
+#im_life_cycle            : Bug#20368 2006-06-10 alik    im_life_cycle test fails
 ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 #ndb_binlog_discover      : BUG#19395 2006-04-28 tomas/knielsen mysqld does not always detect cluster shutdown

From e77850e5737666e02d2e1d45127680f97987a345 Mon Sep 17 00:00:00 2001
From: "mskold@mysql.com" <>
Date: Wed, 21 Jun 2006 09:36:50 +0200
Subject: [PATCH 12/14] Fix for Bug #19906  REPLACE doesn't update TEXT fields
 correctly

---
 mysql-test/r/ndb_replace.result | 23 ++++++++++++++++++++++-
 mysql-test/t/ndb_replace.test   | 30 ++++++++++++++++++++++++++++--
 sql/ha_ndbcluster.cc            | 10 ++++++++--
 sql/ha_ndbcluster.h             |  3 ++-
 4 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/mysql-test/r/ndb_replace.result b/mysql-test/r/ndb_replace.result
index 5d772620b2c..cdfcd6a7a43 100644
--- a/mysql-test/r/ndb_replace.result
+++ b/mysql-test/r/ndb_replace.result
@@ -1,4 +1,4 @@
-drop table if exists t1;
+drop table if exists t1,t2;
 CREATE TABLE t1 (
 gesuchnr int(11) DEFAULT '0' NOT NULL,
 benutzer_id int(11) DEFAULT '0' NOT NULL,
@@ -31,3 +31,24 @@ SELECT * from t1 ORDER BY i;
 i	j	k
 3	1	42
 17	2	24
+CREATE TABLE t2 (a INT(11) NOT NULL,
+b INT(11) NOT NULL,
+c INT(11) NOT NULL,
+x TEXT,
+y TEXT,
+z TEXT,
+id INT(10) unsigned NOT NULL AUTO_INCREMENT,
+i INT(11) DEFAULT NULL,
+PRIMARY KEY (id),
+UNIQUE KEY a (a,b,c)
+) ENGINE=ndbcluster;
+REPLACE INTO t2 (a,b,c,x,y,z,i) VALUES (1,1,1,'a','a','a',1),(1,1,1,'b','b','b',2), (1,1,1,'c','c','c',3);
+SELECT * FROM t2 ORDER BY id;
+a	b	c	x	y	z	id	i
+1	1	1	c	c	c	3	3
+REPLACE INTO t2(a,b,c,x,y,z,i) values (1,1,1,'a','a','a',1);
+REPLACE INTO t2(a,b,c,x,y,z,i) values (1,1,1,'b','b','b',2);
+SELECT * FROM t2 ORDER BY id;
+a	b	c	x	y	z	id	i
+1	1	1	b	b	b	5	2
+DROP TABLE t2;
diff --git a/mysql-test/t/ndb_replace.test b/mysql-test/t/ndb_replace.test
index 6cad80ef8ea..94a11f7dfb2 100644
--- a/mysql-test/t/ndb_replace.test
+++ b/mysql-test/t/ndb_replace.test
@@ -6,7 +6,7 @@
 #
 
 --disable_warnings
-drop table if exists t1;
+drop table if exists t1,t2;
 --enable_warnings
 
 CREATE TABLE t1 (
@@ -27,6 +27,8 @@ replace into t1 (gesuchnr,benutzer_id) values (1,1);
 select * from t1 order by gesuchnr;
 drop table t1;
 
+# End of 4.1 tests
+
 # bug#17431
 CREATE TABLE t1(i INT PRIMARY KEY AUTO_INCREMENT, 
                 j INT, 
@@ -38,4 +40,28 @@ REPLACE INTO t1 (j,k) VALUES (1,42);
 REPLACE INTO t1 (i,j) VALUES (17,2);
 SELECT * from t1 ORDER BY i;
 
-# End of 4.1 tests
+# bug#19906
+CREATE TABLE t2 (a INT(11) NOT NULL,
+	         b INT(11) NOT NULL,
+                 c INT(11) NOT NULL,
+                 x TEXT,
+                 y TEXT,
+                 z TEXT,
+                 id INT(10) unsigned NOT NULL AUTO_INCREMENT,
+                 i INT(11) DEFAULT NULL,
+                 PRIMARY KEY (id),
+                 UNIQUE KEY a (a,b,c)
+) ENGINE=ndbcluster;
+
+REPLACE INTO t2 (a,b,c,x,y,z,i) VALUES (1,1,1,'a','a','a',1),(1,1,1,'b','b','b',2), (1,1,1,'c','c','c',3);
+
+SELECT * FROM t2 ORDER BY id;
+
+REPLACE INTO t2(a,b,c,x,y,z,i) values (1,1,1,'a','a','a',1);
+REPLACE INTO t2(a,b,c,x,y,z,i) values (1,1,1,'b','b','b',2);
+
+SELECT * FROM t2 ORDER BY id;
+
+DROP TABLE t2;
+
+
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index e2d82d9f559..e57a060f59b 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -771,10 +771,11 @@ int g_get_ndb_blobs_value(NdbBlob *ndb_blob, void *arg)
   if (ndb_blob->blobsNextBlob() != NULL)
     DBUG_RETURN(0);
   ha_ndbcluster *ha= (ha_ndbcluster *)arg;
-  DBUG_RETURN(ha->get_ndb_blobs_value(ndb_blob));
+  DBUG_RETURN(ha->get_ndb_blobs_value(ndb_blob, ha->m_blobs_offset));
 }
 
-int ha_ndbcluster::get_ndb_blobs_value(NdbBlob *last_ndb_blob)
+int ha_ndbcluster::get_ndb_blobs_value(NdbBlob *last_ndb_blob,
+				       my_ptrdiff_t ptrdiff)
 {
   DBUG_ENTER("get_ndb_blobs_value");
 
@@ -807,7 +808,10 @@ int ha_ndbcluster::get_ndb_blobs_value(NdbBlob *last_ndb_blob)
           if (ndb_blob->readData(buf, len) != 0)
             DBUG_RETURN(-1);
           DBUG_ASSERT(len == blob_len);
+          // Ugly hack assumes only ptr needs to be changed
+          field_blob->ptr+= ptrdiff;
           field_blob->set_ptr(len, buf);
+          field_blob->ptr-= ptrdiff;
         }
         offset+= blob_size;
       }
@@ -870,6 +874,7 @@ int ha_ndbcluster::get_ndb_value(NdbOperation *ndb_op, Field *field,
       if (ndb_blob != NULL)
       {
         // Set callback
+	m_blobs_offset= buf - (byte*) table->record[0];
         void *arg= (void *)this;
         DBUG_RETURN(ndb_blob->setActiveHook(g_get_ndb_blobs_value, arg) != 0);
       }
@@ -4552,6 +4557,7 @@ ha_ndbcluster::ha_ndbcluster(TABLE *table_arg):
   m_ops_pending(0),
   m_skip_auto_increment(TRUE),
   m_blobs_pending(0),
+  m_blobs_offset(0),
   m_blobs_buffer(0),
   m_blobs_buffer_size(0),
   m_dupkey((uint) -1),
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
index e417996a5d9..01950c2b00f 100644
--- a/sql/ha_ndbcluster.h
+++ b/sql/ha_ndbcluster.h
@@ -629,7 +629,7 @@ private:
   int set_ndb_value(NdbOperation*, Field *field, uint fieldnr, bool *set_blob_value= 0);
   int get_ndb_value(NdbOperation*, Field *field, uint fieldnr, byte*);
   friend int g_get_ndb_blobs_value(NdbBlob *ndb_blob, void *arg);
-  int get_ndb_blobs_value(NdbBlob *last_ndb_blob);
+  int get_ndb_blobs_value(NdbBlob *last_ndb_blob, my_ptrdiff_t ptrdiff);
   int set_primary_key(NdbOperation *op, const byte *key);
   int set_primary_key_from_record(NdbOperation *op, const byte *record);
   int set_index_key_from_record(NdbOperation *op, const byte *record,
@@ -706,6 +706,7 @@ private:
   ha_rows m_ops_pending;
   bool m_skip_auto_increment;
   bool m_blobs_pending;
+  my_ptrdiff_t m_blobs_offset;
   // memory for blobs in one tuple
   char *m_blobs_buffer;
   uint32 m_blobs_buffer_size;

From 5ce56c1cdc1014da6d1870316bfcc78d0f3f9b72 Mon Sep 17 00:00:00 2001
From: "anozdrin@mysql.com" <>
Date: Wed, 21 Jun 2006 11:44:54 +0400
Subject: [PATCH 13/14] Disable IM tests.

---
 mysql-test/t/disabled.def | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index b4bd53fb1bc..6c3df50011c 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -13,9 +13,9 @@
 #events_stress            : BUG#17619 2006-02-21 andrey  Race conditions
 #events                   : BUG#17619 2006-02-21 andrey  Race conditions
 #events_scheduling        : BUG#19170 2006-04-26 andrey  Test case of 19170 fails on some platforms. Has to be checked.
-#im_instance_conf         : Bug#20294 2006-06-06 monty   Instance manager test im_instance_conf fails randomly
-#im_options               : Bug#20294 2006-06-06 monty   Instance manager test im_instance_conf fails randomly
-#im_life_cycle            : Bug#20368 2006-06-10 alik    im_life_cycle test fails
+im_instance_conf         : Bug#20294 2006-06-06 monty   Instance manager test im_instance_conf fails randomly
+im_options               : Bug#20294 2006-06-06 monty   Instance manager test im_instance_conf fails randomly
+im_life_cycle            : Bug#20368 2006-06-10 alik    im_life_cycle test fails
 ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 #ndb_binlog_discover      : BUG#19395 2006-04-28 tomas/knielsen mysqld does not always detect cluster shutdown

From 7fdf6f16336e28db644a831b98111a9158521de9 Mon Sep 17 00:00:00 2001
From: "mskold@mysql.com" <>
Date: Wed, 21 Jun 2006 09:51:08 +0200
Subject: [PATCH 14/14] Fixed failed automerge

---
 sql/ha_ndbcluster.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
index c5f441f8959..df3c5791713 100644
--- a/sql/ha_ndbcluster.h
+++ b/sql/ha_ndbcluster.h
@@ -798,7 +798,6 @@ private:
   int get_ndb_value(NdbOperation*, Field *field, uint fieldnr, byte*);
   int get_ndb_partition_id(NdbOperation *);
   friend int g_get_ndb_blobs_value(NdbBlob *ndb_blob, void *arg);
-  int get_ndb_blobs_value(NdbBlob *last_ndb_blob, my_ptrdiff_t ptrdiff);
   int set_primary_key(NdbOperation *op, const byte *key);
   int set_primary_key_from_record(NdbOperation *op, const byte *record);
   int set_index_key_from_record(NdbOperation *op, const byte *record,