From b57cf4b07b2c9529d4fd5ca677b4ea53fd32d58e Mon Sep 17 00:00:00 2001
From: "df@pippilotta.erinye.com" <>
Date: Tue, 15 May 2007 11:32:33 +0200
Subject: [PATCH 01/48] BUG#28370 federated test cases fail with binlog
 disabled

---
 mysql-test/include/federated.inc  | 1 +
 mysql-test/mysql-test-run.pl      | 3 +--
 mysql-test/r/have_log_bin.require | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mysql-test/include/federated.inc b/mysql-test/include/federated.inc
index c8e8ededa11..7bdb2efaa8b 100644
--- a/mysql-test/include/federated.inc
+++ b/mysql-test/include/federated.inc
@@ -1,3 +1,4 @@
+--source include/have_log_bin.inc
 --source include/not_embedded.inc
 --source ./include/have_federated_db.inc
 
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index c494626bbae..6bf35410783 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3740,8 +3740,7 @@ sub mysqld_arguments ($$$$) {
 	      "%s--log-slow-queries=%s-slow.log", $prefix, $log_base_path);
 
   # Check if "extra_opt" contains --skip-log-bin
-  my $skip_binlog= grep(/^--skip-log-bin/, @$extra_opt);
-
+  my $skip_binlog= grep(/^--skip-log-bin/, @$extra_opt, @opt_extra_mysqld_opt);
   if ( $mysqld->{'type'} eq 'master' )
   {
     if (! ($opt_skip_master_binlog || $skip_binlog) )
diff --git a/mysql-test/r/have_log_bin.require b/mysql-test/r/have_log_bin.require
index cacdf8df0ce..d4fd77e4f8d 100644
--- a/mysql-test/r/have_log_bin.require
+++ b/mysql-test/r/have_log_bin.require
@@ -1,2 +1,2 @@
 Variable_name	Value
-have_log_bin	ON
+log_bin	ON

From 3beef02bc6a74b19e72048c7e26d93c1db7500d4 Mon Sep 17 00:00:00 2001
From: "df@pippilotta.erinye.com" <>
Date: Tue, 15 May 2007 12:22:53 +0200
Subject: [PATCH 02/48] BUG#28372 mysqldump test case fails with binlog
 disabled

---
 mysql-test/t/mysqldump.test | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
index 4c4690520c6..78718a9e6ec 100644
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -1,6 +1,9 @@
 # Embedded server doesn't support external clients
 --source include/not_embedded.inc
 
+# Binlog is required
+--source include/have_log_bin.inc
+
 --disable_warnings
 DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa, t3;
 drop database if exists mysqldump_test_db;

From 599d07713c8c887191c182fa478072493cc291cb Mon Sep 17 00:00:00 2001
From: "tomas@whalegate.ndb.mysql.com" <>
Date: Wed, 23 May 2007 07:53:16 +0200
Subject: [PATCH 03/48] remove some not used code

---
 sql/ha_ndbcluster.cc | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 0f3a42bbce7..d7326375afb 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -234,11 +234,6 @@ inline
 int execute_no_commit(ha_ndbcluster *h, NdbTransaction *trans,
 		      bool force_release)
 {
-#ifdef NOT_USED
-  int m_batch_execute= 0;
-  if (m_batch_execute)
-    return 0;
-#endif
   h->release_completed_operations(trans, force_release);
   return trans->execute(NdbTransaction::NoCommit,
                         NdbTransaction::AbortOnError,
@@ -248,11 +243,6 @@ int execute_no_commit(ha_ndbcluster *h, NdbTransaction *trans,
 inline
 int execute_commit(ha_ndbcluster *h, NdbTransaction *trans)
 {
-#ifdef NOT_USED
-  int m_batch_execute= 0;
-  if (m_batch_execute)
-    return 0;
-#endif
   return trans->execute(NdbTransaction::Commit,
                         NdbTransaction::AbortOnError,
                         h->m_force_send);
@@ -261,11 +251,6 @@ int execute_commit(ha_ndbcluster *h, NdbTransaction *trans)
 inline
 int execute_commit(THD *thd, NdbTransaction *trans)
 {
-#ifdef NOT_USED
-  int m_batch_execute= 0;
-  if (m_batch_execute)
-    return 0;
-#endif
   return trans->execute(NdbTransaction::Commit,
                         NdbTransaction::AbortOnError,
                         thd->variables.ndb_force_send);
@@ -275,11 +260,6 @@ inline
 int execute_no_commit_ie(ha_ndbcluster *h, NdbTransaction *trans,
 			 bool force_release)
 {
-#ifdef NOT_USED
-  int m_batch_execute= 0;
-  if (m_batch_execute)
-    return 0;
-#endif
   h->release_completed_operations(trans, force_release);
   return trans->execute(NdbTransaction::NoCommit,
                         NdbTransaction::AO_IgnoreError,

From 259d7deb66f27b549a902fd5d753a54e0ec0db28 Mon Sep 17 00:00:00 2001
From: "tomas@whalegate.ndb.mysql.com" <>
Date: Thu, 24 May 2007 21:02:01 +0200
Subject: [PATCH 04/48] Bug #28653    Fast GCP + high load + high RedoBuffer
 causes ndbrequire - correction, use recomputed _actual_ redobuffer

---
 ndb/src/kernel/blocks/dblqh/Dblqh.hpp     | 5 +++--
 ndb/src/kernel/blocks/dblqh/DblqhInit.cpp | 4 ++--
 ndb/src/kernel/blocks/dblqh/DblqhMain.cpp | 5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ndb/src/kernel/blocks/dblqh/Dblqh.hpp b/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
index 4474d226a27..2ed08db527c 100644
--- a/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
+++ b/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
@@ -2668,7 +2668,8 @@ private:
   UintR cfirstfreeLogFile;
   UintR clogFileFileSize;
 
-#define ZLFO_FILE_SIZE 256            /* MAX 256 OUTSTANDING FILE OPERATIONS */
+#define ZLFO_MIN_FILE_SIZE 256
+// RedoBuffer/32K minimum ZLFO_MIN_FILE_SIZE
   LogFileOperationRecord *logFileOperationRecord;
   LogFileOperationRecordPtr lfoPtr;
   UintR cfirstfreeLfo;
@@ -2685,7 +2686,7 @@ private:
   UintR cfirstfreePageRef;
   UintR cpageRefFileSize;
 
-#define ZSCANREC_FILE_SIZE 100
+// Configurable
   ArrayPool<ScanRecord> c_scanRecordPool;
   ScanRecordPtr scanptr;
   UintR cscanNoFreeRec;
diff --git a/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp b/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
index 3452269be51..65f4b0f9b4b 100644
--- a/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
+++ b/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
@@ -32,11 +32,11 @@ void Dblqh::initData()
   chostFileSize = MAX_NDB_NODES;
   clcpFileSize = ZNO_CONCURRENT_LCP;
   clcpLocrecFileSize = ZLCP_LOCREC_FILE_SIZE;
-  clfoFileSize = ZLFO_FILE_SIZE;
+  clfoFileSize = 0;
   clogFileFileSize = 0;
   clogPartFileSize = ZLOG_PART_FILE_SIZE;
   cpageRefFileSize = ZPAGE_REF_FILE_SIZE;
-  cscanrecFileSize = ZSCANREC_FILE_SIZE;
+  cscanrecFileSize = 0;
   ctabrecFileSize = 0;
   ctcConnectrecFileSize = 0;
   ctcNodeFailrecFileSize = MAX_NDB_NODES;
diff --git a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
index 684598364ab..88bc3f372a5 100644
--- a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+++ b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
@@ -7251,6 +7251,11 @@ void Dblqh::continueScanNextReqLab(Signal* signal)
     return;
   }
 
+  /* maximum number of log file operations */
+  clfoFileSize = clogPageFileSize;
+  if (clfoFileSize < ZLFO_MIN_FILE_SIZE)
+    clfoFileSize = ZLFO_MIN_FILE_SIZE;
+
   // Update timer on tcConnectRecord
   tcConnectptr.p->tcTimer = cLqhTimeOutCount;
   init_acc_ptr_list(scanptr.p);

From b46465f3e707b0a3bdfa7c40413484b30002a2fa Mon Sep 17 00:00:00 2001
From: "tomas@whalegate.ndb.mysql.com" <>
Date: Mon, 28 May 2007 12:56:48 +0200
Subject: [PATCH 05/48] Bug #28653    Fast GCP + high load + high RedoBuffer
 causes ndbrequire - correction, backport to 5.0

---
 ndb/src/kernel/blocks/dblqh/DblqhInit.cpp | 5 +++++
 ndb/src/kernel/blocks/dblqh/DblqhMain.cpp | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp b/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
index 65f4b0f9b4b..adeed3e1e8b 100644
--- a/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
+++ b/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
@@ -338,6 +338,11 @@ Dblqh::Dblqh(const class Configuration & conf):
   
   initData();
 
+  /* maximum number of log file operations */
+  clfoFileSize = clogPageFileSize;
+  if (clfoFileSize < ZLFO_MIN_FILE_SIZE)
+    clfoFileSize = ZLFO_MIN_FILE_SIZE;
+
 #ifdef VM_TRACE
   {
     void* tmp[] = { 
diff --git a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
index 88bc3f372a5..684598364ab 100644
--- a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+++ b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
@@ -7251,11 +7251,6 @@ void Dblqh::continueScanNextReqLab(Signal* signal)
     return;
   }
 
-  /* maximum number of log file operations */
-  clfoFileSize = clogPageFileSize;
-  if (clfoFileSize < ZLFO_MIN_FILE_SIZE)
-    clfoFileSize = ZLFO_MIN_FILE_SIZE;
-
   // Update timer on tcConnectRecord
   tcConnectptr.p->tcTimer = cLqhTimeOutCount;
   init_acc_ptr_list(scanptr.p);

From 186d1534b8734a805e6d8b7a9103f077f8f0526d Mon Sep 17 00:00:00 2001
From: "tomas@whalegate.ndb.mysql.com" <>
Date: Mon, 28 May 2007 13:23:11 +0200
Subject: [PATCH 06/48] Bug #28719: multi pk update ignore corrupts data -
 check multi update as well as update - this bug is not present in 5.0, but
 execution patch is wrong, so there are probably other bugs

---
 mysql-test/r/ndb_basic.result | 71 +++++++++++++++++++++++++++++++++++
 mysql-test/t/ndb_basic.test   | 40 ++++++++++++++++++++
 sql/ha_ndbcluster.cc          |  3 +-
 3 files changed, 113 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/ndb_basic.result b/mysql-test/r/ndb_basic.result
index 75ccc6cd39e..346b1d5741b 100644
--- a/mysql-test/r/ndb_basic.result
+++ b/mysql-test/r/ndb_basic.result
@@ -770,4 +770,75 @@ c	abc	ab
 d	ab	ab
 e	abc	abc
 DROP TABLE t1;
+create table t1 (a int not null primary key, b int not null) engine=ndb;
+create table t2 (a int not null primary key, b int not null) engine=ndb;
+insert into t1 values (1,10), (2,20), (3,30);
+insert into t2 values (1,10), (2,20), (3,30);
+select * from t1 order by a;
+a	b
+1	10
+2	20
+3	30
+delete from t1 where a > 0 order by a desc limit 1;
+select * from t1 order by a;
+a	b
+1	10
+2	20
+delete from t1,t2 using t1,t2 where t1.a = t2.a;
+select * from t2 order by a;
+a	b
+3	30
+drop table t1,t2;
+create table t1 (a int not null primary key, b int not null) engine=ndb;
+insert into t1 values (1,10), (2,20), (3,30);
+insert into t1 set a=1, b=100;
+ERROR 23000: Duplicate entry '1' for key 1
+insert ignore into t1 set a=1, b=100;
+select * from t1 order by a;
+a	b
+1	10
+2	20
+3	30
+insert into t1 set a=1, b=1000 on duplicate key update b=b+1;
+select * from t1 order by a;
+a	b
+1	11
+2	20
+3	30
+drop table t1;
+create table t1 (a int not null primary key, b int not null) engine=ndb;
+create table t2 (c int not null primary key, d int not null) engine=ndb;
+insert into t1 values (1,10), (2,10), (3,30), (4, 30);
+insert into t2 values (1,10), (2,10), (3,30), (4, 30);
+update t1 set a = 1 where a = 3;
+ERROR 23000: Duplicate entry '1' for key 1
+select * from t1 order by a;
+a	b
+1	10
+2	10
+3	30
+4	30
+update t1 set b = 1 where a > 1 order by a desc limit 1;
+select * from t1 order by a;
+a	b
+1	10
+2	10
+3	30
+4	1
+update t1,t2 set a = 1, c = 1 where a = 3 and c = 3;
+ERROR 23000: Duplicate entry '1' for key 1
+select * from t1 order by a;
+a	b
+1	10
+2	10
+3	30
+4	1
+update ignore t1,t2 set a = 1, c = 1 where a = 3 and c = 3;
+select * from t1 order by a;
+a	b
+1	10
+2	10
+3	30
+4	1
+drop table t1,t2;
 End of 5.0 tests
diff --git a/mysql-test/t/ndb_basic.test b/mysql-test/t/ndb_basic.test
index 70fbfbfe733..80c8942348c 100644
--- a/mysql-test/t/ndb_basic.test
+++ b/mysql-test/t/ndb_basic.test
@@ -740,6 +740,46 @@ INSERT INTO t1 VALUES
 SELECT * FROM t1 ORDER BY a;
 DROP TABLE t1;
 
+# delete
+create table t1 (a int not null primary key, b int not null) engine=ndb;
+create table t2 (a int not null primary key, b int not null) engine=ndb;
+insert into t1 values (1,10), (2,20), (3,30);
+insert into t2 values (1,10), (2,20), (3,30);
+select * from t1 order by a;
+delete from t1 where a > 0 order by a desc limit 1;
+select * from t1 order by a;
+delete from t1,t2 using t1,t2 where t1.a = t2.a;
+select * from t2 order by a;
+drop table t1,t2;
+
+# insert ignore
+create table t1 (a int not null primary key, b int not null) engine=ndb;
+insert into t1 values (1,10), (2,20), (3,30);
+--error ER_DUP_ENTRY
+insert into t1 set a=1, b=100;
+insert ignore into t1 set a=1, b=100;
+select * from t1 order by a;
+insert into t1 set a=1, b=1000 on duplicate key update b=b+1;
+select * from t1 order by a;
+drop table t1;
+
+# update
+create table t1 (a int not null primary key, b int not null) engine=ndb;
+create table t2 (c int not null primary key, d int not null) engine=ndb;
+insert into t1 values (1,10), (2,10), (3,30), (4, 30);
+insert into t2 values (1,10), (2,10), (3,30), (4, 30);
+--error ER_DUP_ENTRY
+update t1 set a = 1 where a = 3;
+select * from t1 order by a;
+update t1 set b = 1 where a > 1 order by a desc limit 1;
+select * from t1 order by a;
+--error ER_DUP_ENTRY
+update t1,t2 set a = 1, c = 1 where a = 3 and c = 3;
+select * from t1 order by a;
+update ignore t1,t2 set a = 1, c = 1 where a = 3 and c = 3;
+select * from t1 order by a;
+drop table t1,t2;
+
 # End of 5.0 tests
 --echo End of 5.0 tests
 
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index d7326375afb..47815f0fbf1 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -2449,7 +2449,8 @@ int ha_ndbcluster::update_row(const byte *old_data, byte *new_data)
    * If IGNORE the ignore constraint violations on primary and unique keys,
    * but check that it is not part of INSERT ... ON DUPLICATE KEY UPDATE
    */
-  if (m_ignore_dup_key && thd->lex->sql_command == SQLCOM_UPDATE)
+  if (m_ignore_dup_key && (thd->lex->sql_command == SQLCOM_UPDATE ||
+                           thd->lex->sql_command == SQLCOM_UPDATE_MULTI))
   {
     int peek_res= peek_indexed_rows(new_data, pk_update);
     

From 32c1b70e2bfe6b8454131ade3a1df745c570b03f Mon Sep 17 00:00:00 2001
From: "tomas@whalegate.ndb.mysql.com" <>
Date: Mon, 28 May 2007 15:59:02 +0200
Subject: [PATCH 07/48] bug#28717, make sure only master updates activeStatus  
 so that othernodes dont get confused after having recevied status from master
   and then tries to update it self

---
 ndb/src/kernel/blocks/ERROR_codes.txt         |  7 +-
 ndb/src/kernel/blocks/dbdih/DbdihMain.cpp     |  8 +-
 ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp |  7 ++
 ndb/test/ndbapi/testNodeRestart.cpp           | 81 +++++++++++++++++++
 ndb/test/run-test/daily-basic-tests.txt       |  4 +
 5 files changed, 105 insertions(+), 2 deletions(-)

diff --git a/ndb/src/kernel/blocks/ERROR_codes.txt b/ndb/src/kernel/blocks/ERROR_codes.txt
index 0bcc99a6334..bf54d583299 100644
--- a/ndb/src/kernel/blocks/ERROR_codes.txt
+++ b/ndb/src/kernel/blocks/ERROR_codes.txt
@@ -1,5 +1,5 @@
 Next QMGR 1
-Next NDBCNTR 1000
+Next NDBCNTR 1002
 Next NDBFS 2000
 Next DBACC 3002
 Next DBTUP 4014
@@ -487,3 +487,8 @@ Dbdict:
 6003 Crash in participant @ CreateTabReq::Prepare
 6004 Crash in participant @ CreateTabReq::Commit
 6005 Crash in participant @ CreateTabReq::CreateDrop
+
+Ndbcntr:
+--------
+
+1001: Delay sending NODE_FAILREP (to own node), until error is cleared
diff --git a/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp b/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
index f24a8e2c7d5..44e2293f318 100644
--- a/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
+++ b/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
@@ -4448,12 +4448,18 @@ void Dbdih::failedNodeLcpHandling(Signal* signal, NodeRecordPtr failedNodePtr)
   jam();
   const Uint32 nodeId = failedNodePtr.i;
 
-  if (c_lcpState.m_participatingLQH.get(failedNodePtr.i)){
+  if (isMaster() && c_lcpState.m_participatingLQH.get(failedNodePtr.i))
+  {
     /*----------------------------------------------------*/
     /*  THE NODE WAS INVOLVED IN A LOCAL CHECKPOINT. WE   */
     /* MUST UPDATE THE ACTIVE STATUS TO INDICATE THAT     */
     /* THE NODE HAVE MISSED A LOCAL CHECKPOINT.           */
     /*----------------------------------------------------*/
+
+    /**
+     * Bug#28717, Only master should do this, as this status is copied
+     *   to other nodes
+     */
     switch (failedNodePtr.p->activeStatus) {
     case Sysfile::NS_Active:
       jam();
diff --git a/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp b/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
index 26e8f246293..65d80669316 100644
--- a/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
+++ b/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
@@ -1375,6 +1375,13 @@ void Ndbcntr::execNODE_FAILREP(Signal* signal)
 {
   jamEntry();
 
+  if (ERROR_INSERTED(1001))
+  {
+    sendSignalWithDelay(reference(), GSN_NODE_FAILREP, signal, 100, 
+                        signal->getLength());
+    return;
+  }
+  
   const NodeFailRep * nodeFail = (NodeFailRep *)&signal->theData[0];
   NdbNodeBitmask allFailed; 
   allFailed.assign(NdbNodeBitmask::Size, nodeFail->theNodes);
diff --git a/ndb/test/ndbapi/testNodeRestart.cpp b/ndb/test/ndbapi/testNodeRestart.cpp
index 9adbfbd46a6..e5ced961b6f 100644
--- a/ndb/test/ndbapi/testNodeRestart.cpp
+++ b/ndb/test/ndbapi/testNodeRestart.cpp
@@ -1045,6 +1045,84 @@ int runBug25554(NDBT_Context* ctx, NDBT_Step* step){
 }
 
 
+int
+runBug28717(NDBT_Context* ctx, NDBT_Step* step)
+{
+  int result = NDBT_OK;
+  int loops = ctx->getNumLoops();
+  int records = ctx->getNumRecords();
+  Ndb* pNdb = GETNDB(step);
+  NdbRestarter res;
+
+  if (res.getNumDbNodes() < 4)
+  {
+    return NDBT_OK;
+  }
+
+  int master = res.getMasterNodeId();
+  int node0 = res.getRandomNodeOtherNodeGroup(master, rand());
+  int node1 = res.getRandomNodeSameNodeGroup(node0, rand());
+  
+  ndbout_c("master: %d node0: %d node1: %d", master, node0, node1);
+  
+  if (res.restartOneDbNode(node0, false, true, true))
+  {
+    return NDBT_FAILED;
+  }
+
+  {
+    int filter[] = { 15, NDB_MGM_EVENT_CATEGORY_CHECKPOINT, 0 };
+    NdbLogEventHandle handle = 
+      ndb_mgm_create_logevent_handle(res.handle, filter);
+    
+
+    int dump[] = { DumpStateOrd::DihStartLcpImmediately };
+    struct ndb_logevent event;
+    
+    for (Uint32 i = 0; i<3; i++)
+    {
+      res.dumpStateOneNode(master, dump, 1);
+      while(ndb_logevent_get_next(handle, &event, 0) >= 0 &&
+            event.type != NDB_LE_LocalCheckpointStarted);
+      while(ndb_logevent_get_next(handle, &event, 0) >= 0 &&
+            event.type != NDB_LE_LocalCheckpointCompleted);
+    } 
+  }
+  
+  if (res.waitNodesNoStart(&node0, 1))
+    return NDBT_FAILED;
+  
+  int val2[] = { DumpStateOrd::CmvmiSetRestartOnErrorInsert, 1 };
+  
+  if (res.dumpStateOneNode(node0, val2, 2))
+    return NDBT_FAILED;
+  
+  if (res.insertErrorInNode(node0, 5010))
+    return NDBT_FAILED;
+  
+  if (res.insertErrorInNode(node1, 1001))
+    return NDBT_FAILED;
+  
+  if (res.startNodes(&node0, 1))
+    return NDBT_FAILED;
+  
+  NdbSleep_SecSleep(3);
+
+  if (res.insertErrorInNode(node1, 0))
+    return NDBT_FAILED;
+
+  if (res.waitNodesNoStart(&node0, 1))
+    return NDBT_FAILED;
+
+  if (res.startNodes(&node0, 1))
+    return NDBT_FAILED;
+
+  if (res.waitClusterStarted())
+    return NDBT_FAILED;
+  
+  return NDBT_OK;
+}
+
 NDBT_TESTSUITE(testNodeRestart);
 TESTCASE("NoLoad", 
 	 "Test that one node at a time can be stopped and then restarted "\
@@ -1366,6 +1444,9 @@ TESTCASE("Bug25364", ""){
 TESTCASE("Bug25554", ""){
   INITIALIZER(runBug25554);
 }
+TESTCASE("Bug28717", ""){
+  INITIALIZER(runBug28717);
+}
 NDBT_TESTSUITE_END(testNodeRestart);
 
 int main(int argc, const char** argv){
diff --git a/ndb/test/run-test/daily-basic-tests.txt b/ndb/test/run-test/daily-basic-tests.txt
index d2c91279d18..5a3947ec1e9 100644
--- a/ndb/test/run-test/daily-basic-tests.txt
+++ b/ndb/test/run-test/daily-basic-tests.txt
@@ -492,6 +492,10 @@ max-time: 1500
 cmd: testDict
 args: -n CreateAndDrop 
 
+max-time: 1000
+cmd: testNodeRestart
+args: -n Bug28717 T1
+
 max-time: 1500
 cmd: testDict
 args: -n CreateAndDropAtRandom -l 200 T1

From bc7391299793e183b1d28bd9b1a3a66d6401f1d1 Mon Sep 17 00:00:00 2001
From: "tomas@whalegate.ndb.mysql.com" <>
Date: Mon, 28 May 2007 16:18:04 +0200
Subject: [PATCH 08/48] make memeber public

---
 ndb/test/include/NdbRestarter.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ndb/test/include/NdbRestarter.hpp b/ndb/test/include/NdbRestarter.hpp
index 2f21c41b9c4..63de32ac038 100644
--- a/ndb/test/include/NdbRestarter.hpp
+++ b/ndb/test/include/NdbRestarter.hpp
@@ -65,6 +65,8 @@ public:
   int getRandomNodeOtherNodeGroup(int nodeId, int randomNumber);
   int getRandomNotMasterNodeId(int randomNumber);
   
+  NdbMgmHandle handle;
+  
 protected:
 
   int waitClusterState(ndb_mgm_node_status _status,
@@ -87,7 +89,6 @@ protected:
   
   bool connected;
   BaseString addr;
-  NdbMgmHandle handle;
   ndb_mgm_configuration * m_config;
 protected:
   ndb_mgm_configuration * getConfig();

From 643cc087b1856cdfc7dac5e44b75df6acc1606d4 Mon Sep 17 00:00:00 2001
From: "tomas@whalegate.ndb.mysql.com" <>
Date: Mon, 28 May 2007 16:31:31 +0200
Subject: [PATCH 09/48] print user and system time at watchdog check

---
 ndb/src/kernel/vm/WatchDog.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ndb/src/kernel/vm/WatchDog.cpp b/ndb/src/kernel/vm/WatchDog.cpp
index d1abb709b1e..2e24a5eaa6c 100644
--- a/ndb/src/kernel/vm/WatchDog.cpp
+++ b/ndb/src/kernel/vm/WatchDog.cpp
@@ -16,6 +16,7 @@
 
 #include <ndb_global.h>
 #include <my_pthread.h>
+#include <sys/times.h>
 
 #include "WatchDog.hpp"
 #include "GlobalData.hpp"
@@ -129,6 +130,13 @@ WatchDog::run(){
         break;
       }//switch
       g_eventLogger.warning("Ndb kernel is stuck in: %s", last_stuck_action);
+      {
+        struct tms my_tms;
+        times(&my_tms);
+        g_eventLogger.info("User time: %llu  System time: %llu",
+                           (Uint64)my_tms.tms_utime,
+                           (Uint64)my_tms.tms_stime);
+      }
       if(alerts == 3){
 	shutdownSystem(last_stuck_action);
       }

From 1db91f163b8f336f18fd6253fa5699ea6aaefefb Mon Sep 17 00:00:00 2001
From: "df@pippilotta.erinye.com" <>
Date: Tue, 29 May 2007 12:23:49 +0200
Subject: [PATCH 10/48] BUG#17707 check-cpu script doesn't include Turion

---
 BUILD/check-cpu | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/BUILD/check-cpu b/BUILD/check-cpu
index 2854ec721c6..7429a955ac0 100755
--- a/BUILD/check-cpu
+++ b/BUILD/check-cpu
@@ -104,6 +104,12 @@ check_cpu () {
     *Athlon*64*)
       cpu_arg="athlon64";
       ;;
+    *Turion*)
+      cpu_arg="athlon64";
+      ;;
+    *Opteron*)
+      cpu_arg="athlon64";
+      ;;
     *Athlon*)
       cpu_arg="athlon";
       ;;

From 5783f5ab928b8aae1941c0feb3c5bce604b5e518 Mon Sep 17 00:00:00 2001
From: "tomas@whalegate.ndb.mysql.com" <>
Date: Wed, 30 May 2007 09:00:50 +0200
Subject: [PATCH 11/48] Bug #28749    MaxNoOfOpenFiles offset by 1

---
 ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp b/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
index 353330929e5..55b0a8c4d39 100644
--- a/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
+++ b/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
@@ -569,7 +569,7 @@ AsyncFile*
 Ndbfs::createAsyncFile(){
 
   // Check limit of open files
-  if (theFiles.size()+1 ==  m_maxFiles) {
+  if (theFiles.size() ==  m_maxFiles) {
     // Print info about all open files
     for (unsigned i = 0; i < theFiles.size(); i++){
       AsyncFile* file = theFiles[i];

From 720f56fb0b471bf5fece5f313e67b670c8f428d9 Mon Sep 17 00:00:00 2001
From: "tomas@whalegate.ndb.mysql.com" <>
Date: Wed, 30 May 2007 12:29:19 +0200
Subject: [PATCH 12/48] Bug #28770 file already opened error when corrupt
 schema file - make sure we close the first file, before opening the next

---
 ndb/src/kernel/blocks/dbdict/Dbdict.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp b/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
index b125f8d988d..699b5cb735b 100644
--- a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
+++ b/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
@@ -401,6 +401,9 @@ void Dbdict::execFSCLOSECONF(Signal* signal)
   case FsConnectRecord::OPEN_READ_SCHEMA2:
     openSchemaFile(signal, 1, fsPtr.i, false, false);
     break;
+  case FsConnectRecord::OPEN_READ_TAB_FILE2:
+    openTableFile(signal, 1, fsPtr.i, c_readTableRecord.tableId, false);
+    break;
   default:
     jamLine((fsPtr.p->fsState & 0xFFF));
     ndbrequire(false);
@@ -780,8 +783,11 @@ void Dbdict::readTableConf(Signal* signal,
 void Dbdict::readTableRef(Signal* signal,
                           FsConnectRecordPtr fsPtr)
 {
+  /**
+   * First close corrupt file
+   */
   fsPtr.p->fsState = FsConnectRecord::OPEN_READ_TAB_FILE2;
-  openTableFile(signal, 1, fsPtr.i, c_readTableRecord.tableId, false);
+  closeFile(signal, fsPtr.p->filePtr, fsPtr.i);
   return;
 }//Dbdict::readTableRef()
 

From 0d4bf93e241f920e2c876f7718e6bc5ad7f4dfaf Mon Sep 17 00:00:00 2001
From: "tomas@whalegate.ndb.mysql.com" <>
Date: Wed, 30 May 2007 17:25:22 +0200
Subject: [PATCH 13/48] Bug #28443 - correction of merge error

---
 ndb/src/common/transporter/Packer.cpp         |  5 +++
 .../common/transporter/TCP_Transporter.hpp    |  4 ++
 .../transporter/TransporterRegistry.cpp       | 41 ++++++++++---------
 ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp         | 17 ++++++++
 ndb/test/ndbapi/testNdbApi.cpp                | 34 +++++++++++++++
 ndb/test/run-test/daily-basic-tests.txt       |  4 ++
 6 files changed, 86 insertions(+), 19 deletions(-)

diff --git a/ndb/src/common/transporter/Packer.cpp b/ndb/src/common/transporter/Packer.cpp
index 66c00b0af89..d471167b0e7 100644
--- a/ndb/src/common/transporter/Packer.cpp
+++ b/ndb/src/common/transporter/Packer.cpp
@@ -20,7 +20,12 @@
 #include <TransporterCallback.hpp>
 #include <RefConvert.hpp>
 
+#ifdef ERROR_INSERT
+Uint32 MAX_RECEIVED_SIGNALS = 1024;
+#else
 #define MAX_RECEIVED_SIGNALS 1024
+#endif
+
 Uint32
 TransporterRegistry::unpack(Uint32 * readPtr,
 			    Uint32 sizeOfData,
diff --git a/ndb/src/common/transporter/TCP_Transporter.hpp b/ndb/src/common/transporter/TCP_Transporter.hpp
index 8cba7a01532..fdb64939d5a 100644
--- a/ndb/src/common/transporter/TCP_Transporter.hpp
+++ b/ndb/src/common/transporter/TCP_Transporter.hpp
@@ -101,6 +101,10 @@ private:
   virtual void updateReceiveDataPtr(Uint32 bytesRead);
 
   virtual Uint32 get_free_buffer() const;
+
+  inline bool hasReceiveData () const {
+    return receiveBuffer.sizeOfData > 0;
+  }
 protected:
   /**
    * Setup client/server and perform connect/accept
diff --git a/ndb/src/common/transporter/TransporterRegistry.cpp b/ndb/src/common/transporter/TransporterRegistry.cpp
index bd3136f023c..7a05dcb30c2 100644
--- a/ndb/src/common/transporter/TransporterRegistry.cpp
+++ b/ndb/src/common/transporter/TransporterRegistry.cpp
@@ -841,6 +841,7 @@ TransporterRegistry::poll_OSE(Uint32 timeOutMillis)
 Uint32 
 TransporterRegistry::poll_TCP(Uint32 timeOutMillis)
 {
+  bool hasdata = false;
   if (false && nTCPTransporters == 0)
   {
     tcpReadSelectReply = 0;
@@ -885,6 +886,7 @@ TransporterRegistry::poll_TCP(Uint32 timeOutMillis)
       // Put the connected transporters in the socket read-set 
       FD_SET(socket, &tcpReadset);
     }
+    hasdata |= t->hasReceiveData();
   }
   
   // The highest socket value plus one
@@ -901,7 +903,7 @@ TransporterRegistry::poll_TCP(Uint32 timeOutMillis)
   }
 #endif
   
-  return tcpReadSelectReply;
+  return tcpReadSelectReply || hasdata;
 }
 #endif
 
@@ -937,26 +939,27 @@ TransporterRegistry::performReceive()
 #endif
 
 #ifdef NDB_TCP_TRANSPORTER
-  if(tcpReadSelectReply > 0)
+  for (int i=0; i<nTCPTransporters; i++) 
   {
-    for (int i=0; i<nTCPTransporters; i++) 
-    {
-      checkJobBuffer();
-      TCP_Transporter *t = theTCPTransporters[i];
-      const NodeId nodeId = t->getRemoteNodeId();
-      const NDB_SOCKET_TYPE socket    = t->getSocket();
-      if(is_connected(nodeId)){
-	if(t->isConnected() && FD_ISSET(socket, &tcpReadset)) 
+    checkJobBuffer();
+    TCP_Transporter *t = theTCPTransporters[i];
+    const NodeId nodeId = t->getRemoteNodeId();
+    const NDB_SOCKET_TYPE socket    = t->getSocket();
+    if(is_connected(nodeId)){
+      if(t->isConnected())
+      {
+        if (FD_ISSET(socket, &tcpReadset))
 	{
-	  const int receiveSize = t->doReceive();
-	  if(receiveSize > 0)
-	  {
-	    Uint32 * ptr;
-	    Uint32 sz = t->getReceiveData(&ptr);
-	    transporter_recv_from(callbackObj, nodeId);
-	    Uint32 szUsed = unpack(ptr, sz, nodeId, ioStates[nodeId]);
-	    t->updateReceiveDataPtr(szUsed);
-          }
+	  t->doReceive();
+        }
+
+        if (t->hasReceiveData())
+        {
+          Uint32 * ptr;
+          Uint32 sz = t->getReceiveData(&ptr);
+          transporter_recv_from(callbackObj, nodeId);
+          Uint32 szUsed = unpack(ptr, sz, nodeId, ioStates[nodeId]);
+          t->updateReceiveDataPtr(szUsed);
 	}
       } 
     }
diff --git a/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp b/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
index a9d9c991ca3..8c3148862d4 100644
--- a/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
+++ b/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
@@ -136,6 +136,7 @@ Cmvmi::~Cmvmi()
 
 #ifdef ERROR_INSERT
 NodeBitmask c_error_9000_nodes_mask;
+extern Uint32 MAX_RECEIVED_SIGNALS;
 #endif
 
 void Cmvmi::execNDB_TAMPER(Signal* signal) 
@@ -165,6 +166,22 @@ void Cmvmi::execNDB_TAMPER(Signal* signal)
     kill(getpid(), SIGABRT);
   }
 #endif
+
+#ifdef ERROR_INSERT
+  if (signal->theData[0] == 9003)
+  {
+    if (MAX_RECEIVED_SIGNALS < 1024)
+    {
+      MAX_RECEIVED_SIGNALS = 1024;
+    }
+    else
+    {
+      MAX_RECEIVED_SIGNALS = rand() % 128;
+    }
+    ndbout_c("MAX_RECEIVED_SIGNALS: %d", MAX_RECEIVED_SIGNALS);
+    CLEAR_ERROR_INSERT_VALUE;
+  }
+#endif
 }//execNDB_TAMPER()
 
 void Cmvmi::execSET_LOGLEVELORD(Signal* signal) 
diff --git a/ndb/test/ndbapi/testNdbApi.cpp b/ndb/test/ndbapi/testNdbApi.cpp
index aee668039fe..ad16c472229 100644
--- a/ndb/test/ndbapi/testNdbApi.cpp
+++ b/ndb/test/ndbapi/testNdbApi.cpp
@@ -1306,6 +1306,36 @@ int runTestExecuteAsynch(NDBT_Context* ctx, NDBT_Step* step){
 
 template class Vector<NdbScanOperation*>;
 
+int 
+runBug28443(NDBT_Context* ctx, NDBT_Step* step)
+{
+  int result = NDBT_OK;
+  int records = ctx->getNumRecords();
+  
+  NdbRestarter restarter;
+
+  restarter.insertErrorInAllNodes(9003);
+
+  for (Uint32 i = 0; i<ctx->getNumLoops(); i++)
+  {
+    HugoTransactions hugoTrans(*ctx->getTab());
+    if (hugoTrans.loadTable(GETNDB(step), records, 2048) != 0)
+    {
+      result = NDBT_FAILED;
+      goto done;
+    }
+    if (runClearTable(ctx, step) != 0)
+    {
+      result = NDBT_FAILED;
+      goto done;
+    }
+  }
+  
+done:
+  restarter.insertErrorInAllNodes(9003);
+
+  return result;
+}
 
 NDBT_TESTSUITE(testNdbApi);
 TESTCASE("MaxNdb", 
@@ -1392,6 +1422,10 @@ TESTCASE("Scan_4006",
   INITIALIZER(runScan_4006);
   FINALIZER(runClearTable);
 }
+TESTCASE("Bug28443", 
+	 ""){ 
+  INITIALIZER(runBug28443);
+}
 TESTCASE("ExecuteAsynch", 
 	 "Check that executeAsync() works (BUG#27495)\n"){ 
   INITIALIZER(runTestExecuteAsynch);
diff --git a/ndb/test/run-test/daily-basic-tests.txt b/ndb/test/run-test/daily-basic-tests.txt
index 5a3947ec1e9..f4a685299d6 100644
--- a/ndb/test/run-test/daily-basic-tests.txt
+++ b/ndb/test/run-test/daily-basic-tests.txt
@@ -617,6 +617,10 @@ max-time: 500
 cmd: testNdbApi
 args: -n ExecuteAsynch T1
 
+max-time: 1000
+cmd: testNdbApi
+args: -n BugBug28443
+
 #max-time: 500
 #cmd: testInterpreter
 #args: T1 

From b217a9e898582050ee50300fc8eacb8d5bca12e4 Mon Sep 17 00:00:00 2001
From: "kent@mysql.com/kent-amd64.(none)" <>
Date: Wed, 30 May 2007 22:11:53 +0200
Subject: [PATCH 14/48] Makefile.am, configure.in:   Added --with-mysqld-libs
 configure flag

---
 configure.in    | 6 ++++++
 sql/Makefile.am | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index b9f84086e28..1b3fb9f867d 100644
--- a/configure.in
+++ b/configure.in
@@ -1747,6 +1747,12 @@ AC_ARG_WITH(client-ldflags,
     [CLIENT_EXTRA_LDFLAGS=])
 AC_SUBST(CLIENT_EXTRA_LDFLAGS)
 
+AC_ARG_WITH(mysqld-libs,
+    [  --with-mysqld-libs   Extra libraries to link with for mysqld],
+    [MYSQLD_EXTRA_LIBS=$withval],
+    [MYSQLD_EXTRA_LIBS=])
+AC_SUBST(MYSQLD_EXTRA_LIBS)
+
 AC_ARG_WITH(lib-ccflags,
     [  --with-lib-ccflags      Extra CC options for libraries],
     [LIB_EXTRA_CCFLAGS=$withval],
diff --git a/sql/Makefile.am b/sql/Makefile.am
index cf7bc0a1452..69dbef4364d 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -43,7 +43,8 @@ mysqld_LDADD =		@MYSQLD_EXTRA_LDFLAGS@ \
 			@bdb_libs@ @innodb_libs@ @pstack_libs@ \
                         @innodb_system_libs@ \
 			@ndbcluster_libs@ @ndbcluster_system_libs@ \
-			$(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@
+			$(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@ \
+			@MYSQLD_EXTRA_LIBS@
 noinst_HEADERS =	item.h item_func.h item_sum.h item_cmpfunc.h \
 			item_strfunc.h item_timefunc.h item_uniq.h \
 			item_create.h item_subselect.h item_row.h \

From 779a055ed0f0907958ef232f6a0b78f5f29cc48a Mon Sep 17 00:00:00 2001
From: "df@pippilotta.erinye.com" <>
Date: Thu, 31 May 2007 09:34:24 +0200
Subject: [PATCH 15/48] some test cases cannot run with --skip-log-bin

---
 mysql-test/r/mix_innodb_myisam_binlog.result  | 30 +++++++++----------
 mysql-test/t/binlog.test                      |  1 +
 mysql-test/t/blackhole.test                   |  1 +
 mysql-test/t/ctype_cp932_binlog.test          |  1 +
 mysql-test/t/ctype_cp932_notembedded.test     |  1 +
 mysql-test/t/ctype_ucs_binlog.test            |  1 +
 mysql-test/t/drop_temp_table.test             |  1 +
 .../t/flush_block_commit_notembedded.test     |  2 ++
 mysql-test/t/insert_select-binlog.test        |  1 +
 mysql-test/t/mix_innodb_myisam_binlog.test    |  2 +-
 mysql-test/t/mysqlbinlog-cp932.test           |  3 +-
 mysql-test/t/mysqlbinlog.test                 |  2 ++
 mysql-test/t/mysqlbinlog2.test                |  2 ++
 mysql-test/t/mysqltest.test                   |  2 ++
 mysql-test/t/sp_trans.test                    |  1 +
 mysql-test/t/user_var-binlog.test             |  1 +
 16 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/mysql-test/r/mix_innodb_myisam_binlog.result b/mysql-test/r/mix_innodb_myisam_binlog.result
index a8b132ae927..2c0712f80b1 100644
--- a/mysql-test/r/mix_innodb_myisam_binlog.result
+++ b/mysql-test/r/mix_innodb_myisam_binlog.result
@@ -11,7 +11,7 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	98	Query	1	#	use `test`; BEGIN
 master-bin.000001	166	Query	1	#	use `test`; insert into t1 values(1)
 master-bin.000001	253	Query	1	#	use `test`; insert into t2 select * from t1
-master-bin.000001	347	Xid	1	#	COMMIT /* xid=8 */
+master-bin.000001	347	Xid	1	#	COMMIT /* xid=9 */
 delete from t1;
 delete from t2;
 reset master;
@@ -47,7 +47,7 @@ master-bin.000001	253	Query	1	#	use `test`; savepoint my_savepoint
 master-bin.000001	338	Query	1	#	use `test`; insert into t1 values(4)
 master-bin.000001	425	Query	1	#	use `test`; insert into t2 select * from t1
 master-bin.000001	519	Query	1	#	use `test`; rollback to savepoint my_savepoint
-master-bin.000001	616	Xid	1	#	COMMIT /* xid=25 */
+master-bin.000001	616	Xid	1	#	COMMIT /* xid=26 */
 delete from t1;
 delete from t2;
 reset master;
@@ -74,7 +74,7 @@ master-bin.000001	338	Query	1	#	use `test`; insert into t1 values(6)
 master-bin.000001	425	Query	1	#	use `test`; insert into t2 select * from t1
 master-bin.000001	519	Query	1	#	use `test`; rollback to savepoint my_savepoint
 master-bin.000001	616	Query	1	#	use `test`; insert into t1 values(7)
-master-bin.000001	703	Xid	1	#	COMMIT /* xid=37 */
+master-bin.000001	703	Xid	1	#	COMMIT /* xid=38 */
 delete from t1;
 delete from t2;
 reset master;
@@ -101,7 +101,7 @@ insert into t2 select * from t1;
 show binlog events from 98;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	98	Query	1	#	use `test`; insert into t1 values(9)
-master-bin.000001	185	Xid	1	#	COMMIT /* xid=60 */
+master-bin.000001	185	Xid	1	#	COMMIT /* xid=61 */
 master-bin.000001	212	Query	1	#	use `test`; insert into t2 select * from t1
 delete from t1;
 delete from t2;
@@ -112,18 +112,18 @@ insert into t2 select * from t1;
 show binlog events from 98;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	98	Query	1	#	use `test`; insert into t1 values(10)
-master-bin.000001	186	Xid	1	#	COMMIT /* xid=66 */
+master-bin.000001	186	Xid	1	#	COMMIT /* xid=67 */
 master-bin.000001	213	Query	1	#	use `test`; insert into t2 select * from t1
 insert into t1 values(11);
 commit;
 show binlog events from 98;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	98	Query	1	#	use `test`; insert into t1 values(10)
-master-bin.000001	186	Xid	1	#	COMMIT /* xid=66 */
+master-bin.000001	186	Xid	1	#	COMMIT /* xid=67 */
 master-bin.000001	213	Query	1	#	use `test`; insert into t2 select * from t1
 master-bin.000001	307	Query	1	#	use `test`; BEGIN
 master-bin.000001	375	Query	1	#	use `test`; insert into t1 values(11)
-master-bin.000001	463	Xid	1	#	COMMIT /* xid=68 */
+master-bin.000001	463	Xid	1	#	COMMIT /* xid=69 */
 alter table t2 engine=INNODB;
 delete from t1;
 delete from t2;
@@ -137,7 +137,7 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	98	Query	1	#	use `test`; BEGIN
 master-bin.000001	166	Query	1	#	use `test`; insert into t1 values(12)
 master-bin.000001	254	Query	1	#	use `test`; insert into t2 select * from t1
-master-bin.000001	348	Xid	1	#	COMMIT /* xid=78 */
+master-bin.000001	348	Xid	1	#	COMMIT /* xid=79 */
 delete from t1;
 delete from t2;
 reset master;
@@ -161,7 +161,7 @@ show binlog events from 98;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	98	Query	1	#	use `test`; BEGIN
 master-bin.000001	166	Query	1	#	use `test`; insert into t1 values(14)
-master-bin.000001	254	Xid	1	#	COMMIT /* xid=94 */
+master-bin.000001	254	Xid	1	#	COMMIT /* xid=95 */
 delete from t1;
 delete from t2;
 reset master;
@@ -182,7 +182,7 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	98	Query	1	#	use `test`; BEGIN
 master-bin.000001	166	Query	1	#	use `test`; insert into t1 values(16)
 master-bin.000001	254	Query	1	#	use `test`; insert into t1 values(18)
-master-bin.000001	342	Xid	1	#	COMMIT /* xid=105 */
+master-bin.000001	342	Xid	1	#	COMMIT /* xid=106 */
 delete from t1;
 delete from t2;
 alter table t2 type=MyISAM;
@@ -234,19 +234,19 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	98	Query	1	#	use `test`; BEGIN
 master-bin.000001	166	Query	1	#	use `test`; insert into t1 values(16)
 master-bin.000001	254	Query	1	#	use `test`; insert into t1 values(18)
-master-bin.000001	342	Xid	1	#	COMMIT /* xid=105 */
+master-bin.000001	342	Xid	1	#	COMMIT /* xid=106 */
 master-bin.000001	369	Query	1	#	use `test`; delete from t1
-master-bin.000001	446	Xid	1	#	COMMIT /* xid=114 */
+master-bin.000001	446	Xid	1	#	COMMIT /* xid=115 */
 master-bin.000001	473	Query	1	#	use `test`; delete from t2
-master-bin.000001	550	Xid	1	#	COMMIT /* xid=115 */
+master-bin.000001	550	Xid	1	#	COMMIT /* xid=116 */
 master-bin.000001	577	Query	1	#	use `test`; alter table t2 type=MyISAM
 master-bin.000001	666	Query	1	#	use `test`; insert into t1 values (1)
-master-bin.000001	754	Xid	1	#	COMMIT /* xid=117 */
+master-bin.000001	754	Xid	1	#	COMMIT /* xid=118 */
 master-bin.000001	781	Query	1	#	use `test`; insert into t2 values (20)
 master-bin.000001	870	Query	1	#	use `test`; drop table t1,t2
 master-bin.000001	949	Query	1	#	use `test`; create temporary table ti (a int) engine=innodb
 master-bin.000001	1059	Query	1	#	use `test`; insert into ti values(1)
-master-bin.000001	1146	Xid	1	#	COMMIT /* xid=132 */
+master-bin.000001	1146	Xid	1	#	COMMIT /* xid=133 */
 master-bin.000001	1173	Query	1	#	use `test`; create temporary table t1 (a int) engine=myisam
 master-bin.000001	1283	Query	1	#	use `test`; insert t1 values (1)
 master-bin.000001	1366	Query	1	#	use `test`; create table t0 (n int)
diff --git a/mysql-test/t/binlog.test b/mysql-test/t/binlog.test
index 1063940d378..1b4d43d9727 100644
--- a/mysql-test/t/binlog.test
+++ b/mysql-test/t/binlog.test
@@ -1,6 +1,7 @@
 #
 # misc binlogging tests that do not require a slave running
 #
+-- source include/have_log_bin.inc
 -- source include/not_embedded.inc
 -- source include/have_bdb.inc
 -- source include/have_innodb.inc
diff --git a/mysql-test/t/blackhole.test b/mysql-test/t/blackhole.test
index 4bafad2d777..af319d37dd0 100644
--- a/mysql-test/t/blackhole.test
+++ b/mysql-test/t/blackhole.test
@@ -4,6 +4,7 @@
 #
 -- source include/not_embedded.inc
 -- source include/have_blackhole.inc
+-- source include/have_log_bin.inc
 
 --disable_warnings
 drop table if exists t1,t2;
diff --git a/mysql-test/t/ctype_cp932_binlog.test b/mysql-test/t/ctype_cp932_binlog.test
index ee0e588fdae..1690dd13b5c 100644
--- a/mysql-test/t/ctype_cp932_binlog.test
+++ b/mysql-test/t/ctype_cp932_binlog.test
@@ -1,5 +1,6 @@
 -- source include/not_embedded.inc
 -- source include/have_cp932.inc
+-- source include/have_log_bin.inc
 
 --character_set cp932
 --disable_warnings
diff --git a/mysql-test/t/ctype_cp932_notembedded.test b/mysql-test/t/ctype_cp932_notembedded.test
index 52e7acc3f01..7ae6275816e 100644
--- a/mysql-test/t/ctype_cp932_notembedded.test
+++ b/mysql-test/t/ctype_cp932_notembedded.test
@@ -1,5 +1,6 @@
 -- source include/not_embedded.inc
 -- source include/have_cp932.inc
+-- source include/have_log_bin.inc
 
 --character_set cp932
 --disable_warnings
diff --git a/mysql-test/t/ctype_ucs_binlog.test b/mysql-test/t/ctype_ucs_binlog.test
index 2467d34386c..92d4458a9c2 100644
--- a/mysql-test/t/ctype_ucs_binlog.test
+++ b/mysql-test/t/ctype_ucs_binlog.test
@@ -1,5 +1,6 @@
 --source include/not_embedded.inc
 --source include/have_ucs2.inc
+--source include/have_log_bin.inc
 
 #
 # Check correct binlogging of UCS2 user variables (BUG#3875)
diff --git a/mysql-test/t/drop_temp_table.test b/mysql-test/t/drop_temp_table.test
index bc06de4096c..7c83a2919b7 100644
--- a/mysql-test/t/drop_temp_table.test
+++ b/mysql-test/t/drop_temp_table.test
@@ -1,5 +1,6 @@
 # Embedded server doesn't support binlog
 -- source include/not_embedded.inc
+-- source include/have_log_bin.inc
 
 --disable_warnings
 drop database if exists `drop-temp+table-test`;
diff --git a/mysql-test/t/flush_block_commit_notembedded.test b/mysql-test/t/flush_block_commit_notembedded.test
index 4650a5a15a8..25eb093226e 100644
--- a/mysql-test/t/flush_block_commit_notembedded.test
+++ b/mysql-test/t/flush_block_commit_notembedded.test
@@ -3,6 +3,8 @@
 # We verify that we did not introduce a deadlock.
 # This is intended to mimick how mysqldump and innobackup work.
 
+-- source include/have_log_bin.inc
+
 # And it requires InnoDB
 -- source include/not_embedded.inc
 -- source include/have_innodb.inc
diff --git a/mysql-test/t/insert_select-binlog.test b/mysql-test/t/insert_select-binlog.test
index d4041f86ab5..4bff09577a7 100644
--- a/mysql-test/t/insert_select-binlog.test
+++ b/mysql-test/t/insert_select-binlog.test
@@ -1,5 +1,6 @@
 # Embedded server doesn't support binlog
 -- source include/not_embedded.inc
+-- source include/have_log_bin.inc
 
 # Check if a partly-completed INSERT SELECT in a MyISAM table goes into the
 # binlog
diff --git a/mysql-test/t/mix_innodb_myisam_binlog.test b/mysql-test/t/mix_innodb_myisam_binlog.test
index 8bced9f069c..bb7a2946592 100644
--- a/mysql-test/t/mix_innodb_myisam_binlog.test
+++ b/mysql-test/t/mix_innodb_myisam_binlog.test
@@ -4,7 +4,7 @@
 # slave is always with --skip-innodb in the testsuite. I (Guilhem) however
 # did some tests manually on a slave; tables are replicated fine and
 # Exec_Master_Log_Pos advances as expected.
-
+-- source include/have_log_bin.inc
 # Embedded server doesn't support binlogging
 -- source include/not_embedded.inc
 
diff --git a/mysql-test/t/mysqlbinlog-cp932.test b/mysql-test/t/mysqlbinlog-cp932.test
index 1487606a6c2..1c9f91fd9a8 100644
--- a/mysql-test/t/mysqlbinlog-cp932.test
+++ b/mysql-test/t/mysqlbinlog-cp932.test
@@ -1,6 +1,7 @@
 # disabled in embedded until tools running is fixed with embedded
---source include/not_embedded.inc
+-- source include/not_embedded.inc
 -- source include/have_cp932.inc
+-- source include/have_log_bin.inc
 
 # Bug#16217 (mysql client did not know how not switch its internal charset)
 flush logs;
diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test
index a7b3f413f23..cb1dad2bc85 100644
--- a/mysql-test/t/mysqlbinlog.test
+++ b/mysql-test/t/mysqlbinlog.test
@@ -1,5 +1,7 @@
 # We are using .opt file since we need small binlog size
 
+-- source include/have_log_bin.inc
+
 # Embedded server doesn't support binlogging
 -- source include/not_embedded.inc
 
diff --git a/mysql-test/t/mysqlbinlog2.test b/mysql-test/t/mysqlbinlog2.test
index 14b213cd9cc..6f9045b429b 100644
--- a/mysql-test/t/mysqlbinlog2.test
+++ b/mysql-test/t/mysqlbinlog2.test
@@ -1,6 +1,8 @@
 # Test for the new options --start-datetime, stop-datetime,
 # and a few others.
 
+-- source include/have_log_bin.inc
+
 # Embedded server doesn't support binlogging
 -- source include/not_embedded.inc
 
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index 328206626df..ebbc80890ab 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/t/mysqltest.test
@@ -1,3 +1,5 @@
+-- source include/have_log_bin.inc
+
 # This test should work in embedded server after mysqltest is fixed
 -- source include/not_embedded.inc
 
diff --git a/mysql-test/t/sp_trans.test b/mysql-test/t/sp_trans.test
index d9b34c303ae..dc6adcaf6fd 100644
--- a/mysql-test/t/sp_trans.test
+++ b/mysql-test/t/sp_trans.test
@@ -2,6 +2,7 @@
 # tests that require InnoDB...
 #
 
+-- source include/have_log_bin.inc
 -- source include/have_innodb.inc
 
 --disable_warnings
diff --git a/mysql-test/t/user_var-binlog.test b/mysql-test/t/user_var-binlog.test
index 12a5e616fa2..2b7f880d7fa 100644
--- a/mysql-test/t/user_var-binlog.test
+++ b/mysql-test/t/user_var-binlog.test
@@ -1,5 +1,6 @@
 # Embedded server does not support binlogging
 --source include/not_embedded.inc
+--source include/have_log_bin.inc
 
 # Check that user variables are binlogged correctly (BUG#3875)
 create table t1 (a varchar(50));

From fc1e03883210d3b926d27e9d7e4de08f27337fac Mon Sep 17 00:00:00 2001
From: "df@pippilotta.erinye.com" <>
Date: Thu, 31 May 2007 12:21:55 +0200
Subject: [PATCH 16/48] fix test case broken for ps-protocol by previous push

---
 mysql-test/t/mix_innodb_myisam_binlog.test | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/mysql-test/t/mix_innodb_myisam_binlog.test b/mysql-test/t/mix_innodb_myisam_binlog.test
index bb7a2946592..53de4d11b81 100644
--- a/mysql-test/t/mix_innodb_myisam_binlog.test
+++ b/mysql-test/t/mix_innodb_myisam_binlog.test
@@ -29,7 +29,7 @@ insert into t2 select * from t1;
 commit;
 
 --replace_column 5 #
---replace_result "xid=14" "xid=8"
+--replace_result "xid=15" "xid=9"
 show binlog events from 98;
 
 delete from t1;
@@ -58,7 +58,7 @@ rollback to savepoint my_savepoint;
 commit;
 
 --replace_column 5 #
---replace_result "xid=47" "xid=25"
+--replace_result "xid=48" "xid=26"
 show binlog events from 98;
 
 delete from t1;
@@ -76,7 +76,7 @@ commit;
 select a from t1 order by a; # check that savepoints work :)
 
 --replace_column 5 #
---replace_result "xid=69" "xid=37"
+--replace_result "xid=70" "xid=38"
 show binlog events from 98;
 
 # and when ROLLBACK is not explicit?
@@ -109,7 +109,7 @@ insert into t1 values(9);
 insert into t2 select * from t1;
 
 --replace_column 5 #
---replace_result "xid=117" "xid=60"
+--replace_result "xid=118" "xid=61"
 show binlog events from 98;
 
 # Check that when the query updat1ng the MyISAM table is the first in the
@@ -122,13 +122,13 @@ insert into t1 values(10); # first make t1 non-empty
 begin;
 insert into t2 select * from t1;
 --replace_column 5 #
---replace_result "xid=131" "xid=66"
+--replace_result "xid=132" "xid=67"
 show binlog events from 98;
 insert into t1 values(11);
 commit;
 
 --replace_column 5 #
---replace_result "xid=131" "xid=66" "xid=134" "xid=68"
+--replace_result "xid=132" "xid=67" "xid=135" "xid=69"
 show binlog events from 98;
 
 
@@ -147,7 +147,7 @@ insert into t2 select * from t1;
 commit;
 
 --replace_column 5 #
---replace_result "xid=153" "xid=78"
+--replace_result "xid=154" "xid=79"
 show binlog events from 98;
 
 delete from t1;
@@ -175,7 +175,7 @@ rollback to savepoint my_savepoint;
 commit;
 
 --replace_column 5 #
---replace_result "xid=185" "xid=94"
+--replace_result "xid=186" "xid=95"
 show binlog events from 98;
 
 delete from t1;
@@ -193,7 +193,7 @@ commit;
 select a from t1 order by a; # check that savepoints work :)
 
 --replace_column 5 #
---replace_result "xid=206" "xid=105"
+--replace_result "xid=207" "xid=106"
 show binlog events from 98;
 
 # Test for BUG#5714, where a MyISAM update in the transaction used to
@@ -254,7 +254,7 @@ disconnect con2;
 connection con3;
 select get_lock("lock1",60);
 --replace_column 5 #
---replace_result "xid=206" "xid=105" "xid=224" "xid=114" "xid=227" "xid=115" "xid=231" "xid=117" "xid=258" "xid=132"
+--replace_result "xid=207" "xid=106" "xid=225" "xid=115" "xid=228" "xid=116" "xid=232" "xid=118" "xid=259" "xid=133"
 show binlog events from 98;
 do release_lock("lock1");
 drop table t0,t2;

From 9a151eb3c573c19bc39fe2a73f18ec06f15a89bc Mon Sep 17 00:00:00 2001
From: "georg@bing.mysql.com" <>
Date: Thu, 31 May 2007 13:53:44 +0200
Subject: [PATCH 17/48] fixed not matching if/endif (cmake)

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 890ee2676e8..54df0befad9 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -158,7 +158,7 @@ IF(EMBED_MANIFESTS)
     STRING(REGEX MATCH "MANIFEST:NO" tmp_manifest ${CMAKE_EXE_LINKER_FLAGS})
     IF(NOT tmp_manifest)
         SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
-    ENDIF(tmp_manifest)
+    ENDIF(NOT tmp_manifest)
     # Set the processor architecture.
     IF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
     	SET(PROCESSOR_ARCH "X64") 

From 6e7585a01143379178dd2b5eb3f91241dcf4c3eb Mon Sep 17 00:00:00 2001
From: "df@pippilotta.erinye.com" <>
Date: Thu, 31 May 2007 14:05:07 +0200
Subject: [PATCH 18/48] fix test case

---
 mysql-test/r/binlog.result | 4 ++--
 mysql-test/t/binlog.test   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mysql-test/r/binlog.result b/mysql-test/r/binlog.result
index 25930c31735..4ed6c50c7f6 100644
--- a/mysql-test/r/binlog.result
+++ b/mysql-test/r/binlog.result
@@ -17,7 +17,7 @@ master-bin.000001	#	Query	1	#	use `test`; insert t1 values (5)
 master-bin.000001	#	Query	1	#	use `test`; COMMIT
 master-bin.000001	#	Query	1	#	use `test`; BEGIN
 master-bin.000001	#	Query	1	#	use `test`; insert t2 values (5)
-master-bin.000001	#	Xid	1	#	COMMIT /* xid=12 */
+master-bin.000001	#	Xid	1	#	COMMIT /* xid=13 */
 drop table t1,t2;
 reset master;
 create table t1 (n int) engine=innodb;
@@ -128,7 +128,7 @@ master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(4 + 4)
 master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(3 + 4)
 master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(2 + 4)
 master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(1 + 4)
-master-bin.000001	#	Xid	1	#	COMMIT /* xid=19 */
+master-bin.000001	#	Xid	1	#	COMMIT /* xid=20 */
 master-bin.000001	#	Rotate	1	#	master-bin.000002;pos=4
 show binlog events in 'master-bin.000002' from 98;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
diff --git a/mysql-test/t/binlog.test b/mysql-test/t/binlog.test
index 1b4d43d9727..3bc6c6953ed 100644
--- a/mysql-test/t/binlog.test
+++ b/mysql-test/t/binlog.test
@@ -20,7 +20,7 @@ begin;
 insert t2 values (5);
 commit;
 # first COMMIT must be Query_log_event, second - Xid_log_event
---replace_result "xid=21" "xid=12"
+--replace_result "xid=22" "xid=13"
 --replace_column 2 # 5 #
 show binlog events from 98;
 drop table t1,t2;
@@ -42,7 +42,7 @@ while ($1)
 --enable_query_log
 commit;
 drop table t1;
---replace_result "xid=32" "xid=19"
+--replace_result "xid=33" "xid=20"
 --replace_column 2 # 5 #
 show binlog events in 'master-bin.000001' from 98;
 --replace_column 2 # 5 #

From 0a91c7ccca2e78c419436c660eb99612e4e2b8a4 Mon Sep 17 00:00:00 2001
From: "evgen@moonbone.local" <>
Date: Wed, 6 Jun 2007 00:25:06 +0400
Subject: [PATCH 19/48] Bug#28778: Wrong result of BETWEEN when comparing a
 DATETIME field with an integer constants.

This bug is introduced by the fix for bug#16377. Before the fix the
Item_func_between::fix_length_and_dec method converted the second and third
arguments to the type of the first argument if they were constant and the first
argument is of the DATE/DATETIME type. That approach worked well for integer
constants and sometimes produced bad result for string constants. The fix for
the bug#16377 wrongly removed that code at all and as a result of this the
comparison of a DATETIME field and an integer constant was carried out in a
wrong way and sometimes led to wrong result sets.

Now the Item_func_between::fix_length_and_dec method converts the second and
third arguments to the type of the first argument if they are constant, the
first argument is of the DATE/DATETIME type and the DATETIME comparator isn't
applicable.
---
 mysql-test/r/type_datetime.result | 16 ++++++++++++++++
 mysql-test/t/type_datetime.test   | 11 +++++++++++
 sql/item_cmpfunc.cc               | 17 +++++++++++++++++
 3 files changed, 44 insertions(+)

diff --git a/mysql-test/r/type_datetime.result b/mysql-test/r/type_datetime.result
index ba02f19712a..9e47b5da2b6 100644
--- a/mysql-test/r/type_datetime.result
+++ b/mysql-test/r/type_datetime.result
@@ -411,3 +411,19 @@ if(@bug28261 = f1, '', @bug28261:= f1)
 2001-01-01
 2002-02-02
 drop table t1;
+create table t1(f1 datetime);
+insert into t1 values('2001-01-01'),('2002-02-02');
+select * from t1 where f1 between 20020101 and 20070101000000;
+f1
+2002-02-02 00:00:00
+select * from t1 where f1 between 2002010 and 20070101000000;
+f1
+2001-01-01 00:00:00
+2002-02-02 00:00:00
+Warnings:
+Warning	1292	Incorrect datetime value: '2002010' for column 'f1' at row 1
+select * from t1 where f1 between 20020101 and 2007010100000;
+f1
+Warnings:
+Warning	1292	Incorrect datetime value: '2007010100000' for column 'f1' at row 1
+drop table t1;
diff --git a/mysql-test/t/type_datetime.test b/mysql-test/t/type_datetime.test
index d420afbde37..ffda593f320 100644
--- a/mysql-test/t/type_datetime.test
+++ b/mysql-test/t/type_datetime.test
@@ -271,3 +271,14 @@ select if(@bug28261 = f1, '', @bug28261:= f1) from t1;
 select if(@bug28261 = f1, '', @bug28261:= f1) from t1;
 select if(@bug28261 = f1, '', @bug28261:= f1) from t1;
 drop table t1;
+
+#
+# Bug#28778: Wrong result of BETWEEN when comparing a DATETIME field with an
+#            integer constants.
+#
+create table t1(f1 datetime);
+insert into t1 values('2001-01-01'),('2002-02-02');
+select * from t1 where f1 between 20020101 and 20070101000000;
+select * from t1 where f1 between 2002010 and 20070101000000;
+select * from t1 where f1 between 20020101 and 2007010100000;
+drop table t1;
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 06c825334c2..919015140c1 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -1755,6 +1755,23 @@ void Item_func_between::fix_length_and_dec()
     ge_cmp.set_datetime_cmp_func(args, args + 1);
     le_cmp.set_datetime_cmp_func(args, args + 2);
   }
+  else if (args[0]->real_item()->type() == FIELD_ITEM &&
+           thd->lex->sql_command != SQLCOM_CREATE_VIEW &&
+           thd->lex->sql_command != SQLCOM_SHOW_CREATE)
+  {
+    Field *field=((Item_field*) (args[0]->real_item()))->field;
+    if (field->can_be_compared_as_longlong())
+    {
+      /*
+        The following can't be recoded with || as convert_constant_item
+        changes the argument
+      */
+      if (convert_constant_item(thd, field,&args[1]))
+        cmp_type=INT_RESULT;			// Works for all types.
+      if (convert_constant_item(thd, field,&args[2]))
+        cmp_type=INT_RESULT;			// Works for all types.
+    }
+  }
 }
 
 

From 0067a9cc027d49a69393fc1649e578c8330a2fd0 Mon Sep 17 00:00:00 2001
From: "joerg/mysqldev@mysql.com/production.mysql.com" <>
Date: Wed, 6 Jun 2007 15:22:06 +0200
Subject: [PATCH 20/48] Raise version number after cloning 4.1.23

---
 configure.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index b9f84086e28..5d60de7fe34 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 4.1.23)
+AM_INIT_AUTOMAKE(mysql, 4.1.24)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10
@@ -21,7 +21,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
 # ndb version
 NDB_VERSION_MAJOR=4
 NDB_VERSION_MINOR=1
-NDB_VERSION_BUILD=23
+NDB_VERSION_BUILD=24
 NDB_VERSION_STATUS=""
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?

From 466da4ccf18aa18dc2f50c530a08db60b6cf09cd Mon Sep 17 00:00:00 2001
From: "gluh@mysql.com/eagle.(none)" <>
Date: Wed, 6 Jun 2007 18:29:15 +0500
Subject: [PATCH 21/48] Bug#28553 mysqld crash in "purge master log
 before(select time from information_schema)" forbid the use of subselect in
 PURGE LOGS BEFORE command

---
 mysql-test/r/subselect.result | 2 ++
 mysql-test/t/subselect.test   | 7 ++++---
 sql/sql_yacc.yy               | 8 +++++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index 5bb79a53771..ff120912902 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -2834,6 +2834,8 @@ a
 4
 DROP TABLE t1,t2,t3;
 purge master logs before (select adddate(current_timestamp(), interval -4 day));
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'select adddate(current_timestamp(), interval -4 day))' at line 1
+purge master logs before adddate(current_timestamp(), interval -4 day);
 CREATE TABLE t1 (f1 INT);
 CREATE TABLE t2 (f2 INT);
 INSERT INTO t1 VALUES (1);
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index 67a18e7a30f..978c8f26552 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -1815,11 +1815,12 @@ SELECT * FROM t1
 DROP TABLE t1,t2,t3;
 
 #
-# BUG #10308: purge log with subselect
+# BUG#10308: purge log with subselect
+# Bug#28553: mysqld crash in "purge master log before(select time from information_schema)"
 #
-
+--error 1064
 purge master logs before (select adddate(current_timestamp(), interval -4 day));
-
+purge master logs before adddate(current_timestamp(), interval -4 day);
 
 #
 # Bug#18503: Queries with a quantified subquery returning empty set may
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index b72caac46a0..d53dba6bf1b 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -3567,7 +3567,8 @@ select_derived2:
 	  LEX *lex= Lex;
 	  lex->derived_tables= 1;
           if (lex->sql_command == (int)SQLCOM_HA_READ ||
-              lex->sql_command == (int)SQLCOM_KILL)
+              lex->sql_command == (int)SQLCOM_KILL ||
+              lex->sql_command == (int)SQLCOM_PURGE)
 	  {
 	    yyerror(ER(ER_SYNTAX_ERROR));
 	    YYABORT;
@@ -4748,6 +4749,7 @@ purge:
 	{
 	  LEX *lex=Lex;
 	  lex->type=0;
+          lex->sql_command = SQLCOM_PURGE;
 	} purge_options
 	{}
 	;
@@ -4759,7 +4761,6 @@ purge_options:
 purge_option:
         TO_SYM TEXT_STRING_sys
         {
-	   Lex->sql_command = SQLCOM_PURGE;
 	   Lex->to_log = $2.str;
         }
 	| BEFORE_SYM expr
@@ -6212,7 +6213,8 @@ subselect_start:
 	{
 	  LEX *lex=Lex;
           if (lex->sql_command == (int)SQLCOM_HA_READ ||
-              lex->sql_command == (int)SQLCOM_KILL)
+              lex->sql_command == (int)SQLCOM_KILL ||
+              lex->sql_command == (int)SQLCOM_PURGE)
 	  {
             yyerror(ER(ER_SYNTAX_ERROR));
 	    YYABORT;

From cf41df22f83658144d01a8ef2246c5906bd46787 Mon Sep 17 00:00:00 2001
From: "gluh@mysql.com/eagle.(none)" <>
Date: Wed, 6 Jun 2007 18:55:21 +0500
Subject: [PATCH 22/48] after merge fix

---
 mysql-test/r/subselect.result             | 3 ---
 mysql-test/r/subselect_notembedded.result | 2 ++
 mysql-test/t/subselect.test               | 8 --------
 mysql-test/t/subselect_notembedded.test   | 7 ++++---
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index aa970e2b171..38f6e2d10e3 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -2853,9 +2853,6 @@ a
 3
 4
 DROP TABLE t1,t2,t3;
-purge master logs before (select adddate(current_timestamp(), interval -4 day));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'select adddate(current_timestamp(), interval -4 day))' at line 1
-purge master logs before adddate(current_timestamp(), interval -4 day);
 CREATE TABLE t1 (f1 INT);
 CREATE TABLE t2 (f2 INT);
 INSERT INTO t1 VALUES (1);
diff --git a/mysql-test/r/subselect_notembedded.result b/mysql-test/r/subselect_notembedded.result
index dd4b0701c32..44ae055425e 100644
--- a/mysql-test/r/subselect_notembedded.result
+++ b/mysql-test/r/subselect_notembedded.result
@@ -1 +1,3 @@
 purge master logs before (select adddate(current_timestamp(), interval -4 day));
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'select adddate(current_timestamp(), interval -4 day))' at line 1
+purge master logs before adddate(current_timestamp(), interval -4 day);
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index 2ae48a0303f..33e58fe0c32 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -1821,14 +1821,6 @@ SELECT * FROM t1
 
 DROP TABLE t1,t2,t3;
 
-#
-# BUG#10308: purge log with subselect
-# Bug#28553: mysqld crash in "purge master log before(select time from information_schema)"
-#
---error 1064
-purge master logs before (select adddate(current_timestamp(), interval -4 day));
-purge master logs before adddate(current_timestamp(), interval -4 day);
-
 #
 # Bug#18503: Queries with a quantified subquery returning empty set may
 # return a wrong result. 
diff --git a/mysql-test/t/subselect_notembedded.test b/mysql-test/t/subselect_notembedded.test
index c5b23f6dac8..c112272e8ad 100644
--- a/mysql-test/t/subselect_notembedded.test
+++ b/mysql-test/t/subselect_notembedded.test
@@ -1,8 +1,9 @@
 -- source include/not_embedded.inc
 
 #
-# BUG #10308: purge log with subselect
+# BUG#10308: purge log with subselect
+# Bug#28553: mysqld crash in "purge master log before(select time from information_schema)"
 #
-
+--error 1064
 purge master logs before (select adddate(current_timestamp(), interval -4 day));
-
+purge master logs before adddate(current_timestamp(), interval -4 day);

From b90901130ec6b3c7baa34a9b614b6dba9f7a9897 Mon Sep 17 00:00:00 2001
From: "evgen@moonbone.local" <>
Date: Thu, 7 Jun 2007 00:30:00 +0400
Subject: [PATCH 23/48] Bug#28505: mysql_affected_rows() may return wrong
 result if CLIENT_FOUND_ROWS flag is set.

When the CLIENT_FOUND_ROWS flag is set then the server should return
found number of rows independently whether they were updated or not.
But this wasn't the case for the INSERT statement which always returned
number of rows that were actually changed thus providing wrong info to
the user.

Now the select_insert::send_eof method and the mysql_insert function
are sending the number of touched rows if the CLIENT_FOUND_ROWS flag is set.
---
 sql/sql_insert.cc         | 14 ++++++---
 tests/mysql_client_test.c | 64 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index bf37a3d6d69..f3ed3ebab24 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -947,20 +947,24 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
   if (values_list.elements == 1 && (!(thd->options & OPTION_WARNINGS) ||
 				    !thd->cuted_fields))
   {
-    thd->row_count_func= info.copied+info.deleted+info.updated;
+    thd->row_count_func= info.copied + info.deleted +
+                         ((thd->client_capabilities & CLIENT_FOUND_ROWS) ?
+                          info.touched : info.updated);
     send_ok(thd, (ulong) thd->row_count_func, id);
   }
   else
   {
     char buff[160];
+    ha_rows updated=((thd->client_capabilities & CLIENT_FOUND_ROWS) ?
+                     info.touched : info.updated);
     if (ignore)
       sprintf(buff, ER(ER_INSERT_INFO), (ulong) info.records,
 	      (lock_type == TL_WRITE_DELAYED) ? (ulong) 0 :
 	      (ulong) (info.records - info.copied), (ulong) thd->cuted_fields);
     else
       sprintf(buff, ER(ER_INSERT_INFO), (ulong) info.records,
-	      (ulong) (info.deleted+info.updated), (ulong) thd->cuted_fields);
-    thd->row_count_func= info.copied+info.deleted+info.updated;
+	      (ulong) (info.deleted + updated), (ulong) thd->cuted_fields);
+    thd->row_count_func= info.copied + info.deleted + updated;
     ::send_ok(thd, (ulong) thd->row_count_func, id, buff);
   }
   thd->abort_on_warning= 0;
@@ -2973,7 +2977,9 @@ bool select_insert::send_eof()
   else
     sprintf(buff, ER(ER_INSERT_INFO), (ulong) info.records,
 	    (ulong) (info.deleted+info.updated), (ulong) thd->cuted_fields);
-  thd->row_count_func= info.copied+info.deleted+info.updated;
+  thd->row_count_func= info.copied + info.deleted +
+                       ((thd->client_capabilities & CLIENT_FOUND_ROWS) ?
+                        info.touched : info.updated);
   ::send_ok(thd, (ulong) thd->row_count_func, last_insert_id, buff);
   DBUG_RETURN(0);
 }
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index e56dd693287..54d29dbd683 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -15623,6 +15623,69 @@ static void test_bug27876()
 }
 
 
+/*
+  Bug#28505: mysql_affected_rows() returns wrong value if CLIENT_FOUND_ROWS
+  flag is set.
+*/
+static void test_bug28505()
+{
+  MYSQL *l_mysql;
+  my_bool error= 0;
+  my_ulonglong res;
+
+  if (!(l_mysql= mysql_init(NULL)))
+  {
+    myerror("mysql_init() failed");
+    DIE_UNLESS(1);
+  }
+  if (!(mysql_real_connect(l_mysql, opt_host, opt_user,
+                           opt_password, current_db, opt_port,
+                           opt_unix_socket, CLIENT_FOUND_ROWS)))
+  {
+    myerror("connection failed");
+    error= 1;
+    goto end;
+  }
+  l_mysql->reconnect= 1;
+  if (mysql_query(l_mysql, "drop table if exists t1"))
+  {
+    myerror(NULL);
+    error= 1;
+    goto end;
+  }
+  if (mysql_query(l_mysql, "create table t1(f1 int primary key)"))
+  {
+    myerror(NULL);
+    error= 1;
+    goto end;
+  }
+  if (mysql_query(l_mysql, "insert into t1 values(1)"))
+  {
+    myerror(NULL);
+    error= 1;
+    goto end;
+  }
+  if (mysql_query(l_mysql,
+                  "insert into t1 values(1) on duplicate key update f1=1"))
+  {
+    myerror(NULL);
+    error= 1;
+    goto end;
+  }
+  res= mysql_affected_rows(l_mysql);
+  if (!res)
+    error= 1;
+  if (mysql_query(l_mysql, "drop table t1"))
+  {
+    myerror(NULL);
+    error= 1;
+  }
+end:
+  mysql_close(l_mysql);
+  DIE_UNLESS(error == 0);
+}
+
+
 /*
   Read and parse arguments and MySQL options from my.cnf
 */
@@ -15904,6 +15967,7 @@ static struct my_tests_st my_tests[]= {
   { "test_bug21635", test_bug21635 },
   { "test_bug24179", test_bug24179 },
   { "test_bug27876", test_bug27876 },
+  { "test_bug28505", test_bug28505 },
   { 0, 0 }
 };
 

From b1e936b9e51e2ce5a0c408f70187fa15569b9a76 Mon Sep 17 00:00:00 2001
From: "gkodinov/kgeorge@magare.gmz" <>
Date: Thu, 7 Jun 2007 10:08:44 +0300
Subject: [PATCH 24/48] Bug#28878: InnoDB tables with UTF8 character set and
 indexes cause wrong result for DML When making key reference buffers over
 CHAR fields whitespace (0x20) must be used to fill in the remaining space in
 the field's buffer. This is what Field_string::store() does. Fixed
 Field_string::get_key_image() to do the same.

---
 mysql-test/r/innodb_mysql.result | 36 ++++++++++++++++++++++++++++++++
 mysql-test/t/innodb_mysql.test   | 31 +++++++++++++++++++++++++++
 sql/field.cc                     |  3 ++-
 3 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result
index 45cb116f08b..6aab2372706 100644
--- a/mysql-test/r/innodb_mysql.result
+++ b/mysql-test/r/innodb_mysql.result
@@ -617,4 +617,40 @@ EXPLAIN SELECT COUNT(*) FROM t2 WHERE stat_id IN (1,3) AND acct_id=785;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2	range	idx1,idx2	idx1	9	NULL	2	Using where; Using index
 DROP TABLE t1,t2;
+CREATE TABLE t1 (a CHAR(2), KEY (a)) ENGINE = InnoDB DEFAULT CHARSET=UTF8;
+INSERT INTO t1 VALUES ('uk'),('bg');
+SELECT * FROM t1 WHERE a = 'uk';
+a
+uk
+DELETE FROM t1 WHERE a = 'uk';
+SELECT * FROM t1 WHERE a = 'uk';
+a
+UPDATE t1 SET a = 'us' WHERE a = 'uk';
+SELECT * FROM t1 WHERE a = 'uk';
+a
+CREATE TABLE t2 (a CHAR(2), KEY (a)) ENGINE = InnoDB;
+INSERT INTO t2 VALUES ('uk'),('bg');
+SELECT * FROM t2 WHERE a = 'uk';
+a
+uk
+DELETE FROM t2 WHERE a = 'uk';
+SELECT * FROM t2 WHERE a = 'uk';
+a
+INSERT INTO t2 VALUES ('uk');
+UPDATE t2 SET a = 'us' WHERE a = 'uk';
+SELECT * FROM t2 WHERE a = 'uk';
+a
+CREATE TABLE t3 (a CHAR(2), KEY (a)) ENGINE = MyISAM;
+INSERT INTO t3 VALUES ('uk'),('bg');
+SELECT * FROM t3 WHERE a = 'uk';
+a
+uk
+DELETE FROM t3 WHERE a = 'uk';
+SELECT * FROM t3 WHERE a = 'uk';
+a
+INSERT INTO t3 VALUES ('uk');
+UPDATE t3 SET a = 'us' WHERE a = 'uk';
+SELECT * FROM t3 WHERE a = 'uk';
+a
+DROP TABLE t1,t2,t3;
 End of 5.0 tests
diff --git a/mysql-test/t/innodb_mysql.test b/mysql-test/t/innodb_mysql.test
index d9e50add8bf..fbb114f9ce6 100644
--- a/mysql-test/t/innodb_mysql.test
+++ b/mysql-test/t/innodb_mysql.test
@@ -597,4 +597,35 @@ EXPLAIN SELECT COUNT(*) FROM t2 WHERE stat_id IN (1,3) AND acct_id=785;
 
 DROP TABLE t1,t2; 
 
+#
+# Bug #25866: Getting "#HY000 Can't find record in..." on and INSERT
+#
+CREATE TABLE t1 (a CHAR(2), KEY (a)) ENGINE = InnoDB DEFAULT CHARSET=UTF8;
+INSERT INTO t1 VALUES ('uk'),('bg');
+SELECT * FROM t1 WHERE a = 'uk';
+DELETE FROM t1 WHERE a = 'uk';
+SELECT * FROM t1 WHERE a = 'uk';
+UPDATE t1 SET a = 'us' WHERE a = 'uk';
+SELECT * FROM t1 WHERE a = 'uk';
+
+CREATE TABLE t2 (a CHAR(2), KEY (a)) ENGINE = InnoDB;
+INSERT INTO t2 VALUES ('uk'),('bg');
+SELECT * FROM t2 WHERE a = 'uk';
+DELETE FROM t2 WHERE a = 'uk';
+SELECT * FROM t2 WHERE a = 'uk';
+INSERT INTO t2 VALUES ('uk');
+UPDATE t2 SET a = 'us' WHERE a = 'uk';
+SELECT * FROM t2 WHERE a = 'uk';
+
+CREATE TABLE t3 (a CHAR(2), KEY (a)) ENGINE = MyISAM;
+INSERT INTO t3 VALUES ('uk'),('bg');
+SELECT * FROM t3 WHERE a = 'uk';
+DELETE FROM t3 WHERE a = 'uk';
+SELECT * FROM t3 WHERE a = 'uk';
+INSERT INTO t3 VALUES ('uk');
+UPDATE t3 SET a = 'us' WHERE a = 'uk';
+SELECT * FROM t3 WHERE a = 'uk';
+
+DROP TABLE t1,t2,t3;
+
 --echo End of 5.0 tests
diff --git a/sql/field.cc b/sql/field.cc
index 8ff615ee798..5ac8358acaa 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -6249,7 +6249,8 @@ uint Field_string::get_key_image(char *buff, uint length, imagetype type_arg)
                           length / field_charset->mbmaxlen);
   memcpy(buff, ptr, bytes);
   if (bytes < length)
-    bzero(buff + bytes, length - bytes);
+    field_charset->cset->fill(field_charset, buff + bytes, length - bytes, 
+                              field_charset->pad_char);
   return bytes;
 }
 

From 569960410f108a77875e655002ccfe47688997af Mon Sep 17 00:00:00 2001
From: "igor@olga.mysql.com" <>
Date: Thu, 7 Jun 2007 00:59:08 -0700
Subject: [PATCH 25/48] Fixed bug #28449: a crash may happen at some rare
 conditions when a temporary table has grown out of heap memory reserved for
 it and the remaining disk space is not big enough to store the table as a
 MyISAM table.

The crash happens because the function create_myisam_from_heap
does not handle safely the mem_root structure associated
with the converted table in the case when an error has occurred.
---
 mysql-test/r/error_simulation.result     | 19 ++++++++++++++++
 mysql-test/t/error_simulation-master.opt |  1 +
 mysql-test/t/error_simulation.test       | 29 ++++++++++++++++++++++++
 sql/sql_select.cc                        |  7 ++++--
 4 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 mysql-test/r/error_simulation.result
 create mode 100644 mysql-test/t/error_simulation-master.opt
 create mode 100644 mysql-test/t/error_simulation.test

diff --git a/mysql-test/r/error_simulation.result b/mysql-test/r/error_simulation.result
new file mode 100644
index 00000000000..805e8fabbd8
--- /dev/null
+++ b/mysql-test/r/error_simulation.result
@@ -0,0 +1,19 @@
+DROP TABLE IF EXISTS t1;
+Warnings:
+Note	1051	Unknown table 't1'
+CREATE TABLE t1 (
+a varchar(32) character set utf8 collate utf8_bin NOT NULL,
+b varchar(32) character set utf8 collate utf8_bin NOT NULL )
+ENGINE=MyISAM DEFAULT CHARSET=utf8;
+INSERT INTO t1 VALUES
+('AAAAAAAAAA','AAAAAAAAAA'), ('AAAAAAAAAB','AAAAAAAAAB '),
+('AAAAAAAAAB','AAAAAAAAAB'), ('AAAAAAAAAC','AAAAAAAAAC'),
+('AAAAAAAAAD','AAAAAAAAAD'), ('AAAAAAAAAE','AAAAAAAAAE'),
+('AAAAAAAAAF','AAAAAAAAAF'), ('AAAAAAAAAG','AAAAAAAAAG'),
+('AAAAAAAAAH','AAAAAAAAAH'), ('AAAAAAAAAI','AAAAAAAAAI'),
+('AAAAAAAAAJ','AAAAAAAAAJ'), ('AAAAAAAAAK','AAAAAAAAAK');
+set tmp_table_size=1024;
+SELECT MAX(a) FROM t1 GROUP BY a,b;
+ERROR 23000: Can't write; duplicate key in table ''
+set tmp_table_size=default;
+DROP TABLE t1;
diff --git a/mysql-test/t/error_simulation-master.opt b/mysql-test/t/error_simulation-master.opt
new file mode 100644
index 00000000000..edb77cfa85e
--- /dev/null
+++ b/mysql-test/t/error_simulation-master.opt
@@ -0,0 +1 @@
+--loose-debug=d,raise_error
diff --git a/mysql-test/t/error_simulation.test b/mysql-test/t/error_simulation.test
new file mode 100644
index 00000000000..8c044224b8a
--- /dev/null
+++ b/mysql-test/t/error_simulation.test
@@ -0,0 +1,29 @@
+-- source include/have_debug.inc
+
+#
+# Bug #28499: crash for grouping query when tmp_table_size is too small
+#
+
+DROP TABLE IF EXISTS t1;
+
+CREATE TABLE t1 (
+  a varchar(32) character set utf8 collate utf8_bin NOT NULL,
+  b varchar(32) character set utf8 collate utf8_bin NOT NULL )
+ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+INSERT INTO t1 VALUES
+  ('AAAAAAAAAA','AAAAAAAAAA'), ('AAAAAAAAAB','AAAAAAAAAB '),
+  ('AAAAAAAAAB','AAAAAAAAAB'), ('AAAAAAAAAC','AAAAAAAAAC'),
+  ('AAAAAAAAAD','AAAAAAAAAD'), ('AAAAAAAAAE','AAAAAAAAAE'),
+  ('AAAAAAAAAF','AAAAAAAAAF'), ('AAAAAAAAAG','AAAAAAAAAG'),
+  ('AAAAAAAAAH','AAAAAAAAAH'), ('AAAAAAAAAI','AAAAAAAAAI'),
+  ('AAAAAAAAAJ','AAAAAAAAAJ'), ('AAAAAAAAAK','AAAAAAAAAK');
+
+set tmp_table_size=1024;
+
+--error ER_DUP_KEY
+SELECT MAX(a) FROM t1 GROUP BY a,b;
+
+set tmp_table_size=default;
+
+DROP TABLE t1;
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 41688794721..ece37708370 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -10147,7 +10147,9 @@ bool create_myisam_from_heap(THD *thd, TABLE *table, TMP_TABLE_PARAM *param,
   /* copy all old rows */
   while (!table->file->rnd_next(new_table.record[1]))
   {
-    if ((write_err=new_table.file->write_row(new_table.record[1])))
+    write_err=new_table.file->write_row(new_table.record[1]);
+    DBUG_EXECUTE_IF("raise_error", write_err= HA_ERR_FOUND_DUPP_KEY ;);
+    if (write_err)
       goto err;
   }
   /* copy row that filled HEAP table */
@@ -10174,7 +10176,7 @@ bool create_myisam_from_heap(THD *thd, TABLE *table, TMP_TABLE_PARAM *param,
 
  err:
   DBUG_PRINT("error",("Got error: %d",write_err));
-  table->file->print_error(error,MYF(0));	// Give table is full error
+  table->file->print_error(write_err, MYF(0));	// Give table is full error
   (void) table->file->ha_rnd_end();
   (void) new_table.file->close();
  err1:
@@ -10182,6 +10184,7 @@ bool create_myisam_from_heap(THD *thd, TABLE *table, TMP_TABLE_PARAM *param,
   delete new_table.file;
  err2:
   thd->proc_info=save_proc_info;
+  table->mem_root= new_table.mem_root;
   DBUG_RETURN(1);
 }
 

From 0d84c3f710fa5b0226c4d875c523576160074f49 Mon Sep 17 00:00:00 2001
From: "joerg@trift2." <>
Date: Thu, 7 Jun 2007 12:59:31 +0200
Subject: [PATCH 26/48] netware/*.def  :  Allocate 128K stack for all
 executables (bug#23504)

---
 netware/comp_err.def           | 1 +
 netware/isamchk.def            | 2 +-
 netware/isamlog.def            | 1 +
 netware/libmysql.def           | 2 +-
 netware/my_print_defaults.def  | 2 +-
 netware/myisam_ftdump.def      | 2 +-
 netware/myisamchk.def          | 2 +-
 netware/myisamlog.def          | 2 +-
 netware/myisampack.def         | 2 +-
 netware/mysql.def              | 2 +-
 netware/mysql_install_db.def   | 2 +-
 netware/mysql_test_run.def     | 2 +-
 netware/mysql_waitpid.def      | 2 +-
 netware/mysqladmin.def         | 2 +-
 netware/mysqlbinlog.def        | 2 +-
 netware/mysqlcheck.def         | 2 +-
 netware/mysqld.def             | 2 +-
 netware/mysqld_safe.def        | 2 +-
 netware/mysqldump.def          | 2 +-
 netware/mysqlimport.def        | 2 +-
 netware/mysqlshow.def          | 1 +
 netware/mysqltest.def          | 1 +
 netware/pack_isam.def          | 1 +
 netware/perror.def             | 2 +-
 netware/replace.def            | 1 +
 netware/resolve_stack_dump.def | 2 +-
 netware/resolveip.def          | 1 +
 27 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/netware/comp_err.def b/netware/comp_err.def
index f27b40c7b78..f5b18bbdb9a 100644
--- a/netware/comp_err.def
+++ b/netware/comp_err.def
@@ -5,6 +5,7 @@ MODULE	libc.nlm
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Error File Compiler"
 VERSION 4, 0
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/isamchk.def b/netware/isamchk.def
index 31cf3fc569a..8ae2c0ca96c 100644
--- a/netware/isamchk.def
+++ b/netware/isamchk.def
@@ -6,7 +6,7 @@ SCREENNAME "MySQL ISAM Table Check Tool"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL ISAM Table Check Tool"
 VERSION 4, 0
-STACKSIZE 65536
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/isamlog.def b/netware/isamlog.def
index 52f9de0d928..777d73a7835 100644
--- a/netware/isamlog.def
+++ b/netware/isamlog.def
@@ -5,6 +5,7 @@ MODULE	libc.nlm
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL ISAM Table Log Tool"
 VERSION 4, 0
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/libmysql.def b/netware/libmysql.def
index 8a34754e092..d9d4c752612 100644
--- a/netware/libmysql.def
+++ b/netware/libmysql.def
@@ -7,6 +7,6 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Res
 DESCRIPTION "MySQL Client Library"
 VERSION 4, 0
 AUTOUNLOAD
-STACKSIZE 32768
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
diff --git a/netware/my_print_defaults.def b/netware/my_print_defaults.def
index f22fdec38af..e2a07cb86d2 100644
--- a/netware/my_print_defaults.def
+++ b/netware/my_print_defaults.def
@@ -5,7 +5,7 @@ MODULE	libc.nlm
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Print Defaults Tool"
 VERSION 4, 0
-STACKSIZE 32768
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/myisam_ftdump.def b/netware/myisam_ftdump.def
index 9639404b53b..78123537a54 100644
--- a/netware/myisam_ftdump.def
+++ b/netware/myisam_ftdump.def
@@ -6,7 +6,7 @@ SCREENNAME "MySQL MyISAM Table Dump Tool"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL MyISAM Table Dump Tool"
 VERSION 4, 0
-STACKSIZE 65536
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/myisamchk.def b/netware/myisamchk.def
index b7ec5ac9474..9805eb4ec1b 100644
--- a/netware/myisamchk.def
+++ b/netware/myisamchk.def
@@ -6,7 +6,7 @@ SCREENNAME "MySQL MyISAM Table Check Tool[scrollable]"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL MyISAM Table Check Tool"
 VERSION 4, 0
-STACKSIZE 65536
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/myisamlog.def b/netware/myisamlog.def
index 553a818a2ae..925650eac7b 100644
--- a/netware/myisamlog.def
+++ b/netware/myisamlog.def
@@ -6,7 +6,7 @@ SCREENNAME "MySQL MyISAM Table Log Tool"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL MyISAM Table Log Tool"
 VERSION 4, 0
-STACKSIZE 32768
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/myisampack.def b/netware/myisampack.def
index d1f85fe03f8..877a143fd2e 100644
--- a/netware/myisampack.def
+++ b/netware/myisampack.def
@@ -6,7 +6,7 @@ SCREENNAME "MySQL MyISAM Table Pack Tool"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL MyISAM Table Pack Tool"
 VERSION 4, 0
-STACKSIZE 32768
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/mysql.def b/netware/mysql.def
index 16acc7babe1..4e44f4882d1 100644
--- a/netware/mysql.def
+++ b/netware/mysql.def
@@ -6,7 +6,7 @@ SCREENNAME "MySQL Monitor[scrollable]"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Monitor"
 VERSION 4, 0
-STACKSIZE 32768
+STACKSIZE 131072
 MULTIPLE
 XDCDATA ../netware/mysql.xdc
 #DEBUG
diff --git a/netware/mysql_install_db.def b/netware/mysql_install_db.def
index 372bbf15570..e3dc57fe44c 100644
--- a/netware/mysql_install_db.def
+++ b/netware/mysql_install_db.def
@@ -6,7 +6,7 @@ SCREENNAME "MySQL Install"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Initial Database Installer"
 VERSION 4, 0
-STACKSIZE 32768
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/mysql_test_run.def b/netware/mysql_test_run.def
index d4d4baee168..c8afd305978 100644
--- a/netware/mysql_test_run.def
+++ b/netware/mysql_test_run.def
@@ -2,10 +2,10 @@
 # MySQL Test Run
 #------------------------------------------------------------------------------
 MODULE	libc.nlm
-STACKSIZE 65536
 SCREENNAME "MySQL Test Run"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Test Run"
 VERSION 4, 0
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
diff --git a/netware/mysql_waitpid.def b/netware/mysql_waitpid.def
index da0884ccba3..6e9cc76f139 100644
--- a/netware/mysql_waitpid.def
+++ b/netware/mysql_waitpid.def
@@ -6,7 +6,7 @@ MODULE	libc.nlm
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Tool - Wait for a Program to Terminate"
 VERSION 4, 0
-STACKSIZE 65536
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/mysqladmin.def b/netware/mysqladmin.def
index 6532cab84a0..03f15dfdd08 100644
--- a/netware/mysqladmin.def
+++ b/netware/mysqladmin.def
@@ -6,7 +6,7 @@ SCREENNAME "MySQL Admin[scrollable]"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Admin Tool"
 VERSION 4, 0
-STACKSIZE 32768
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/mysqlbinlog.def b/netware/mysqlbinlog.def
index aced63429c5..88024acc318 100644
--- a/netware/mysqlbinlog.def
+++ b/netware/mysqlbinlog.def
@@ -6,7 +6,7 @@ SCREENNAME "MySQL Binary Log Dump Tool[scrollable]"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Binary Log Dump Tool"
 VERSION 4, 0
-STACKSIZE 32768
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/mysqlcheck.def b/netware/mysqlcheck.def
index 1b90b2a1dbe..b9028c237d1 100644
--- a/netware/mysqlcheck.def
+++ b/netware/mysqlcheck.def
@@ -6,7 +6,7 @@ SCREENNAME "MySQL Check Tool[scrollable]"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Check Tool"
 VERSION 4, 0
-STACKSIZE 32768
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/mysqld.def b/netware/mysqld.def
index 42c2d176a1b..bb7b8129983 100644
--- a/netware/mysqld.def
+++ b/netware/mysqld.def
@@ -6,7 +6,7 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Res
 DESCRIPTION "MySQL Database Server"
 VERSION 4, 0
 MULTIPLE
-STACKSIZE 65536
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/mysqld_safe.def b/netware/mysqld_safe.def
index ff3f1924906..5c436cc97ca 100644
--- a/netware/mysqld_safe.def
+++ b/netware/mysqld_safe.def
@@ -6,7 +6,7 @@ SCREENNAME "MySQL Database Server"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Database Server Monitor"
 VERSION 4, 0
-STACKSIZE 32768
+STACKSIZE 131072
 MULTIPLE
 XDCDATA ../netware/mysql.xdc
 #DEBUG
diff --git a/netware/mysqldump.def b/netware/mysqldump.def
index 5d7999c789f..2e745492cf3 100644
--- a/netware/mysqldump.def
+++ b/netware/mysqldump.def
@@ -6,7 +6,7 @@ SCREENNAME "MySQL Dump Tool[scrollable]"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Dump Tool"
 VERSION 4, 0
-STACKSIZE 32768
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/mysqlimport.def b/netware/mysqlimport.def
index f98d8021a73..5db6b940ce7 100644
--- a/netware/mysqlimport.def
+++ b/netware/mysqlimport.def
@@ -6,7 +6,7 @@ SCREENNAME "MySQL Import[scrollable]"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Import Tool"
 VERSION 4, 0
-STACKSIZE 32768
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/mysqlshow.def b/netware/mysqlshow.def
index b7b84a94067..386cb98c091 100644
--- a/netware/mysqlshow.def
+++ b/netware/mysqlshow.def
@@ -6,6 +6,7 @@ SCREENNAME "MySQL Show[scrollable]"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Show Tool"
 VERSION 4, 0
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/mysqltest.def b/netware/mysqltest.def
index e134acede07..f0ee5f7e6a4 100644
--- a/netware/mysqltest.def
+++ b/netware/mysqltest.def
@@ -5,6 +5,7 @@ MODULE	libc.nlm
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Test Case Tool"
 VERSION 4, 0
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/pack_isam.def b/netware/pack_isam.def
index fff74806f39..ab9da594cb7 100644
--- a/netware/pack_isam.def
+++ b/netware/pack_isam.def
@@ -6,6 +6,7 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Res
 DESCRIPTION "MySQL ISAM Table Pack Tool"
 SCREENNAME "MySQL ISAM Table Pack Tool"
 VERSION 4, 0
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/perror.def b/netware/perror.def
index d67bd6191b4..fc95de3476a 100644
--- a/netware/perror.def
+++ b/netware/perror.def
@@ -5,7 +5,7 @@ MODULE	libc.nlm
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Error Code Description Tool"
 VERSION 4, 0
-STACKSIZE 32768
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/replace.def b/netware/replace.def
index 19348ee4245..7feccdbff41 100644
--- a/netware/replace.def
+++ b/netware/replace.def
@@ -5,6 +5,7 @@ MODULE	libc.nlm
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Text Replacement Tool"
 VERSION 4, 0
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/resolve_stack_dump.def b/netware/resolve_stack_dump.def
index 01042699d61..20098c1b4e0 100644
--- a/netware/resolve_stack_dump.def
+++ b/netware/resolve_stack_dump.def
@@ -6,7 +6,7 @@ MODULE	libc.nlm
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Stack Dump Resolve Tool"
 VERSION 4, 0
-STACKSIZE 65536
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/resolveip.def b/netware/resolveip.def
index 244f52bb969..1962d61be53 100644
--- a/netware/resolveip.def
+++ b/netware/resolveip.def
@@ -5,6 +5,7 @@ MODULE	libc.nlm
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL IP/Hostname Resolve Tool"
 VERSION 4, 0
+STACKSIZE 131072
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 

From eb9e174bc23fbc0eedb7db666b356233d0af1e69 Mon Sep 17 00:00:00 2001
From: "evgen@moonbone.local" <>
Date: Fri, 8 Jun 2007 00:33:03 +0400
Subject: [PATCH 27/48] Bug#28763: Selecting geometry fields in UNION caused
 server crash.

This bug was introduced by the fix for the bug#27300. In this fix a section
of code was added to the Item::tmp_table_field_from_field_type method.
This section intended to create Field_geom fields for the Item_geometry_func
class and its descendants. In order to get the geometry type of the current
item it casted "this" to the Item_geometry_func* type. But the
Item::tmp_table_field_from_field_type method is also used for creation of
fields for UNION and in this case this method is called for an object of the
Item_type_holder class and the cast to the Item_geometry_func* type causes
a server crash.

Now the Item::tmp_table_field_from_field_type method correctly works when it's
called for both the Item_type_holder and the Item_geometry_func classes.
The new geometry_type variable is added to the Item_type_holder class.
The new method called get_geometry_type is added to the Item_field
and the Field classes. It returns geometry type from the field for the
Item_field and the Field_geom classes and fails an assert for other Field
descendants.
---
 mysql-test/r/gis.result | 21 +++++++++++++++++++++
 mysql-test/t/gis.test   | 13 +++++++++++++
 sql/field.h             |  7 ++++++-
 sql/item.cc             |  8 +++++++-
 sql/item.h              |  7 +++++++
 5 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result
index 73e5b054f80..d1f292cda0c 100644
--- a/mysql-test/r/gis.result
+++ b/mysql-test/r/gis.result
@@ -864,4 +864,25 @@ SELECT Overlaps(@horiz1, @point2) FROM DUAL;
 Overlaps(@horiz1, @point2)
 0
 DROP TABLE t1;
+create table t1(f1 geometry, f2 point, f3 linestring);
+select f1 from t1 union select f1 from t1;
+f1
+insert into t1 (f2,f3) values (GeomFromText('POINT(1 1)'),
+GeomFromText('LINESTRING(0 0,1 1,2 2)'));
+select AsText(f2),AsText(f3) from t1;
+AsText(f2)	AsText(f3)
+POINT(1 1)	LINESTRING(0 0,1 1,2 2)
+select AsText(a) from (select f2 as a from t1 union select f3 from t1) t;
+AsText(a)
+POINT(1 1)
+LINESTRING(0 0,1 1,2 2)
+create table t2 as select f2 as a from t1 union select f3 from t1;
+desc t2;
+Field	Type	Null	Key	Default	Extra
+a	point	YES		NULL	
+select AsText(a) from t2;
+AsText(a)
+POINT(1 1)
+LINESTRING(0 0,1 1,2 2)
+drop table t1, t2;
 End of 5.0 tests
diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test
index ccc38db8dea..95ccc6272e2 100644
--- a/mysql-test/t/gis.test
+++ b/mysql-test/t/gis.test
@@ -557,4 +557,17 @@ SELECT Overlaps(@horiz1, @point2) FROM DUAL;
 
 DROP TABLE t1;
 
+#
+# Bug#28763: Selecting geometry fields in UNION caused server crash.
+#
+create table t1(f1 geometry, f2 point, f3 linestring);
+select f1 from t1 union select f1 from t1;
+insert into t1 (f2,f3) values (GeomFromText('POINT(1 1)'),
+  GeomFromText('LINESTRING(0 0,1 1,2 2)'));
+select AsText(f2),AsText(f3) from t1;
+select AsText(a) from (select f2 as a from t1 union select f3 from t1) t;
+create table t2 as select f2 as a from t1 union select f3 from t1;
+desc t2;
+select AsText(a) from t2; 
+drop table t1, t2;
 --echo End of 5.0 tests
diff --git a/sql/field.h b/sql/field.h
index 37ce6b88453..39378addd4c 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -360,7 +360,11 @@ public:
   {
     return field_length / charset()->mbmaxlen;
   }
-
+  virtual geometry_type get_geometry_type()
+  {
+    /* shouldn't get here. */
+    DBUG_ASSERT(0);
+  }
   friend bool reopen_table(THD *,struct st_table *,bool);
   friend int cre_myisam(my_string name, register TABLE *form, uint options,
 			ulonglong auto_increment_value);
@@ -1325,6 +1329,7 @@ public:
   uint get_key_image(char *buff,uint length,imagetype type);
   uint size_of() const { return sizeof(*this); }
   int  reset(void) { return !maybe_null() || Field_blob::reset(); }
+  geometry_type get_geometry_type() { return geom_type; };
 };
 #endif /*HAVE_SPATIAL*/
 
diff --git a/sql/item.cc b/sql/item.cc
index 92ea35072f9..59708afdd19 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -4317,7 +4317,9 @@ Field *Item::tmp_table_field_from_field_type(TABLE *table)
   case MYSQL_TYPE_GEOMETRY:
     return new Field_geom(max_length, maybe_null, name, table,
                           (Field::geometry_type)
-                          ((Item_geometry_func *)this)->get_geometry_type());
+                          ((type() == Item::TYPE_HOLDER) ?
+                           ((Item_type_holder *)this)->get_geometry_type() :
+                           ((Item_geometry_func *)this)->get_geometry_type()));
   }
 }
 
@@ -6422,6 +6424,10 @@ Item_type_holder::Item_type_holder(THD *thd, Item *item)
   if (Field::result_merge_type(fld_type) == INT_RESULT)
     decimals= 0;
   prev_decimal_int_part= item->decimal_int_part();
+  if (item->field_type() == MYSQL_TYPE_GEOMETRY)
+    geometry_type= (item->type() == Item::FIELD_ITEM) ?
+      ((Item_field *)item)->get_geometry_type() :
+      (Field::geometry_type)((Item_geometry_func *)item)->get_geometry_type();
 }
 
 
diff --git a/sql/item.h b/sql/item.h
index 11dce3a7758..96936f0ff88 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -1304,6 +1304,11 @@ public:
   int fix_outer_field(THD *thd, Field **field, Item **reference);
   virtual Item *update_value_transformer(byte *select_arg);
   void print(String *str);
+  Field::geometry_type get_geometry_type()
+  {
+    DBUG_ASSERT(field_type() == MYSQL_TYPE_GEOMETRY);
+    return field->get_geometry_type();
+  }
   friend class Item_default_value;
   friend class Item_insert_value;
   friend class st_select_lex_unit;
@@ -2563,6 +2568,7 @@ class Item_type_holder: public Item
 protected:
   TYPELIB *enum_set_typelib;
   enum_field_types fld_type;
+  Field::geometry_type geometry_type;
 
   void get_full_info(Item *item);
 
@@ -2582,6 +2588,7 @@ public:
   Field *make_field_by_type(TABLE *table);
   static uint32 display_length(Item *item);
   static enum_field_types get_real_type(Item *);
+  Field::geometry_type get_geometry_type() { return geometry_type; };
 };
 
 

From ab64b2f8f37d7e294c867cb4c346f36e70a0fb88 Mon Sep 17 00:00:00 2001
From: "joerg@trift2." <>
Date: Thu, 7 Jun 2007 23:05:18 +0200
Subject: [PATCH 28/48] Do not use the "thd" pointer to identify a thread in
 the embedded lib, but rather use the "thread_id" counter.

Fixes bug#27078:
Compile error: lib_sql.cc cast from 'THD*' to 'pthread_t' loses precision
---
 libmysqld/lib_sql.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 9ee8d48eec4..92b7b10f0c0 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -540,7 +540,7 @@ void *create_embedded_thd(int client_flag)
   thd->set_time();
   thd->init_for_queries();
   thd->client_capabilities= client_flag;
-  thd->real_id= (pthread_t) thd;
+  thd->real_id= thd->thread_id;
 
   thd->db= NULL;
   thd->db_length= 0;

From e3a13c26bda48e4eafe03e964d9417fdd48535a5 Mon Sep 17 00:00:00 2001
From: "igor@olga.mysql.com" <>
Date: Thu, 7 Jun 2007 15:04:39 -0700
Subject: [PATCH 29/48] Correction to remove compilee warnings and compiler
 errors on Windows.

---
 sql/field.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sql/field.h b/sql/field.h
index 39378addd4c..ccdda7d04ce 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -364,6 +364,7 @@ public:
   {
     /* shouldn't get here. */
     DBUG_ASSERT(0);
+    return GEOM_GEOMETRY;
   }
   friend bool reopen_table(THD *,struct st_table *,bool);
   friend int cre_myisam(my_string name, register TABLE *form, uint options,

From 2d29a57f2b3e2c4dd2badbdb7e990cb70c5751dd Mon Sep 17 00:00:00 2001
From: "igor@olga.mysql.com" <>
Date: Thu, 7 Jun 2007 22:35:31 -0700
Subject: [PATCH 30/48] Fixed bug #28811: crash for a query containing a
 subquery with ORDER BY and LIMIT 1. The bug was introduced by the patch for
 bug 21727. The patch erroneously skipped initialization of the array of
 headers for sorted records for non-first evaluations of the subquery.

To fix the problem a new parameter has been added to the
function make_char_array that performs the initialization.
Now this function is called for any invocation of the
filesort procedure. Yet it allocates the buffer for sorted
records only if this parameter is NULL.
---
 mysql-test/r/subselect.result | 26 ++++++++++++++++++++++++++
 mysql-test/t/subselect.test   | 32 ++++++++++++++++++++++++++++++++
 sql/filesort.cc               | 19 +++++++++++--------
 3 files changed, 69 insertions(+), 8 deletions(-)

diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index 38f6e2d10e3..efd6a5ab572 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -4080,4 +4080,30 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 Warnings:
 Note	1003	select `res`.`count(*)` AS `count(*)` from (select count(0) AS `count(*)` from `test`.`t1` group by `test`.`t1`.`a`) `res`
 DROP TABLE t1;
+CREATE TABLE t1 (
+a varchar(255) default NULL,
+b timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+INDEX idx(a,b)
+);
+CREATE TABLE t2 (
+a varchar(255) default NULL
+);
+INSERT INTO t1 VALUES ('abcdefghijk','2007-05-07 06:00:24');
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO `t1` VALUES ('asdf','2007-02-08 01:11:26');
+INSERT INTO `t2` VALUES ('abcdefghijk');
+INSERT INTO `t2` VALUES ('asdf');
+SET session sort_buffer_size=8192;
+SELECT (SELECT 1 FROM  t1 WHERE t1.a=t2.a ORDER BY t1.b LIMIT 1) AS d1 FROM t2;
+d1
+1
+1
+DROP TABLE t1,t2;
 End of 5.0 tests.
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index 33e58fe0c32..12688fa4cf4 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -2913,4 +2913,36 @@ SELECT * FROM (SELECT count(*) FROM t1 GROUP BY a) as res;
 
 DROP TABLE t1;
 
+#
+# Bug #28811: crash for query containing subquery with ORDER BY and LIMIT 1 
+#
+ 
+CREATE TABLE t1 (
+  a varchar(255) default NULL,
+  b timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  INDEX idx(a,b)
+);
+CREATE TABLE t2 (
+  a varchar(255) default NULL
+);
+
+INSERT INTO t1 VALUES ('abcdefghijk','2007-05-07 06:00:24');
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO `t1` VALUES ('asdf','2007-02-08 01:11:26');
+INSERT INTO `t2` VALUES ('abcdefghijk');
+INSERT INTO `t2` VALUES ('asdf');
+
+SET session sort_buffer_size=8192;
+
+SELECT (SELECT 1 FROM  t1 WHERE t1.a=t2.a ORDER BY t1.b LIMIT 1) AS d1 FROM t2;
+
+DROP TABLE t1,t2;
+
 --echo End of 5.0 tests.
diff --git a/sql/filesort.cc b/sql/filesort.cc
index a4bf04a6786..d518ddbb117 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -35,7 +35,8 @@ if (my_b_write((file),(byte*) (from),param->ref_length)) \
 
 	/* functions defined in this file */
 
-static char **make_char_array(register uint fields, uint length, myf my_flag);
+static char **make_char_array(char **old_pos, register uint fields,
+                              uint length, myf my_flag);
 static BUFFPEK *read_buffpek_from_file(IO_CACHE *buffer_file, uint count);
 static ha_rows find_all_keys(SORTPARAM *param,SQL_SELECT *select,
 			     uchar * *sort_keys, IO_CACHE *buffer_file,
@@ -202,9 +203,9 @@ ha_rows filesort(THD *thd, TABLE *table, SORT_FIELD *sortorder, uint s_length,
     ulong old_memavl;
     ulong keys= memavl/(param.rec_length+sizeof(char*));
     param.keys=(uint) min(records+1, keys);
-    if (table_sort.sort_keys ||
-        (table_sort.sort_keys= (uchar **) make_char_array(param.keys, param.rec_length,
-                                               MYF(0))))
+    if ((table_sort.sort_keys=
+	 (uchar **) make_char_array((char **) table_sort.sort_keys,
+                                    param.keys, param.rec_length, MYF(0))))
       break;
     old_memavl=memavl;
     if ((memavl=memavl/4*3) < min_sort_memory && old_memavl > min_sort_memory)
@@ -346,14 +347,16 @@ void filesort_free_buffers(TABLE *table, bool full)
 
 	/* Make a array of string pointers */
 
-static char **make_char_array(register uint fields, uint length, myf my_flag)
+static char **make_char_array(char **old_pos, register uint fields,
+                              uint length, myf my_flag)
 {
   register char **pos;
-  char **old_pos,*char_pos;
+  char *char_pos;
   DBUG_ENTER("make_char_array");
 
-  if ((old_pos= (char**) my_malloc((uint) fields*(length+sizeof(char*)),
-				    my_flag)))
+  if (old_pos ||
+      (old_pos= (char**) my_malloc((uint) fields*(length+sizeof(char*)),
+				   my_flag)))
   {
     pos=old_pos; char_pos=((char*) (pos+fields)) -length;
     while (fields--) *(pos++) = (char_pos+= length);

From a809813b0dd1856b275d61a1d4bb7a829c50e681 Mon Sep 17 00:00:00 2001
From: "gluh@mysql.com/eagle.(none)" <>
Date: Fri, 8 Jun 2007 14:42:08 +0500
Subject: [PATCH 31/48] Bug#18660 Can't grant any privileges on single table in
 database with underscore char In case of database level grant the database
 name may be a pattern, in case of table|column level grant the database name
 can not be a pattern. We use 'dont_check_global_grants' as a flag to
 determine if it's database level grant command (see SQLCOM_GRANT case,
 mysql_execute_command() function) and set db_is_pattern according to
 'dont_check_global_grants' value.

---
 mysql-test/r/grant2.result | 18 ++++++++++++++++++
 mysql-test/t/grant2.test   | 30 ++++++++++++++++++++++++++++++
 sql/sql_parse.cc           | 12 +++++++++++-
 3 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/grant2.result b/mysql-test/r/grant2.result
index 93098e68070..6de9a83aeed 100644
--- a/mysql-test/r/grant2.result
+++ b/mysql-test/r/grant2.result
@@ -403,4 +403,22 @@ use test;
 drop database mysqltest_1;
 drop database mysqltest_2;
 drop user mysqltest_u1@localhost;
+grant all on `mysqltest\_%`.* to mysqltest_1@localhost with grant option;
+grant usage on *.* to mysqltest_2@localhost;
+create database mysqltest_1;
+use mysqltest_1;
+create table t1 (f1 int);
+grant create on `mysqltest\_1`.* to mysqltest_2@localhost;
+grant select on mysqltest_1.t1 to mysqltest_2@localhost;
+create database mysqltest_3;
+ERROR 42000: Access denied for user 'mysqltest_2'@'localhost' to database 'mysqltest_3'
+use mysqltest_1;
+create table t2(f1 int);
+select * from t1;
+f1
+drop database mysqltest_1;
+revoke all privileges, grant option from mysqltest_1@localhost;
+revoke all privileges, grant option from mysqltest_2@localhost;
+drop user mysqltest_1@localhost;
+drop user mysqltest_2@localhost;
 End of 5.0 tests
diff --git a/mysql-test/t/grant2.test b/mysql-test/t/grant2.test
index 4a3324b1833..a3a8e2d5d53 100644
--- a/mysql-test/t/grant2.test
+++ b/mysql-test/t/grant2.test
@@ -555,5 +555,35 @@ drop database mysqltest_1;
 drop database mysqltest_2;
 drop user mysqltest_u1@localhost;
 
+#
+# Bug#18660 Can't grant any privileges on single table in database
+#  with underscore char
+#
+grant all on `mysqltest\_%`.* to mysqltest_1@localhost with grant option;
+grant usage on *.* to mysqltest_2@localhost;
+connect (con18600_1,localhost,mysqltest_1,,);
+
+create database mysqltest_1;
+use mysqltest_1;
+create table t1 (f1 int);
+
+grant create on `mysqltest\_1`.* to mysqltest_2@localhost;
+grant select on mysqltest_1.t1 to mysqltest_2@localhost;
+connect (con3,localhost,mysqltest_2,,);
+connection con3;
+--error 1044
+create database mysqltest_3;
+use mysqltest_1;
+create table t2(f1 int);
+select * from t1;
+connection default;
+drop database mysqltest_1;
+
+revoke all privileges, grant option from mysqltest_1@localhost;
+revoke all privileges, grant option from mysqltest_2@localhost;
+drop user mysqltest_1@localhost;
+drop user mysqltest_2@localhost;
+
+
 --echo End of 5.0 tests
 
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 6277a6c0c10..77525b49fdf 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -5252,7 +5252,17 @@ check_access(THD *thd, ulong want_access, const char *db, ulong *save_priv,
   Security_context *sctx= thd->security_ctx;
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   ulong db_access;
-  bool  db_is_pattern= test(want_access & GRANT_ACL);
+  /*
+    GRANT command:
+    In case of database level grant the database name may be a pattern,
+    in case of table|column level grant the database name can not be a pattern.
+    We use 'dont_check_global_grants' as a flag to determine
+    if it's database level grant command 
+    (see SQLCOM_GRANT case, mysql_execute_command() function) and
+    set db_is_pattern according to 'dont_check_global_grants' value.
+  */
+  bool  db_is_pattern= (test(want_access & GRANT_ACL) &&
+                        dont_check_global_grants);
 #endif
   ulong dummy;
   DBUG_ENTER("check_access");

From d12fbdd8d0c3037168c1d2850f37db49ed77dc4f Mon Sep 17 00:00:00 2001
From: "gkodinov/kgeorge@magare.gmz" <>
Date: Fri, 8 Jun 2007 13:42:10 +0300
Subject: [PATCH 32/48] Bug #28754: RPM builds differ from tar.gz in "ALTER ...
 RENAME" on views  When constructing the path to the original .frm file ALTER
 .. RENAME  was unnecessary (and incorrectly) lowercasing the whole path when
 not  on a case-insensitive filesystem.  This path should not be modified
 because of lower_case_table_names  as it is already in the correct case
 according to that setting.  Fixed by removing the lowercasing.  Unfortunately
 testing this would require running the tests on a case  sensitive filesystem
 in a directory that has uppercase letters.  This cannot be guaranteed in all
 setups so no test case added.

---
 sql/sql_table.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 29ecf43a531..a44b087202b 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -3101,8 +3101,6 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
 						   alter_info->tablespace_op));
   sprintf(new_name_buff,"%s/%s/%s%s",mysql_data_home, db, table_name, reg_ext);
   unpack_filename(new_name_buff, new_name_buff);
-  if (lower_case_table_names != 2)
-    my_casedn_str(files_charset_info, new_name_buff);
   frm_type= mysql_frm_type(thd, new_name_buff, &table_type);
   /* Rename a view */
   if (frm_type == FRMTYPE_VIEW && !(alter_info->flags & ~ALTER_RENAME))

From 2d718ff1c2cdcb3a934ceafbf7335d1804b7d3d5 Mon Sep 17 00:00:00 2001
From: "joerg@trift2." <>
Date: Fri, 8 Jun 2007 17:02:48 +0200
Subject: [PATCH 33/48] Add a cast, needed by some platforms. Still part of the
 fix for bug#27078.

---
 libmysqld/lib_sql.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 92b7b10f0c0..7f2059db7cd 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -540,7 +540,7 @@ void *create_embedded_thd(int client_flag)
   thd->set_time();
   thd->init_for_queries();
   thd->client_capabilities= client_flag;
-  thd->real_id= thd->thread_id;
+  thd->real_id= (pthread_t)thd->thread_id;
 
   thd->db= NULL;
   thd->db_length= 0;

From 96d07631b2d7e14eccdbcd643a0fcd430a22308e Mon Sep 17 00:00:00 2001
From: "holyfoot/hf@mysql.com/hfmain.(none)" <>
Date: Sat, 9 Jun 2007 00:39:23 +0500
Subject: [PATCH 34/48] Bug #28333 Test "flush" tries to create a new thread -
 on only one platform

on PPC/Debian Linux default stack size for a thread is too big.
As we use default thread settings in mysqltest, the
thread creation fails if we create lots of threads (as it
happens in flush.test). So now stack size is explicitly specified
for the mysqltest
---
 client/mysqltest.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/client/mysqltest.c b/client/mysqltest.c
index 5640d0c24ba..77cdb93dfe5 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -496,6 +496,10 @@ void handle_error(struct st_command*,
 void handle_no_error(struct st_command*);
 
 #ifdef EMBEDDED_LIBRARY
+
+/* attributes of the query thread */
+pthread_attr_t cn_thd_attrib;
+
 /*
   send_one_query executes query in separate thread what is
   necessary in embedded library to run 'send' in proper way.
@@ -534,7 +538,7 @@ static int do_send_query(struct st_connection *cn, const char *q, int q_len,
   cn->cur_query= q;
   cn->cur_query_len= q_len;
   cn->query_done= 0;
-  if (pthread_create(&tid, NULL, send_one_query, (void*)cn))
+  if (pthread_create(&tid, &cn_thd_attrib, send_one_query, (void*)cn))
     die("Cannot start new thread for query");
 
   return 0;
@@ -5999,6 +6003,12 @@ int main(int argc, char **argv)
   next_con= connections + 1;
   cur_con= connections;
 
+#ifdef EMBEDDED_LIBRARY
+  /* set appropriate stack for the 'query' threads */
+  (void) pthread_attr_init(&cn_thd_attrib);
+  pthread_attr_setstacksize(&cn_thd_attrib, DEFAULT_THREAD_STACK);
+#endif /*EMBEDDED_LIBRARY*/
+
   /* Init file stack */
   memset(file_stack, 0, sizeof(file_stack));
   file_stack_end=

From 47ecabe91507e72d2a184d1649862e50526fa2cb Mon Sep 17 00:00:00 2001
From: "gluh@mysql.com/eagle.(none)" <>
Date: Sat, 9 Jun 2007 16:52:37 +0500
Subject: [PATCH 35/48] Bug#28266 IS_UPDATABLE field on VIEWS table in I_S
 database is wrong IS_UPDATABLE flag is set to 'yes' when the view has at
 least one updatable column and the algorithm is not 'temporary'.

---
 mysql-test/r/information_schema.result | 11 ++++++++++
 mysql-test/r/view.result               | 13 +++++++++++
 mysql-test/t/information_schema.test   | 15 +++++++++++++
 mysql-test/t/view.test                 |  4 ++++
 sql/sql_show.cc                        | 30 +++++++++++++++++++++++++-
 5 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
index db703df1f52..4947fd7aecc 100644
--- a/mysql-test/r/information_schema.result
+++ b/mysql-test/r/information_schema.result
@@ -1315,3 +1315,14 @@ TABLE_PRIVILEGES	information_schema.TABLE_PRIVILEGES	1
 TRIGGERS	information_schema.TRIGGERS	1
 USER_PRIVILEGES	information_schema.USER_PRIVILEGES	1
 VIEWS	information_schema.VIEWS	1
+create table t1(f1 int);
+create view v1 as select f1+1 as a from t1;
+create table t2 (f1 int, f2 int);
+create view v2 as select f1+1 as a, f2 as b from t2;
+select table_name, is_updatable from information_schema.views;
+table_name	is_updatable
+v1	NO
+v2	YES
+delete from v1;
+drop view v1,v2;
+drop table t1,t2;
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index 43e147724c8..3757c5fd451 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -23,6 +23,9 @@ c
 5
 6
 11
+select is_updatable from information_schema.views where table_name='v1';
+is_updatable
+NO
 create temporary table t1 (a int, b int);
 select * from t1;
 a	b
@@ -322,6 +325,12 @@ create table t1 (a int, b int, primary key(a));
 insert into t1 values (10,2), (20,3), (30,4), (40,5), (50,10);
 create view v1 (a,c) as select a, b+1 from t1;
 create algorithm=temptable view v2 (a,c) as select a, b+1 from t1;
+select is_updatable from information_schema.views where table_name='v2';
+is_updatable
+NO
+select is_updatable from information_schema.views where table_name='v1';
+is_updatable
+YES
 update v1 set c=a+c;
 ERROR HY000: Column 'c' is not updatable
 update v2 set a=a+c;
@@ -604,6 +613,10 @@ insert into t1 values(5,'Hello, world of views');
 create view v1 as select * from t1;
 create view v2 as select * from v1;
 update v2 set col2='Hello, view world';
+select is_updatable from information_schema.views;
+is_updatable
+YES
+YES
 select * from t1;
 col1	col2
 5	Hello, view world
diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test
index f8922317eb3..1d368ac6075 100644
--- a/mysql-test/t/information_schema.test
+++ b/mysql-test/t/information_schema.test
@@ -1023,4 +1023,19 @@ where t.table_schema = 'information_schema' and
           group by c2.column_type order by num limit 1)
 group by t.table_name order by num1, t.table_name;
 
+#
+# Bug#28266 IS_UPDATABLE field on VIEWS table in I_S database is wrong
+#
+create table t1(f1 int);
+create view v1 as select f1+1 as a from t1;
+create table t2 (f1 int, f2 int);                                                         
+create view v2 as select f1+1 as a, f2 as b from t2;                                      
+select table_name, is_updatable from information_schema.views;
+#
+# Note: we can perform 'delete' for non updatable view.
+#
+delete from v1;
+drop view v1,v2;
+drop table t1,t2;
+
 # End of 5.0 tests.
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
index f574451af08..3c370da4139 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@@ -32,6 +32,7 @@ create view v1 (c,d) as select a,b from t1
 # simple view
 create view v1 (c) as select b+1 from t1;
 select c from v1;
+select is_updatable from information_schema.views where table_name='v1';
 
 # temporary table should not hide table of view
 create temporary table t1 (a int, b int);
@@ -228,6 +229,8 @@ create table t1 (a int, b int, primary key(a));
 insert into t1 values (10,2), (20,3), (30,4), (40,5), (50,10);
 create view v1 (a,c) as select a, b+1 from t1;
 create algorithm=temptable view v2 (a,c) as select a, b+1 from t1;
+select is_updatable from information_schema.views where table_name='v2';
+select is_updatable from information_schema.views where table_name='v1';
 # try to update expression
 -- error 1348
 update v1 set c=a+c;
@@ -497,6 +500,7 @@ insert into t1 values(5,'Hello, world of views');
 create view v1 as select * from t1;
 create view v2 as select * from v1;
 update v2 set col2='Hello, view world';
+select is_updatable from information_schema.views;
 select * from t1;
 drop view v2, v1;
 drop table t1;
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 16ed20cd479..a0db458be78 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -3158,6 +3158,7 @@ static int get_schema_views_record(THD *thd, struct st_table_list *tables,
   DBUG_ENTER("get_schema_views_record");
   char definer[USER_HOST_BUFF_SIZE];
   uint definer_len;
+  bool updatable_view;
 
   if (tables->view)
   {
@@ -3195,7 +3196,34 @@ static int get_schema_views_record(THD *thd, struct st_table_list *tables,
     else
       table->field[4]->store(STRING_WITH_LEN("NONE"), cs);
 
-    if (tables->updatable_view)
+    updatable_view= 0;
+    if (tables->algorithm != VIEW_ALGORITHM_TMPTABLE)
+    {
+      /*
+        We should use tables->view->select_lex.item_list here and
+        can not use Field_iterator_view because the view always uses
+        temporary algorithm during opening for I_S and
+        TABLE_LIST fields 'field_translation' & 'field_translation_end'
+        are uninitialized is this case.
+      */
+      List<Item> *fields= &tables->view->select_lex.item_list;
+      List_iterator<Item> it(*fields);
+      Item *item;
+      Item_field *field;
+      /*
+        chech that at least one coulmn in view is updatable
+      */
+      while ((item= it++))
+      {
+        if ((field= item->filed_for_view_update()) && field->field &&
+            !field->field->table->pos_in_table_list->schema_table)
+        {
+          updatable_view= 1;
+          break;
+        }
+      }
+    }
+    if (updatable_view)
       table->field[5]->store(STRING_WITH_LEN("YES"), cs);
     else
       table->field[5]->store(STRING_WITH_LEN("NO"), cs);

From 068f1f7dbf6178fae5089ae8add2facbe415c73b Mon Sep 17 00:00:00 2001
From: "gluh@mysql.com/eagle.(none)" <>
Date: Sat, 9 Jun 2007 17:46:09 +0500
Subject: [PATCH 36/48] Bug#28149 overflow in some "SHOW STATUS"-variables
 changed bytes_received, bytes_sent status variables to longlong

---
 sql/mysqld.cc   | 4 ++--
 sql/sql_class.h | 4 ++--
 sql/sql_show.cc | 2 ++
 sql/structs.h   | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 5dfb191c142..ca6bcff3b45 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -6190,8 +6190,8 @@ struct show_var_st status_vars[]= {
   {"Aborted_connects",         (char*) &aborted_connects,       SHOW_LONG},
   {"Binlog_cache_disk_use",    (char*) &binlog_cache_disk_use,  SHOW_LONG},
   {"Binlog_cache_use",         (char*) &binlog_cache_use,       SHOW_LONG},
-  {"Bytes_received",           (char*) offsetof(STATUS_VAR, bytes_received), SHOW_LONG_STATUS},
-  {"Bytes_sent",               (char*) offsetof(STATUS_VAR, bytes_sent), SHOW_LONG_STATUS},
+  {"Bytes_received",           (char*) offsetof(STATUS_VAR, bytes_received), SHOW_LONGLONG_STATUS},
+  {"Bytes_sent",               (char*) offsetof(STATUS_VAR, bytes_sent), SHOW_LONGLONG_STATUS},
   {"Com_admin_commands",       (char*) offsetof(STATUS_VAR, com_other), SHOW_LONG_STATUS},
   {"Com_alter_db",	       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_ALTER_DB]), SHOW_LONG_STATUS},
   {"Com_alter_table",	       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_ALTER_TABLE]), SHOW_LONG_STATUS},
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 2ff5448f3e4..50c45d461e0 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -606,8 +606,8 @@ struct system_variables
 
 typedef struct system_status_var
 {
-  ulong bytes_received;
-  ulong bytes_sent;
+  ulonglong bytes_received;
+  ulonglong bytes_sent;
   ulong com_other;
   ulong com_stat[(uint) SQLCOM_END];
   ulong created_tmp_disk_tables;
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index a0db458be78..902b298e423 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1463,6 +1463,8 @@ static bool show_status_array(THD *thd, const char *wild,
         case SHOW_LONG_CONST:
           end= int10_to_str(*(long*) value, buff, 10);
           break;
+        case SHOW_LONGLONG_STATUS:
+          value= ((char *) status_var + (ulonglong) value);
         case SHOW_LONGLONG:
           end= longlong10_to_str(*(longlong*) value, buff, 10);
           break;
diff --git a/sql/structs.h b/sql/structs.h
index de4cc25db9f..28bdd8c1519 100644
--- a/sql/structs.h
+++ b/sql/structs.h
@@ -190,7 +190,8 @@ enum SHOW_TYPE
   SHOW_NET_COMPRESSION,
   SHOW_RPL_STATUS, SHOW_SLAVE_RUNNING, SHOW_SLAVE_RETRIED_TRANS,
   SHOW_KEY_CACHE_LONG, SHOW_KEY_CACHE_CONST_LONG, SHOW_KEY_CACHE_LONGLONG,
-  SHOW_LONG_STATUS, SHOW_LONG_CONST_STATUS, SHOW_SLAVE_SKIP_ERRORS
+  SHOW_LONG_STATUS, SHOW_LONG_CONST_STATUS, SHOW_SLAVE_SKIP_ERRORS,
+  SHOW_LONGLONG_STATUS
 };
 
 enum SHOW_COMP_OPTION { SHOW_OPTION_YES, SHOW_OPTION_NO, SHOW_OPTION_DISABLED};

From c25c178112daba614bac8ca3f09abc95418b7999 Mon Sep 17 00:00:00 2001
From: "gluh@mysql.com/eagle.(none)" <>
Date: Sat, 9 Jun 2007 18:18:34 +0500
Subject: [PATCH 37/48] compiler warning fix

---
 sql/item_strfunc.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index f9a0f715985..33e9b8de823 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -3334,7 +3334,7 @@ String *Item_func_uuid::val_str(String *str)
       *--s=_dig_vec_lower[mac[i] >> 4];
     }
     randominit(&uuid_rand, tmp + (ulong) server_start_time,
-	       tmp + thd->status_var.bytes_sent);
+	       tmp + (ulong) thd->status_var.bytes_sent);
     set_clock_seq_str();
   }
 

From 4cdbe25a6b3f3f47b245a15ed7ce4d584c8ef9b1 Mon Sep 17 00:00:00 2001
From: "evgen@moonbone.local" <>
Date: Tue, 12 Jun 2007 01:41:23 +0400
Subject: [PATCH 38/48] Bug#28904: INSERT .. ON DUPLICATE was silently updating
 rows when it shouldn't.

When the INSERT .. ON DUPLICATE KEY UPDATE has to update a matched row but
the new data is the same as in the record then it returns as if
no rows were inserted or updated. Nevertheless the row is silently
updated. This leads to a situation when zero updated rows are reported
in the case when data has actually been changed.

Now the write_record function updates a row only if new data differs from
that in the record.
---
 mysql-test/r/insert_update.result | 14 ++++++++++++++
 mysql-test/t/insert_update.test   | 16 ++++++++++++++++
 sql/sql_insert.cc                 | 28 ++++++++++++++--------------
 3 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/mysql-test/r/insert_update.result b/mysql-test/r/insert_update.result
index b3bca7517f3..20cde86101e 100644
--- a/mysql-test/r/insert_update.result
+++ b/mysql-test/r/insert_update.result
@@ -393,3 +393,17 @@ id	c1	cnt
 1	0	3
 2	2	1
 DROP TABLE t1;
+create table t1(f1 int primary key,
+f2 timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP);
+insert into t1(f1) values(1);
+select @stamp1:=f2 from t1;
+@stamp1:=f2
+#
+insert into t1(f1) values(1) on duplicate key update f1=1;
+select @stamp2:=f2 from t1;
+@stamp2:=f2
+#
+select if( @stamp1 = @stamp2, "correct", "wrong");
+if( @stamp1 = @stamp2, "correct", "wrong")
+correct
+drop table t1;
diff --git a/mysql-test/t/insert_update.test b/mysql-test/t/insert_update.test
index 725fbdb25d7..67108744ec6 100644
--- a/mysql-test/t/insert_update.test
+++ b/mysql-test/t/insert_update.test
@@ -290,3 +290,19 @@ INSERT IGNORE INTO t1 (id,c1) SELECT * FROM t2
 SELECT * FROM t1;
 
 DROP TABLE t1;
+
+#
+# Bug#28904: INSERT .. ON DUPLICATE was silently updating rows when it
+#            shouldn't.
+#
+create table t1(f1 int primary key,
+ f2 timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP);
+insert into t1(f1) values(1);
+--replace_column 1 #
+select @stamp1:=f2 from t1;
+--sleep 2
+insert into t1(f1) values(1) on duplicate key update f1=1;
+--replace_column 1 #
+select @stamp2:=f2 from t1;
+select if( @stamp1 = @stamp2, "correct", "wrong");
+drop table t1;
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index f3ed3ebab24..228fc8860ae 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -1404,23 +1404,18 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
           goto before_trg_err;
 
         table->file->restore_auto_increment();
-        if ((error=table->file->update_row(table->record[1],table->record[0])))
-        {
-          if ((error == HA_ERR_FOUND_DUPP_KEY) && info->ignore)
-          {
-            goto ok_or_after_trg_err;
-          }
-          goto err;
-        }
-
-        if (table->next_number_field)
-          table->file->adjust_next_insert_id_after_explicit_value(
-            table->next_number_field->val_int());
-        info->touched++;
-
         if ((table->file->table_flags() & HA_PARTIAL_COLUMN_READ) ||
             compare_record(table, thd->query_id))
         {
+          if ((error=table->file->update_row(table->record[1],table->record[0])))
+          {
+            if ((error == HA_ERR_FOUND_DUPP_KEY) && info->ignore)
+            {
+              goto ok_or_after_trg_err;
+            }
+            goto err;
+          }
+
           info->updated++;
           trg_error= (table->triggers &&
                       table->triggers->process_triggers(thd, TRG_EVENT_UPDATE,
@@ -1429,6 +1424,11 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
           info->copied++;
         }
 
+        if (table->next_number_field)
+          table->file->adjust_next_insert_id_after_explicit_value(
+            table->next_number_field->val_int());
+        info->touched++;
+
         goto ok_or_after_trg_err;
       }
       else /* DUP_REPLACE */

From b9876c6e9c45114f02138b9a30f796a9b5562956 Mon Sep 17 00:00:00 2001
From: "gkodinov/kgeorge@magare.gmz" <>
Date: Tue, 12 Jun 2007 11:02:34 +0300
Subject: [PATCH 39/48] Bug #28934: server crash when receiving malformed
 com_execute packets  Sometimes a parameter slot may not get a value because
 of the protocol  data being plain wrong.  Such cases should be detected and
 handled by returning an error.  Fixed by checking data stream constraints
 where possible (like maximum  length) and reacting to the case where a value
 cannot be constructed.

---
 sql/sql_prepare.cc        | 10 +++++
 tests/mysql_client_test.c | 83 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+)

diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 42655608196..1453a377600 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -562,6 +562,8 @@ void set_param_date(Item_param *param, uchar **pos, ulong len)
 static void set_param_str(Item_param *param, uchar **pos, ulong len)
 {
   ulong length= get_param_length(pos, len);
+  if (length > len)
+    length= len;
   param->set_str((const char *)*pos, length);
   *pos+= length;
 }
@@ -731,6 +733,8 @@ static bool insert_params_withlog(Prepared_statement *stmt, uchar *null_array,
         if (read_pos >= data_end)
           DBUG_RETURN(1);
         param->set_param_func(param, &read_pos, data_end - read_pos);
+        if (param->state == Item_param::NO_VALUE)
+          DBUG_RETURN(1);
       }
     }
     res= param->query_val_str(&str);
@@ -767,6 +771,8 @@ static bool insert_params(Prepared_statement *stmt, uchar *null_array,
         if (read_pos >= data_end)
           DBUG_RETURN(1);
         param->set_param_func(param, &read_pos, data_end - read_pos);
+        if (param->state == Item_param::NO_VALUE)
+          DBUG_RETURN(1);
       }
     }
     if (param->convert_str_value(stmt->thd))
@@ -849,6 +855,8 @@ static bool emb_insert_params(Prepared_statement *stmt, String *expanded_query)
                               client_param->length ?
                               *client_param->length :
                               client_param->buffer_length);
+        if (param->state == Item_param::NO_VALUE)
+          DBUG_RETURN(1);
       }
     }
     if (param->convert_str_value(thd))
@@ -890,6 +898,8 @@ static bool emb_insert_params_withlog(Prepared_statement *stmt, String *query)
                               client_param->length ?
                               *client_param->length :
                               client_param->buffer_length);
+        if (param->state == Item_param::NO_VALUE)
+          DBUG_RETURN(1);
       }
     }
     res= param->query_val_str(&str);
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index 54d29dbd683..7fc45b89b82 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -15686,6 +15686,88 @@ end:
 }
 
 
