bk commit into 5.1 tree (tomas:1.1891)

[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
  1.1891 05/08/16 13:39:45 tomas@stripped +8 -0
  only discover table if frm does not exist on disk
  + some minor test fixes

  sql/ha_ndbcluster.cc
    1.205 05/08/16 13:39:39 tomas@stripped +9 -4
    only discover table if frm does not exist on disk

  mysql-test/t/sp-prelocking.test
    1.3 05/08/16 13:39:39 tomas@stripped +1 -1
    added missing drop of a view at end of the test

  mysql-test/t/rpl_slave_status.test
    1.4 05/08/16 13:39:39 tomas@stripped +1 -1
    generalized printout in test

  mysql-test/t/not_embedded_server.test
    1.3 05/08/16 13:39:39 tomas@stripped +3 -0
    show process list differs if ndb is running, disable test if ndb is running

  mysql-test/r/sp-prelocking.result
    1.3 05/08/16 13:39:39 tomas@stripped +1 -0
    added missing drop of a view at end of the test

  mysql-test/r/rpl_slave_status.result
    1.4 05/08/16 13:39:39 tomas@stripped +1 -1
    generalized printout in test

  mysql-test/r/ndb_config.result
    1.3 05/08/16 13:39:39 tomas@stripped +4 -4
    config change

  mysql-test/mysql-test-run.sh
    1.276 05/08/16 13:39:39 tomas@stripped +1 -1
    hide printout at ndb slave restart

# 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:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325-a

--- 1.275/mysql-test/mysql-test-run.sh	2005-07-24 00:55:29 +02:00
+++ 1.276/mysql-test/mysql-test-run.sh	2005-08-16 13:39:39 +02:00
@@ -1333,7 +1333,7 @@
       cd $MYSQL_TEST_DIR
       ./ndb/ndbcluster $NDBCLUSTER_OPTS_SLAVE \
                      --initial --small --diskless --ndbd-nodes=1 \
-                     || NDB_SLAVE_STATUS_OK=0
+                      > /dev/null 2>&1 || NDB_SLAVE_STATUS_OK=0
       cd $savedir
       if [ x$NDB_SLAVE_STATUS_OK != x1 ] ; then
         if [ x$FORCE != x1 ] ; then

--- 1.2/mysql-test/r/ndb_config.result	2005-07-26 09:06:33 +02:00
+++ 1.3/mysql-test/r/ndb_config.result	2005-08-16 13:39:39 +02:00
@@ -1,5 +1,5 @@
-ndbd,1,localhost ndbd,2,localhost ndb_mgmd,3,localhost mysqld,4, mysqld,5, mysqld,6, mysqld,7,
-1,localhost,41943040,12582912 2,localhost,41943040,12582912
-1 localhost 41943040 12582912
-2 localhost 41943040 12582912
+ndbd,1,localhost ndbd,2,localhost ndb_mgmd,3,localhost mysqld,4, mysqld,5, mysqld,6, mysqld,7, mysqld,8, mysqld,9, mysqld,10, mysqld,11,
+1,localhost,10485760,1048576 2,localhost,10485760,1048576
+1 localhost 10485760 1048576
+2 localhost 10485760 1048576
 1 2

--- 1.204/sql/ha_ndbcluster.cc	2005-08-15 18:50:55 +02:00
+++ 1.205/sql/ha_ndbcluster.cc	2005-08-16 13:39:39 +02:00
@@ -5194,10 +5194,15 @@
     file_name= hash_element(&ndb_tables, i);
     if (!hash_search(&ok_tables, file_name, strlen(file_name)))
     {
-      DBUG_PRINT("info", ("%s must be discovered", file_name));
-      // File is in list of ndb tables and not in ok_tables
-      // This table need to be created
-      create_list.push_back(thd->strdup(file_name));
+      strxnmov(name,sizeof(name),
+	       mysql_data_home,"/",db,"/",file_name, reg_ext, NullS);
+      if (access(name, F_OK))
+      {
+	DBUG_PRINT("info", ("%s must be discovered", file_name));
+	// File is in list of ndb tables and not in ok_tables
+	// This table need to be created
+	create_list.push_back(thd->strdup(file_name));
+      }
     }
   }
 

--- 1.2/mysql-test/t/not_embedded_server.test	2005-07-28 02:21:45 +02:00
+++ 1.3/mysql-test/t/not_embedded_server.test	2005-08-16 13:39:39 +02:00
@@ -4,6 +4,9 @@
 
 -- source include/not_embedded.inc
 
+# show full processlist will yield different result with ndb
+-- source include/not_ndb.inc
+
 #
 # Show full process list with prepare
 # To not show other connections, this must be the first test and we must

--- 1.3/mysql-test/r/rpl_slave_status.result	2005-08-03 22:12:03 +02:00
+++ 1.4/mysql-test/r/rpl_slave_status.result	2005-08-16 13:39:39 +02:00
@@ -34,7 +34,7 @@
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_Table	
+Replicate_Ignore_Table	#
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
 Last_Errno	0

--- 1.3/mysql-test/t/rpl_slave_status.test	2005-08-03 21:08:00 +02:00
+++ 1.4/mysql-test/t/rpl_slave_status.test	2005-08-16 13:39:39 +02:00
@@ -23,7 +23,7 @@
 stop slave;
 start slave;
 --replace_result $MASTER_MYPORT MASTER_MYPORT
---replace_column 7 # 8 # 9 # 22 # 23 #
+--replace_column 7 # 8 # 9 # 16 # 22 # 23 #
 --vertical_results
 show slave status;
 

--- 1.2/mysql-test/r/sp-prelocking.result	2005-08-03 05:37:27 +02:00
+++ 1.3/mysql-test/r/sp-prelocking.result	2005-08-16 13:39:39 +02:00
@@ -213,3 +213,4 @@
 drop function f2;
 drop function f3;
 drop procedure sp1;
+drop view v1;

--- 1.2/mysql-test/t/sp-prelocking.test	2005-08-03 05:37:27 +02:00
+++ 1.3/mysql-test/t/sp-prelocking.test	2005-08-16 13:39:39 +02:00
@@ -239,4 +239,4 @@
 drop function f2;
 drop function f3;
 drop procedure sp1;
-
+drop view v1;