bk commit into 5.1 tree (tomas:1.2531)

[tomas]

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

ChangeSet@stripped, 2007-06-14 09:58:57+02:00, tomas@stripped +5 -0
  Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
  into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-wl3867
  MERGE: 1.2506.1.38

  mysql-test/r/ndb_basic.result@stripped, 2007-06-14 09:58:53+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.54.1.3

  mysql-test/t/disabled.def@stripped, 2007-06-14 09:58:53+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.243.1.12

  mysql-test/t/ndb_basic.test@stripped, 2007-06-14 09:58:53+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.54.1.4

  storage/ndb/src/mgmapi/mgmapi.cpp@stripped, 2007-06-14 09:58:53+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.80.1.15

  storage/ndb/test/run-test/daily-basic-tests.txt@stripped, 2007-06-14 09:58:53+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.61.1.32

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl3867/RESYNC

--- 1.111/storage/ndb/test/run-test/daily-basic-tests.txt	2007-05-30 20:27:24 +02:00
+++ 1.112/storage/ndb/test/run-test/daily-basic-tests.txt	2007-06-14 09:58:53 +02:00
@@ -914,6 +914,10 @@
 cmd: testMgm
 args: -n ApiSessionFailure T1
 
+max-time: 15
+cmd: testMgm
+args: -n ApiConnectTimeout T1
+
 max-time: 120
 cmd: testMgm
 args: -n ApiTimeoutBasic T1

--- 1.257/mysql-test/t/disabled.def	2007-05-30 13:48:47 +02:00
+++ 1.258/mysql-test/t/disabled.def	2007-06-14 09:58:53 +02:00
@@ -41,3 +41,4 @@
 #rpl_ndb_dd_advance	 : Bug#25913 rpl_ndb_dd_advance fails randomly
 
 ndb_partition_error2	 : HF is not sure if the test can work as internded on all the platforms
+mysql_upgrade		 : Bug#28560 test links to /usr/local/mysql/lib libraries, causes non-determinism and failures on ABI breakage

--- 1.56/mysql-test/r/ndb_basic.result	2007-05-30 13:48:47 +02:00
+++ 1.57/mysql-test/r/ndb_basic.result	2007-06-14 09:58:53 +02:00
@@ -6,6 +6,34 @@
 attr2 INT,
 attr3 VARCHAR(10)
 ) ENGINE=ndbcluster;
+drop table t1;
+SHOW GLOBAL STATUS LIKE 'ndb%';
+Variable_name	Value
+Ndb_cluster_node_id	#
+Ndb_config_from_host	#
+Ndb_config_from_port	#
+Ndb_number_of_data_nodes	#
+SHOW GLOBAL VARIABLES LIKE 'ndb%';
+Variable_name	Value
+ndb_autoincrement_prefetch_sz	#
+ndb_cache_check_time	#
+ndb_connectstring	#
+ndb_extra_logging	#
+ndb_force_send	#
+ndb_index_stat_cache_entries	#
+ndb_index_stat_enable	#
+ndb_index_stat_update_freq	#
+ndb_report_thresh_binlog_epoch_slip	#
+ndb_report_thresh_binlog_mem_usage	#
+ndb_use_copying_alter_table	#
+ndb_use_exact_count	#
+ndb_use_transactions	#
+CREATE TABLE t1 (
+pk1 INT NOT NULL PRIMARY KEY,
+attr1 INT NOT NULL,
+attr2 INT,
+attr3 VARCHAR(10)
+) ENGINE=ndbcluster;
 SHOW INDEX FROM t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 t1	0	PRIMARY	1	pk1	A	0	NULL	NULL		BTREE	

--- 1.56/mysql-test/t/ndb_basic.test	2007-05-30 13:48:47 +02:00
+++ 1.57/mysql-test/t/ndb_basic.test	2007-06-14 09:58:53 +02:00
@@ -6,21 +6,29 @@
 drop database if exists mysqltest;
 --enable_warnings
 
-## workaround for bug#16445
-## remove to reproduce bug and run tests from ndb start
-## and with ndb_autodiscover disabled. Fails on Linux 50 % of the times
-#CREATE TABLE t1 (
-#  pk1 INT NOT NULL PRIMARY KEY,
-#  attr1 INT NOT NULL,
-#  attr2 INT,
-#  attr3 VARCHAR(10)
-#) ENGINE=ndbcluster;
-#drop table t1;
+# workaround for bug#16445
+# remove to reproduce bug and run tests from ndb start
+# and with ndb_autodiscover disabled. Fails on Linux 50 % of the times
+CREATE TABLE t1 (
+  pk1 INT NOT NULL PRIMARY KEY,
+  attr1 INT NOT NULL,
+  attr2 INT,
+  attr3 VARCHAR(10)
+) ENGINE=ndbcluster;
+drop table t1;
 
 #
 # Basic test to show that the NDB 
 # table handler is working
 #
+
+#
+# Show status and variables
+#
+--replace_column 2 #
+SHOW GLOBAL STATUS LIKE 'ndb%';
+--replace_column 2 #
+SHOW GLOBAL VARIABLES LIKE 'ndb%';
 
 #
 # Create a normal table with primary key

--- 1.91/storage/ndb/src/mgmapi/mgmapi.cpp	2007-05-04 13:35:15 +02:00
+++ 1.92/storage/ndb/src/mgmapi/mgmapi.cpp	2007-06-14 09:58:53 +02:00
@@ -524,7 +524,7 @@
   NDB_SOCKET_TYPE sockfd= NDB_INVALID_SOCKET;
   Uint32 i;
   SocketClient s(0, 0);
-  s.set_connect_timeout(handle->timeout);
+  s.set_connect_timeout((handle->timeout+999)/1000);
   if (!s.init())
   {
     fprintf(handle->errstream,