+/*
+  Bug#28934: server crash when receiving malformed com_execute packets
+*/
+
+static void test_bug28934()
+{
+  MYSQL *l_mysql;
+  my_bool error= 0;
+  my_ulonglong res;
+  MYSQL_BIND bind[5];
+  MYSQL_STMT *stmt;
+  int cnt;
+
+  if (!(l_mysql= mysql_init(NULL)))
+  {
+    myerror("mysql_init() failed");
+    DIE_UNLESS(1);
+  }
+  if (!(mysql_real_connect(l_mysql, opt_host, opt_user,
+                           opt_password, current_db, opt_port,
+                           opt_unix_socket, CLIENT_FOUND_ROWS)))
+  {
+    myerror("connection failed");
+    error= 1;
+    goto end;
+  }
+  l_mysql->reconnect= 1;
+  if (mysql_query(l_mysql, "drop table if exists t1"))
+  {
+    myerror(NULL);
+    error= 1;
+    goto end;
+  }
+  if (mysql_query(l_mysql, "create table t1(id int)"))
+  {
+    myerror(NULL);
+    error= 1;
+    goto end;
+  }
+  if (mysql_query(l_mysql, "insert into t1 values(1),(2),(3),(4),(5)"))
+  {
+    myerror(NULL);
+    error= 1;
+    goto end;
+  }
+  if (!(stmt= mysql_simple_prepare(l_mysql,
+                                   "select * from t1 where id in(?,?,?,?,?)")))
+  {
+    myerror(NULL);
+    error= 1;
+    goto end;
+  }
+
+  memset (&bind, 0, sizeof (bind));
+  for (cnt= 0; cnt < 5; cnt++)
+  {
+    bind[cnt].buffer_type= MYSQL_TYPE_LONG;
+    bind[cnt].buffer= (char*)&cnt;
+    bind[cnt].buffer_length= 0;
+  }
+  if(mysql_stmt_bind_param(stmt, bind))
+  {
+    myerror(NULL);
+    error= 1;
+    goto end;
+  }
+  stmt->param_count=2;
+  error= mysql_stmt_execute(stmt);
+  DIE_UNLESS (error != 0);
+  myerror(NULL);
+  error= 0;
+  if (mysql_query(l_mysql, "drop table t1"))
+  {
+    myerror(NULL);
+    error= 1;
+  }
+end:
+  mysql_close(l_mysql);
+  DIE_UNLESS(error == 0);
+}
+
+
 /*
   Read and parse arguments and MySQL options from my.cnf
 */
