bk commit into 5.1 tree (mskold:1.2378)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-31 22:43:24+01:00, mskold@stripped +3 -0
  Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
  into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
  MERGE: 1.1810.2386.12

  mysql-test/r/ndb_read_multi_range.result@stripped, 2007-01-31 22:41:11+01:00,
mskold@stripped +0 -0
    Auto merged
    MERGE: 1.3.2.2

  mysql-test/t/ndb_read_multi_range.test@stripped, 2007-01-31 22:41:11+01:00,
mskold@stripped +0 -0
    Auto merged
    MERGE: 1.4.2.2

  sql/ha_ndbcluster.cc@stripped, 2007-01-31 22:43:20+01:00, mskold@stripped +1 -3
    Merge
    MERGE: 1.175.61.7

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mskold
# Host:	linux.site
# Root:	/windows/Linux_space/MySQL/mysql-5.1/RESYNC

--- 1.385/sql/ha_ndbcluster.cc	2007-01-31 22:43:34 +01:00
+++ 1.386/sql/ha_ndbcluster.cc	2007-01-31 22:43:34 +01:00
@@ -4336,10 +4336,10 @@ int ha_ndbcluster::start_stmt(THD *thd, 
       ERR_RETURN(ndb->getNdbError());
     no_uncommitted_rows_reset(thd);
     thd_ndb->stmt= trans;
+    thd_ndb->query_state&= NDB_QUERY_NORMAL;
+    m_active_trans= trans;
     trans_register_ha(thd, FALSE, ndbcluster_hton);
   }
-  thd_ndb->query_state&= NDB_QUERY_NORMAL;
-  m_active_trans= trans;
 
   // Start of statement
   m_ops_pending= 0;    
@@ -8243,6 +8243,8 @@ close_scan:
   if (multi_range_curr == multi_range_end)
   {
     DBUG_MULTI_RANGE(16);
+    Thd_ndb *thd_ndb= get_thd_ndb(current_thd);
+    thd_ndb->query_state&= NDB_QUERY_NORMAL;
     DBUG_RETURN(HA_ERR_END_OF_FILE);
   }
   

--- 1.9/mysql-test/r/ndb_read_multi_range.result	2007-01-31 22:43:34 +01:00
+++ 1.10/mysql-test/r/ndb_read_multi_range.result	2007-01-31 22:43:34 +01:00
@@ -442,3 +442,20 @@ SELECT id, tag, doc, type FROM t1 WHERE 
 id	tag	doc	type
 sakila	1	Some text goes here	text
 DROP TABLE t1;
+CREATE TABLE t1 (
+var1 int(2) NOT NULL,
+var2 int(2) NOT NULL,
+PRIMARY KEY  (var1)
+) ENGINE=ndbcluster DEFAULT CHARSET=ascii CHECKSUM=1;
+CREATE TABLE t2 (
+var1 int(2) NOT NULL,
+var2 int(2) NOT NULL,
+PRIMARY KEY  (var1)
+) ENGINE=MyISAM DEFAULT CHARSET=ascii CHECKSUM=1;
+CREATE TRIGGER testtrigger
+AFTER UPDATE ON t1 FOR EACH ROW BEGIN
+REPLACE INTO t2 SELECT * FROM t1 WHERE t1.var1 = NEW.var1;END|
+INSERT INTO t1 VALUES (1,1),(2,2),(3,3);
+UPDATE t1 SET var2 = 9 WHERE var1 IN(1,2,3);
+DROP TRIGGER testtrigger;
+DROP TABLE t1, t2;

--- 1.11/mysql-test/t/ndb_read_multi_range.test	2007-01-31 22:43:34 +01:00
+++ 1.12/mysql-test/t/ndb_read_multi_range.test	2007-01-31 22:43:34 +01:00
@@ -272,3 +272,32 @@ SELECT id, tag, doc, type FROM t1 WHERE 
 SELECT id, tag, doc, type FROM t1 WHERE id IN ('flipper','sakila');
 
 DROP TABLE t1;
+
+#bug#25522
+CREATE TABLE t1 (
+       var1 int(2) NOT NULL,
+       var2 int(2) NOT NULL,
+       PRIMARY KEY  (var1)
+     ) ENGINE=ndbcluster DEFAULT CHARSET=ascii CHECKSUM=1;
+
+
+CREATE TABLE t2 (
+       var1 int(2) NOT NULL,
+       var2 int(2) NOT NULL,
+       PRIMARY KEY  (var1)
+     ) ENGINE=MyISAM DEFAULT CHARSET=ascii CHECKSUM=1;
+
+
+DELIMITER |;
+CREATE TRIGGER testtrigger
+     AFTER UPDATE ON t1 FOR EACH ROW BEGIN
+     REPLACE INTO t2 SELECT * FROM t1 WHERE t1.var1 = NEW.var1;END|
+DELIMITER ;|
+
+INSERT INTO t1 VALUES (1,1),(2,2),(3,3);
+
+UPDATE t1 SET var2 = 9 WHERE var1 IN(1,2,3);
+
+DROP TRIGGER testtrigger;
+
+DROP TABLE t1, t2;