Automerge

sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
client/mysqlslap.c:
  SCCS merged
configure.in:
  SCCS merged
libmysql/libmysql.c:
  SCCS merged
mysys/my_init.c:
  SCCS merged

9 files changed, 4 insertions, 13 deletions

diff --git a/storage/heap/hp_test2.c b/storage/heap/hp_test2.c
index 2de49bcb66b..a74872dbd11 100644
--- a/storage/heap/hp_test2.c
+++ b/storage/heap/hp_test2.c
@@ -617,7 +617,6 @@ err:
 static int get_options(int argc,char *argv[])
 {
   char *pos,*progname;
-  DEBUGGER_OFF;
 
   progname= argv[0];
 
@@ -646,7 +645,6 @@ static int get_options(int argc,char *argv[])
       printf("Usage: %s [-?ABIKLsWv] [-m#] [-t#]\n",progname);
       exit(0);
     case '#':
-      DEBUGGER_ON;
       DBUG_PUSH (++pos);
       break;
     }
diff --git a/storage/myisam/ft_eval.c b/storage/myisam/ft_eval.c
index 34248c69f20..eab9d37af0b 100644
--- a/storage/myisam/ft_eval.c
+++ b/storage/myisam/ft_eval.c
@@ -170,7 +170,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
   case 'q': silent=1; break;
   case 'S': if (stopwordlist==ft_precompiled_stopwords) stopwordlist=NULL; break;
   case '#':
-    DEBUGGER_ON;
     DBUG_PUSH (argument);
     break;
   case 'V':
diff --git a/storage/myisam/ft_test1.c b/storage/myisam/ft_test1.c
index 14be9aa1e8c..d54b344e2cd 100644
--- a/storage/myisam/ft_test1.c
+++ b/storage/myisam/ft_test1.c
@@ -284,7 +284,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
   case 'N': no_search=1; break;
   case 'S': no_stopwords=1; break;
   case '#':
-    DEBUGGER_ON;
     DBUG_PUSH (argument);
     break;
   case 'V':
diff --git a/storage/myisam/mi_open.c b/storage/myisam/mi_open.c
index c891cce89ac..abf1d1ea9a7 100644
--- a/storage/myisam/mi_open.c
+++ b/storage/myisam/mi_open.c
@@ -208,9 +208,9 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
     if (len != MI_BASE_INFO_SIZE)
     {
       DBUG_PRINT("warning",("saved_base_info_length: %d  base_info_length: %d",
-			    len,MI_BASE_INFO_SIZE))
+			    len,MI_BASE_INFO_SIZE));
     }
-    disk_pos= (char*) 
+    disk_pos= (char*)
       my_n_base_info_read((uchar*) disk_cache + base_pos, &share->base);
     share->state.state_length=base_pos;
 
diff --git a/storage/myisam/mi_test1.c b/storage/myisam/mi_test1.c
index 60225ccc7f3..0e62b074376 100644
--- a/storage/myisam/mi_test1.c
+++ b/storage/myisam/mi_test1.c
@@ -648,7 +648,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     printf("test1 Ver 1.2 \n");
     exit(0);
   case '#':
-    DEBUGGER_ON;
     DBUG_PUSH (argument);
     break;
   case '?':
diff --git a/storage/myisam/mi_test2.c b/storage/myisam/mi_test2.c
index 6a6dcb971a2..e77a37d853f 100644
--- a/storage/myisam/mi_test2.c
+++ b/storage/myisam/mi_test2.c
@@ -864,7 +864,6 @@ err:
 static void get_options(int argc, char **argv)
 {
   char *pos,*progname;
-  DEBUGGER_OFF;
 
   progname= argv[0];
 
@@ -977,7 +976,6 @@ static void get_options(int argc, char **argv)
 	     progname);
       exit(0);
     case '#':
-      DEBUGGER_ON;
       DBUG_PUSH (++pos);
       break;
     default:
diff --git a/storage/myisam/mi_test3.c b/storage/myisam/mi_test3.c
index be4277cc65c..4e764c6f971 100644
--- a/storage/myisam/mi_test3.c
+++ b/storage/myisam/mi_test3.c
@@ -120,7 +120,6 @@ int main(int argc,char **argv)
 static void get_options(int argc, char **argv)
 {
   char *pos,*progname;
-  DEBUGGER_OFF;
 
   progname= argv[0];
 
@@ -150,7 +149,6 @@ static void get_options(int argc, char **argv)
       printf("Usage: %s [-?lKA] [-f#] [-t#]\n",progname);
       exit(0);
     case '#':
-      DEBUGGER_ON;
       DBUG_PUSH (++pos);
       break;
     default:
diff --git a/storage/ndb/src/ndbapi/DictCache.cpp b/storage/ndb/src/ndbapi/DictCache.cpp
index d7a6e4c8586..5ea407ad48f 100644
--- a/storage/ndb/src/ndbapi/DictCache.cpp
+++ b/storage/ndb/src/ndbapi/DictCache.cpp
@@ -281,7 +281,7 @@ GlobalDictCache::drop(NdbTableImpl * tab)
       ver.m_refCount--;
       ver.m_status = DROPPED;
       if(ver.m_refCount == 0){
-        DBUG_PRINT("info", ("refCount is zero, deleting m_impl"))
+        DBUG_PRINT("info", ("refCount is zero, deleting m_impl"));
 	delete ver.m_impl;
 	vers->erase(i);
       }
diff --git a/storage/ndb/src/ndbapi/NdbTransaction.cpp b/storage/ndb/src/ndbapi/NdbTransaction.cpp
index 294012d780c..fd0dc0eb124 100644
--- a/storage/ndb/src/ndbapi/NdbTransaction.cpp
+++ b/storage/ndb/src/ndbapi/NdbTransaction.cpp
@@ -978,7 +978,7 @@ void
 NdbTransaction::releaseExecutedScanOperation(NdbIndexScanOperation* cursorOp)
 {
   DBUG_ENTER("NdbTransaction::releaseExecutedScanOperation");
-  DBUG_PRINT("enter", ("this=0x%x op=0x%x", (UintPtr)this, (UintPtr)cursorOp))
+  DBUG_PRINT("enter", ("this=0x%x op=0x%x", (UintPtr)this, (UintPtr)cursorOp));
 
   // here is one reason to make op lists doubly linked
   if (m_firstExecutedScanOp == cursorOp) {