@@ -15968,6 +16050,7 @@ static struct my_tests_st my_tests[]= {
   { "test_bug24179", test_bug24179 },
   { "test_bug27876", test_bug27876 },
   { "test_bug28505", test_bug28505 },
+  { "test_bug28934", test_bug28934 },
   { 0, 0 }
 };
 

From 5ea9964b9fb397e3c38ab5fc69db3ff103f9aa9e Mon Sep 17 00:00:00 2001
From: "gkodinov/kgeorge@magare.gmz" <>
Date: Tue, 12 Jun 2007 14:35:36 +0300
Subject: [PATCH 40/48] Bug #28992: trigger fails in pushbuild  - fixed wrong
 test case for bug 20903  - closed the dangling connections in trigger.test  -
 GET_LOCK() and RELEASE_LOCK() now produce more detailed log  - fixed an
 omission in GET_LOCK() : assign the thread_id when     acquiring the lock.

---
 mysql-test/r/trigger.result | 15 ++++++++------
 mysql-test/t/trigger.test   | 21 ++++++++++++++-----
 sql/item_func.cc            | 41 +++++++++++++++++++++++++------------
 3 files changed, 53 insertions(+), 24 deletions(-)

diff --git a/mysql-test/r/trigger.result b/mysql-test/r/trigger.result
index fd9b15ab8ed..5405a632aa4 100644
--- a/mysql-test/r/trigger.result
+++ b/mysql-test/r/trigger.result
@@ -1454,19 +1454,22 @@ CREATE TABLE t2 (id INTEGER);
 INSERT INTO t2 VALUES (1),(2);
 CREATE TRIGGER t1_test AFTER INSERT ON t1 FOR EACH ROW 
 INSERT INTO t2 VALUES (new.id);
