bk commit into 5.1 tree (msvensson:1.2600) BUG#36547

[msvensson]

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

ChangeSet@stripped, 2008-05-08 13:20:29+02:00, msvensson@pilot.(none) +3 -0
  Bug#36547 SET GLOBAL ndb_extra_logging crashes mysqld
   - Change type of ndb_extr_logging variable in the args list

  mysql-test/suite/ndb/r/bug36547.result@stripped, 2008-05-08 13:20:27+02:00,
msvensson@pilot.(none) +12 -0
    New BitKeeper file ``mysql-test/suite/ndb/r/bug36547.result''

  mysql-test/suite/ndb/r/bug36547.result@stripped, 2008-05-08 13:20:27+02:00,
msvensson@pilot.(none) +0 -0

  mysql-test/suite/ndb/t/bug36547.test@stripped, 2008-05-08 13:20:27+02:00,
msvensson@pilot.(none) +13 -0
    New BitKeeper file ``mysql-test/suite/ndb/t/bug36547.test''

  mysql-test/suite/ndb/t/bug36547.test@stripped, 2008-05-08 13:20:27+02:00,
msvensson@pilot.(none) +0 -0

  sql/mysqld.cc@stripped, 2008-05-08 13:20:27+02:00, msvensson@pilot.(none) +1 -1
    ndb_extra_logging variable is a long, not int

diff -Nrup a/mysql-test/suite/ndb/r/bug36547.result
b/mysql-test/suite/ndb/r/bug36547.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/ndb/r/bug36547.result	2008-05-08 13:20:27 +02:00
@@ -0,0 +1,12 @@
+SET NDB_EXTRA_LOGGING=1;
+ERROR HY000: Variable 'ndb_extra_logging' is a GLOBAL variable and should be set with SET
GLOBAL
+SET @SAVE_NDB_EXTRA_LOGGING= @@NDB_EXTRA_LOGGING;
+SET GLOBAL NDB_EXTRA_LOGGING=1;
+SHOW VARIABLES LIKE 'ndb_extra%';
+Variable_name	Value
+ndb_extra_logging	1
+SET GLOBAL NDB_EXTRA_LOGGING=0;
+SHOW VARIABLES LIKE 'ndb_extra%';
+Variable_name	Value
+ndb_extra_logging	0
+SET @GLOBAL.NDB_EXTRA_LOGGGING= @SAVE_NDB_EXTRA_LOGGING;
diff -Nrup a/mysql-test/suite/ndb/t/bug36547.test b/mysql-test/suite/ndb/t/bug36547.test
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/ndb/t/bug36547.test	2008-05-08 13:20:27 +02:00
@@ -0,0 +1,13 @@
+--source include/have_ndb.inc
+#
+# Bug #36547  	SET GLOBAL ndb_extra_logging crashes mysqld
+#
+--error 1229
+SET NDB_EXTRA_LOGGING=1;
+
+SET @SAVE_NDB_EXTRA_LOGGING= @@NDB_EXTRA_LOGGING;
+SET GLOBAL NDB_EXTRA_LOGGING=1;
+SHOW VARIABLES LIKE 'ndb_extra%';
+SET GLOBAL NDB_EXTRA_LOGGING=0;
+SHOW VARIABLES LIKE 'ndb_extra%';
+SET @GLOBAL.NDB_EXTRA_LOGGGING= @SAVE_NDB_EXTRA_LOGGING;
diff -Nrup a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc	2008-04-02 00:42:29 +02:00
+++ b/sql/mysqld.cc	2008-05-08 13:20:27 +02:00
@@ -5964,7 +5964,7 @@ master-ssl",
    "Turn on more logging in the error log.",
    (uchar**) &ndb_extra_logging,
    (uchar**) &ndb_extra_logging,
-   0, GET_INT, OPT_ARG, 0, 0, 0, 0, 0, 0},
+   0, GET_ULONG, OPT_ARG, 0, 0, 0, 0, 0, 0},
 #ifdef HAVE_NDB_BINLOG
   {"ndb-report-thresh-binlog-epoch-slip", OPT_NDB_REPORT_THRESH_BINLOG_EPOCH_SLIP,
    "Threshold on number of epochs to be behind before reporting binlog status. "