-SELECT GET_LOCK('B26162',20);
-GET_LOCK('B26162',20)
+SELECT GET_LOCK('B26162',120);
+GET_LOCK('B26162',120)
 1
-SELECT 'rl_acquirer', GET_LOCK('B26162',5), id FROM t2 WHERE id = 1;
+SELECT 'rl_acquirer', GET_LOCK('B26162',120), id FROM t2 WHERE id = 1;
 SET SESSION LOW_PRIORITY_UPDATES=1;
 SET GLOBAL LOW_PRIORITY_UPDATES=1;
 INSERT INTO t1 VALUES (5);
 SELECT 'rl_contender', id FROM t2 WHERE id > 1;
 SELECT RELEASE_LOCK('B26162');
 RELEASE_LOCK('B26162')
-0
-rl_acquirer	GET_LOCK('B26162',5)	id
-rl_acquirer	0	1
+1
+rl_acquirer	GET_LOCK('B26162',120)	id
+rl_acquirer	1	1
+SELECT RELEASE_LOCK('B26162');
+RELEASE_LOCK('B26162')
+1
 rl_contender	id
 rl_contender	2
 DROP TRIGGER t1_test;
diff --git a/mysql-test/t/trigger.test b/mysql-test/t/trigger.test
index 363df94eeb3..7158d02956e 100644
--- a/mysql-test/t/trigger.test
+++ b/mysql-test/t/trigger.test
@@ -1763,6 +1763,9 @@ select * from t1;
 select * from t3;
 drop table t1, t2, t3;
 
+disconnect addconroot1;
+disconnect addconroot2;
+disconnect addconwithoutdb;
 #
 # Bug #26162: Trigger DML ignores low_priority_updates setting
 #
@@ -1776,19 +1779,23 @@ INSERT INTO t2 VALUES (1),(2);
 CREATE TRIGGER t1_test AFTER INSERT ON t1 FOR EACH ROW 
   INSERT INTO t2 VALUES (new.id);
 
+CONNECT (rl_holder,    localhost, root,,);
 CONNECT (rl_acquirer,  localhost, root,,);
 CONNECT (wl_acquirer,  localhost, root,,);
 CONNECT (rl_contender, localhost, root,,);
 
-SELECT GET_LOCK('B26162',20);
+CONNECTION rl_holder;
+SELECT GET_LOCK('B26162',120);
 
 CONNECTION rl_acquirer;
 --send
-SELECT 'rl_acquirer', GET_LOCK('B26162',5), id FROM t2 WHERE id = 1;
+SELECT 'rl_acquirer', GET_LOCK('B26162',120), id FROM t2 WHERE id = 1;
 
 CONNECTION wl_acquirer;
 SET SESSION LOW_PRIORITY_UPDATES=1;
 SET GLOBAL LOW_PRIORITY_UPDATES=1;
+#need to wait for rl_acquirer to lock on the B26162 lock 
+sleep 2;
 --send
 INSERT INTO t1 VALUES (5);
 
@@ -1798,13 +1805,16 @@ CONNECTION rl_contender;
 --send
 SELECT 'rl_contender', id FROM t2 WHERE id > 1;
 
-CONNECTION default;
+CONNECTION rl_holder;
+#need to wait for wl_acquirer and rl_contender to lock on t2 
+sleep 2;
 SELECT RELEASE_LOCK('B26162');
 
-CONNECTION wl_acquirer;
---reap
 CONNECTION rl_acquirer;
 --reap
+SELECT RELEASE_LOCK('B26162');
+CONNECTION wl_acquirer;
+--reap
 CONNECTION rl_contender;
 --reap
 
@@ -1812,6 +1822,7 @@ CONNECTION default;
 DISCONNECT rl_acquirer;
 DISCONNECT wl_acquirer;
 DISCONNECT rl_contender;
+DISCONNECT rl_holder;
 
 DROP TRIGGER t1_test;
 DROP TABLE t1,t2;
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 580d19fbd4e..cc8830c6d6f 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -3449,6 +3449,7 @@ longlong Item_func_get_lock::val_int()
   THD *thd=current_thd;
   User_level_lock *ull;
   int error;
+  DBUG_ENTER("Item_func_get_lock::val_int");
 
   /*
     In slave thread no need to get locks, everything is serialized. Anyway
@@ -3458,7 +3459,7 @@ longlong Item_func_get_lock::val_int()
     it's not guaranteed to be same as on master.
   */
   if (thd->slave_thread)
-    return 1;
+    DBUG_RETURN(1);
 
   pthread_mutex_lock(&LOCK_user_locks);
 
@@ -3466,8 +3467,10 @@ longlong Item_func_get_lock::val_int()
   {
     pthread_mutex_unlock(&LOCK_user_locks);
     null_value=1;
-    return 0;
+    DBUG_RETURN(0);
   }
+  DBUG_PRINT("info", ("lock %.*s, thd=%ld", res->length(), res->ptr(),
+                      (long) thd->real_id));
   null_value=0;
 
   if (thd->ull)
@@ -3486,14 +3489,17 @@ longlong Item_func_get_lock::val_int()
       delete ull;
       pthread_mutex_unlock(&LOCK_user_locks);
       null_value=1;				// Probably out of memory
-      return 0;
+      DBUG_RETURN(0);
     }
     ull->thread=thd->real_id;
+    ull->thread_id=thd->thread_id;
     thd->ull=ull;
     pthread_mutex_unlock(&LOCK_user_locks);
-    return 1;					// Got new lock
+    DBUG_PRINT("info", ("made new lock"));
+    DBUG_RETURN(1);				// Got new lock
   }
   ull->count++;
+  DBUG_PRINT("info", ("ull->count=%d", ull->count));
 
   /*
     Structure is now initialized.  Try to get the lock.
@@ -3507,9 +3513,13 @@ longlong Item_func_get_lock::val_int()
   error= 0;
   while (ull->locked && !thd->killed)
   {
+    DBUG_PRINT("info", ("waiting on lock"));
     error= pthread_cond_timedwait(&ull->cond,&LOCK_user_locks,&abstime);
     if (error == ETIMEDOUT || error == ETIME)
+    {
+      DBUG_PRINT("info", ("lock wait timeout"));
       break;
+    }
     error= 0;
   }
 
@@ -3533,6 +3543,7 @@ longlong Item_func_get_lock::val_int()
     ull->thread_id= thd->thread_id;
     thd->ull=ull;
     error=0;
+    DBUG_PRINT("info", ("got the lock"));
   }
   pthread_mutex_unlock(&LOCK_user_locks);
 
@@ -3542,7 +3553,7 @@ longlong Item_func_get_lock::val_int()
   thd->mysys_var->current_cond=  0;
   pthread_mutex_unlock(&thd->mysys_var->mutex);
 
-  return !error ? 1 : 0;
+  DBUG_RETURN(!error ? 1 : 0);
 }
 
 
@@ -3560,11 +3571,14 @@ longlong Item_func_release_lock::val_int()
   String *res=args[0]->val_str(&value);
   User_level_lock *ull;
   longlong result;
+  THD *thd=current_thd;
+  DBUG_ENTER("Item_func_release_lock::val_int");
   if (!res || !res->length())
   {
     null_value=1;
-    return 0;
+    DBUG_RETURN(0);
   }
+  DBUG_PRINT("info", ("lock %.*s", res->length(), res->ptr()));
   null_value=0;
 
   result=0;
@@ -3577,19 +3591,20 @@ longlong Item_func_release_lock::val_int()
   }
   else
   {
-#ifdef EMBEDDED_LIBRARY
-    if (ull->locked && pthread_equal(current_thd->real_id,ull->thread))
-#else
-    if (ull->locked && pthread_equal(pthread_self(),ull->thread))
-#endif
+    DBUG_PRINT("info", ("ull->locked=%d ull->thread=%ld thd=%ld", 
+                        (int) ull->locked,
+                        (long)ull->thread,
+                        (long)thd->real_id));
+    if (ull->locked && pthread_equal(thd->real_id,ull->thread))
     {
+      DBUG_PRINT("info", ("release lock"));
       result=1;					// Release is ok
       item_user_lock_release(ull);
-      current_thd->ull=0;
+      thd->ull=0;
     }
   }
   pthread_mutex_unlock(&LOCK_user_locks);
-  return result;
+  DBUG_RETURN(result);
 }
 
 

From 2a6ac40e11addd29a010f21c1203ddd091454e5c Mon Sep 17 00:00:00 2001
From: "gkodinov/kgeorge@magare.gmz" <>
Date: Tue, 12 Jun 2007 14:45:30 +0300
Subject: [PATCH 41/48] removed compilation warning

---
 tests/mysql_client_test.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index 7fc45b89b82..ed1f2d58278 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -15694,7 +15694,6 @@ static void test_bug28934()
 {
   MYSQL *l_mysql;
   my_bool error= 0;
-  my_ulonglong res;
   MYSQL_BIND bind[5];
   MYSQL_STMT *stmt;
   int cnt;

From affeddbd8fa5ec247706e17fd2c69e826bd63b82 Mon Sep 17 00:00:00 2001
From: "kent@mysql.com/kent-amd64.(none)" <>
Date: Tue, 12 Jun 2007 19:49:02 +0200
Subject: [PATCH 42/48] make_win_bin_dist:   Aligned headers to include with
 Unix 'make install'

---
 scripts/make_win_bin_dist | 44 ++++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist
index 30127b0043f..cecee4f57af 100755
--- a/scripts/make_win_bin_dist
+++ b/scripts/make_win_bin_dist
@@ -239,25 +239,45 @@ if [ x"$PACK_EMBEDDED" = x"" -a \
 fi
 
 # ----------------------------------------------------------------------
-# FIXME why not copy it all in "include"?!
+# Note: Make sure to sync with include/Makefile.am and WiX installer
+# XML specifications
 # ----------------------------------------------------------------------
 
 mkdir -p $DESTDIR/include
-cp include/conf*.h \
-   include/mysql*.h \
-   include/errmsg.h \
-   include/my_alloc.h \
-   include/my_getopt.h \
-   include/my_sys.h \
+cp include/mysql.h \
+   include/mysql_com.h \
+   include/mysql_time.h \
    include/my_list.h \
-   include/my_pthread.h \
+   include/my_alloc.h \
+   include/typelib.h \
    include/my_dbug.h \
    include/m_string.h \
-   include/m_ctype.h \
-   include/my_global.h \
+   include/my_sys.h \
+   include/my_xml.h \
+   include/mysql_embed.h \
+   include/my_pthread.h \
+   include/my_no_pthread.h \
    include/raid.h \
-   include/typelib.h $DESTDIR/include/
-cp libmysql/libmysql.def $DESTDIR/include/
+   include/decimal.h \
+   include/errmsg.h \
+   include/my_global.h \
+   include/my_net.h \
+   include/my_getopt.h \
+   include/sslopt-longopts.h \
+   include/my_dir.h \
+   include/sslopt-vars.h \
+   include/sslopt-case.h \
+   include/sql_common.h \
+   include/keycache.h \
+   include/m_ctype.h \
+   include/my_attribute.h \
+   include/mysqld_error.h \
+   include/sql_state.h \
+   include/mysqld_ername.h
+   include/mysql_version.h \
+   include/config-win.h \
+   libmysql/libmysql.def \
+   $DESTDIR/include/
 
 # ----------------------------------------------------------------------
 # Client libraries, and other libraries

From 320ec8261642f1c497b2eb18f2e0b6cf4bfd061c Mon Sep 17 00:00:00 2001
From: "df@pippilotta.erinye.com" <>
Date: Wed, 13 Jun 2007 11:44:58 +0200
Subject: [PATCH 43/48] BK changes for
 https://inside.mysql.com/wiki/MySQL's_Code_Reviews_Published_Externally

---
 BitKeeper/triggers/post-commit | 56 +++++++++++++++++++++-------------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit
index 229553cdccf..245d644e06a 100755
--- a/BitKeeper/triggers/post-commit
+++ b/BitKeeper/triggers/post-commit
@@ -26,6 +26,13 @@ then
   exit
 fi
 
+IS_MERGE=`bk changes -r+ -k -m`
+if [ "$IS_MERGE" = "" ]
+then
+  echo Merge changeset, not sending mails
+  exit
+fi
+
 CHANGESET=`bk -R prs -r+ -h -d':P:::I:' ChangeSet`
 CSETKEY=`bk -R prs -r+ -h -d':KEY:' ChangeSet`
 #
@@ -41,42 +48,49 @@ WL=`bk -R prs -r+ -h -d':C:' ChangeSet | \
               s/.*\(WL#[0-9][0-9]*\)/ \1/p'`
 if [ "$BUG" = "" ]
 then
-  TO=dev-public@mysql.com
+#  TO=dev-public@mysql.com
   BS=""
   BH=""
 else
-  TO=dev-bugs@mysql.com
+#  TO=dev-bugs@mysql.com
   BS=" BUG#$BUG"
 # need newline here
   BH="X-Bug: $BUG
 "
 fi
-#++
-# dev-public@ / dev-bugs@
-#--
- echo "Commit successful, notifying developers at $TO"
- (
-   cat <<EOF
-List-ID: <bk.mysql-$VERSION>
-From: $FROM
-To: $TO
-Subject: bk commit - $VERSION tree ($CHANGESET)${BS}${WL}
-X-CSetKey: <$CSETKEY>
-$BH
-EOF
-  bk changes -v -r+
-  bk cset -r+ -d
- ) | head -n $LIMIT | /usr/sbin/sendmail -t
+##++
+## dev-public@ / dev-bugs@
+##--
+# echo "Commit successful, notifying developers at $TO"
+# (
+#   cat <<EOF
+#List-ID: <bk.mysql-$VERSION>
+#From: $FROM
+#To: $TO
+#Subject: bk commit - $VERSION tree ($CHANGESET)${BS}${WL}
+#X-CSetKey: <$CSETKEY>
+#$BH
+#EOF
+#  bk changes -v -r+
+#  bk cset -r+ -d
+# ) | head -n $LIMIT | /usr/sbin/sendmail -t
 
 #++
-# commits@ mail
+# commits@ or dev-private@ mail
 #--
- echo "Notifying commits list at $COMMITS"
+
+TO="commits"
+if [ -f .tree-is-private ]
+then
+  TO="dev-private"
+fi
+
+ echo "Notifying $TO list at $TO"
  (
    cat <<EOF
 List-ID: <bk.mysql-$VERSION>
 From: $FROM
-To: $COMMITS
+To: $TO@mysql.com
 Subject: bk commit into $VERSION tree ($CHANGESET)$BS
 X-CSetKey: <$CSETKEY>
 $BH

From 018a5d403b09d42da97b070a7429e5b94a74648b Mon Sep 17 00:00:00 2001
From: "joerg@trift2." <>
Date: Wed, 13 Jun 2007 13:33:00 +0200
Subject: [PATCH 44/48] sql/item_func.cc     Improved check for thread identity
 in the "embedded" case,     provided by Monty.

    This finishes the fixes for bug#27078.
---
 sql/item_func.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/item_func.cc b/sql/item_func.cc
index 12bb6571369..f71297515d6 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -2243,7 +2243,7 @@ longlong Item_func_release_lock::val_int()
   else
   {
 #ifdef EMBEDDED_LIBRARY
-    if (ull->locked && pthread_equal(current_thd->real_id,ull->thread))
+    if (ull->locked && (current_thd->real_id == ull->thread))
 #else
     if (ull->locked && pthread_equal(pthread_self(),ull->thread))
 #endif

From 20ad51500325027dcf629867c053ce0efeb5a81e Mon Sep 17 00:00:00 2001
From: "igor@olga.mysql.com" <>
Date: Wed, 13 Jun 2007 09:32:36 -0700
Subject: [PATCH 45/48] Fixed bug #28980: the result of ROUND(<decimal
 expr>,<int column>) was erroneously converted to double, while the result of
 ROUND(<decimal expr>, <int literal>) was preserved as decimal. As a result of
 such a conversion the value of ROUND(D,A) could differ from the value of
 ROUND(D,val(A)) if D was a decimal expression.

Now the result of the ROUND function is never converted to
double if the first argument is decimal.
---
 mysql-test/r/type_decimal.result |  9 +++++++++
 mysql-test/t/type_decimal.test   | 14 ++++++++++++++
 sql/item_func.cc                 |  8 +++++++-
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/type_decimal.result b/mysql-test/r/type_decimal.result
index c9c42d18d68..3cf24529421 100644
--- a/mysql-test/r/type_decimal.result
+++ b/mysql-test/r/type_decimal.result
@@ -790,3 +790,12 @@ Warning	1292	Truncated incorrect datetime value: '0000-00-00'
 Warning	1292	Truncated incorrect datetime value: '0000-00-00'
 Warning	1292	Truncated incorrect datetime value: '0000-00-00'
 drop table t1;
+CREATE TABLE t1 (
+qty decimal(16,6) default NULL, 
+dps tinyint(3) unsigned default NULL 
+);
+INSERT INTO t1 VALUES (1.1325,3);
+SELECT ROUND(qty,3), dps, ROUND(qty,dps) FROM t1;
+ROUND(qty,3)	dps	ROUND(qty,dps)
+1.133	3	1.133
+DROP TABLE t1;
diff --git a/mysql-test/t/type_decimal.test b/mysql-test/t/type_decimal.test
index 4fdb0c8458f..5538f19f5f9 100644
--- a/mysql-test/t/type_decimal.test
+++ b/mysql-test/t/type_decimal.test
@@ -394,3 +394,17 @@ create table t1 as
  from (select 1 as s,'t' as t union select null, null ) as sub1;
 select group_concat(t) from t1 group by week(date)/10;
 drop table t1;
+
+#
+# Bug#28980: ROUND(<dec expr>, <int col>) returned double values
+#
+
+CREATE TABLE t1 (
+  qty decimal(16,6) default NULL, 
+  dps tinyint(3) unsigned default NULL 
+);
+INSERT INTO t1 VALUES (1.1325,3);
+
+SELECT ROUND(qty,3), dps, ROUND(qty,dps) FROM t1;
+
+DROP TABLE t1;
diff --git a/sql/item_func.cc b/sql/item_func.cc
index cc8830c6d6f..ab4a9c50332 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -1957,7 +1957,13 @@ void Item_func_round::fix_length_and_dec()
   {
     max_length= args[0]->max_length;
     decimals= args[0]->decimals;
-    hybrid_type= REAL_RESULT;
+    if (args[0]->result_type() == DECIMAL_RESULT)
+    {
+      max_length++;
+      hybrid_type= DECIMAL_RESULT;
+    }
+    else
+      hybrid_type= REAL_RESULT;
     return;
   }
 

From 6db1887a5c53a423bc9f92544e0a5b3cfcb29fb9 Mon Sep 17 00:00:00 2001
From: "df@pippilotta.erinye.com" <>
Date: Wed, 13 Jun 2007 19:19:11 +0200
Subject: [PATCH 46/48] fix make_win_bin_dist typo

---
 scripts/make_win_bin_dist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist
index cecee4f57af..beb274ca1a3 100755
--- a/scripts/make_win_bin_dist
+++ b/scripts/make_win_bin_dist
@@ -273,7 +273,7 @@ cp include/mysql.h \
    include/my_attribute.h \
    include/mysqld_error.h \
    include/sql_state.h \
-   include/mysqld_ername.h
+   include/mysqld_ername.h \
    include/mysql_version.h \
    include/config-win.h \
    libmysql/libmysql.def \

From 35413f161a6045ee0bbded1e8b9bf35a72904a0a Mon Sep 17 00:00:00 2001
From: "df@pippilotta.erinye.com" <>
Date: Wed, 13 Jun 2007 19:23:13 +0200
Subject: [PATCH 47/48] fix.

---
 BitKeeper/triggers/post-commit | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit
index 245d644e06a..5a7d6576d4e 100755
--- a/BitKeeper/triggers/post-commit
+++ b/BitKeeper/triggers/post-commit
@@ -79,18 +79,20 @@ fi
 # commits@ or dev-private@ mail
 #--
 
-TO="commits"
+LIST="commits"
+TO="commits@lists.mysql.com"
 if [ -f .tree-is-private ]
 then
-  TO="dev-private"
+  LIST="dev-private"
+  TO="dev-private@mysql.com"
 fi
 
- echo "Notifying $TO list at $TO"
+ echo "Notifying $LIST list at $TO"
  (
    cat <<EOF
 List-ID: <bk.mysql-$VERSION>
 From: $FROM
-To: $TO@mysql.com
+To: $TO
 Subject: bk commit into $VERSION tree ($CHANGESET)$BS
 X-CSetKey: <$CSETKEY>
 $BH

From 78f477c9d96095aff432615f1201a30b940b3d1a Mon Sep 17 00:00:00 2001
From: "gkodinov/kgeorge@magare.gmz" <>
Date: Thu, 14 Jun 2007 15:38:52 +0300
Subject: [PATCH 48/48] corrected valgrind problems for bug 28505 and 28934

---
 tests/mysql_client_test.c | 129 +++++++-------------------------------
 1 file changed, 21 insertions(+), 108 deletions(-)

diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index ed1f2d58278..0985b4d25ec 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -15627,62 +15627,19 @@ static void test_bug27876()
   Bug#28505: mysql_affected_rows() returns wrong value if CLIENT_FOUND_ROWS
   flag is set.
 */
+
 static void test_bug28505()
 {
-  MYSQL *l_mysql;
-  my_bool error= 0;
   my_ulonglong res;
 
-  if (!(l_mysql= mysql_init(NULL)))
-  {
-    myerror("mysql_init() failed");
-    DIE_UNLESS(1);
-  }
-  if (!(mysql_real_connect(l_mysql, opt_host, opt_user,
-                           opt_password, current_db, opt_port,
-                           opt_unix_socket, CLIENT_FOUND_ROWS)))
-  {
-    myerror("connection failed");
-    error= 1;
-    goto end;
-  }
-  l_mysql->reconnect= 1;
-  if (mysql_query(l_mysql, "drop table if exists t1"))
-  {
-    myerror(NULL);
-    error= 1;
-    goto end;
-  }
-  if (mysql_query(l_mysql, "create table t1(f1 int primary key)"))
-  {
-    myerror(NULL);
-    error= 1;
-    goto end;
-  }
-  if (mysql_query(l_mysql, "insert into t1 values(1)"))
-  {
-    myerror(NULL);
-    error= 1;
-    goto end;
-  }
-  if (mysql_query(l_mysql,
-                  "insert into t1 values(1) on duplicate key update f1=1"))
-  {
-    myerror(NULL);
-    error= 1;
-    goto end;
-  }
-  res= mysql_affected_rows(l_mysql);
-  if (!res)
-    error= 1;
-  if (mysql_query(l_mysql, "drop table t1"))
-  {
-    myerror(NULL);
-    error= 1;
-  }
-end:
-  mysql_close(l_mysql);
-  DIE_UNLESS(error == 0);
+  myquery(mysql_query(mysql, "drop table if exists t1"));
+  myquery(mysql_query(mysql, "create table t1(f1 int primary key)"));
+  myquery(mysql_query(mysql, "insert into t1 values(1)"));
+  myquery(mysql_query(mysql,
+                  "insert into t1 values(1) on duplicate key update f1=1"));
+  res= mysql_affected_rows(mysql);
+  DIE_UNLESS(!res);
+  myquery(mysql_query(mysql, "drop table t1"));
 }
 
 
@@ -15692,51 +15649,17 @@ end:
 
 static void test_bug28934()
 {
-  MYSQL *l_mysql;
   my_bool error= 0;
   MYSQL_BIND bind[5];
   MYSQL_STMT *stmt;
   int cnt;
 
-  if (!(l_mysql= mysql_init(NULL)))
-  {
-    myerror("mysql_init() failed");
-    DIE_UNLESS(1);
-  }
-  if (!(mysql_real_connect(l_mysql, opt_host, opt_user,
-                           opt_password, current_db, opt_port,
-                           opt_unix_socket, CLIENT_FOUND_ROWS)))
-  {
-    myerror("connection failed");
-    error= 1;
-    goto end;
-  }
-  l_mysql->reconnect= 1;
-  if (mysql_query(l_mysql, "drop table if exists t1"))
-  {
-    myerror(NULL);
-    error= 1;
-    goto end;
-  }
-  if (mysql_query(l_mysql, "create table t1(id int)"))
-  {
-    myerror(NULL);
-    error= 1;
-    goto end;
-  }
-  if (mysql_query(l_mysql, "insert into t1 values(1),(2),(3),(4),(5)"))
-  {
-    myerror(NULL);
-    error= 1;
-    goto end;
-  }
-  if (!(stmt= mysql_simple_prepare(l_mysql,
-                                   "select * from t1 where id in(?,?,?,?,?)")))
-  {
-    myerror(NULL);
-    error= 1;
-    goto end;
-  }
+  myquery(mysql_query(mysql, "drop table if exists t1"));
+  myquery(mysql_query(mysql, "create table t1(id int)"));
+
+  myquery(mysql_query(mysql, "insert into t1 values(1),(2),(3),(4),(5)"));
+  stmt= mysql_simple_prepare(mysql,"select * from t1 where id in(?,?,?,?,?)");
+  check_stmt(stmt);
 
   memset (&bind, 0, sizeof (bind));
   for (cnt= 0; cnt < 5; cnt++)
@@ -15745,25 +15668,15 @@ static void test_bug28934()
     bind[cnt].buffer= (char*)&cnt;
     bind[cnt].buffer_length= 0;
   }
-  if(mysql_stmt_bind_param(stmt, bind))
-  {
-    myerror(NULL);
-    error= 1;
-    goto end;
-  }
+  myquery(mysql_stmt_bind_param(stmt, bind));
+
   stmt->param_count=2;
   error= mysql_stmt_execute(stmt);
-  DIE_UNLESS (error != 0);
+  DIE_UNLESS(error != 0);
   myerror(NULL);
-  error= 0;
-  if (mysql_query(l_mysql, "drop table t1"))
-  {
-    myerror(NULL);
-    error= 1;
-  }
-end:
-  mysql_close(l_mysql);
-  DIE_UNLESS(error == 0);
+  mysql_stmt_close(stmt);
+
+  myquery(mysql_query(mysql, "drop table t1"));
 }