bk commit into 5.1 tree (tomas:1.1999) BUG#18614

[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.1999 06/03/29 18:18:50 tomas@stripped +5 -0
  Bug #18614, contn't ndb: mysqld hangs in alter table
  disabled some partitioning related tets that are not needed/used

  sql/ha_ndbcluster.cc
    1.242 06/03/29 18:18:44 tomas@stripped +4 -0
    Bug #18614, contn't ndb: mysqld hangs in alter table

  mysql-test/t/ndb_partition_error.test
    1.4 06/03/29 18:18:44 tomas@stripped +3 -2
    diabled some partitioning related tets that are not needed/used

  mysql-test/t/disabled.def
    1.19 06/03/29 18:18:44 tomas@stripped +1 -0
    diabled some partitioning related tets that are not needed/used

  mysql-test/r/ndb_partition_key.result
    1.6 06/03/29 18:18:44 tomas@stripped +1 -0
    diabled some partitioning related tets that are not needed/used

  mysql-test/r/ndb_partition_error.result
    1.8 06/03/29 18:18:44 tomas@stripped +6 -2
    diabled some partitioning related tets that are not needed/used

# 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/wl2325-alcatel

--- 1.18/mysql-test/t/disabled.def	2005-10-07 14:57:33 +02:00
+++ 1.19/mysql-test/t/disabled.def	2006-03-29 18:18:44 +02:00
@@ -43,3 +43,4 @@
 rpl_sp004:Bug 12857
 rpl_bit_npk:Bug 13418
 rpl_server_id2:fails in wl2325
+ndb_partition_range : disabled range partitioning

--- 1.241/sql/ha_ndbcluster.cc	2006-03-29 16:08:09 +02:00
+++ 1.242/sql/ha_ndbcluster.cc	2006-03-29 18:18:44 +02:00
@@ -5086,11 +5086,13 @@
             attempt to do it
           */
           pthread_mutex_unlock(&ndbcluster_mutex);
+          pthread_mutex_lock(&LOCK_open);
           ndbcluster_create_binlog_setup(ndb, key, elmt.database, elmt.name,
                                          ndb_binlog_thread_running > 0 &&
                                          !is_prefix(elmt.name,
                                                     tmp_file_prefix),
                                          share);
+          pthread_mutex_unlock(&LOCK_open);
         }
         else
           pthread_mutex_unlock(&ndbcluster_mutex);
@@ -5226,9 +5228,11 @@
 	*/
         
         pthread_mutex_unlock(&ndbcluster_mutex);
+        pthread_mutex_lock(&LOCK_open);
         ndbcluster_create_binlog_setup(ndb, name, db, file_name,
                                        !is_prefix(file_name, tmp_file_prefix),
                                        share);
+        pthread_mutex_unlock(&LOCK_open);
         pthread_mutex_lock(&ndbcluster_mutex);
       }
     }

--- 1.5/mysql-test/r/ndb_partition_key.result	2005-10-06 12:47:33 +02:00
+++ 1.6/mysql-test/r/ndb_partition_key.result	2006-03-29 18:18:44 +02:00
@@ -66,6 +66,7 @@
 PRIMARY KEY(a, b, c) - UniqueHashIndex
 
 
+
 NDBT_ProgramExit: 0 - OK
 
 show create table t1;

--- 1.7/mysql-test/r/ndb_partition_error.result	2005-10-20 22:49:38 +02:00
+++ 1.8/mysql-test/r/ndb_partition_error.result	2006-03-29 18:18:44 +02:00
@@ -14,7 +14,7 @@
 ERROR HY000: Can't create table './test/t1.frm' (errno: 140)
 show warnings;
 Level	Code	Message
-Error	1296	Got error 771 'Given NODEGROUP doesn't exist in this cluster' from NDB
+Error	1296	Got error 772 'Given fragmentType doesn't exist' from NDB
 Error	1005	Can't create table './test/t1.frm' (errno: 140)
 CREATE TABLE t1 (
 a int not null,
@@ -27,4 +27,8 @@
 (partition x1 values less than (5),
 partition x2 values less than (10),
 partition x3 values less than (20));
-drop table t1;
+ERROR HY000: Can't create table './test/t1.frm' (errno: 140)
+show warnings;
+Level	Code	Message
+Error	1296	Got error 772 'Given fragmentType doesn't exist' from NDB
+Error	1005	Can't create table './test/t1.frm' (errno: 140)

--- 1.3/mysql-test/t/ndb_partition_error.test	2005-10-19 12:27:05 +02:00
+++ 1.4/mysql-test/t/ndb_partition_error.test	2006-03-29 18:18:44 +02:00
@@ -31,6 +31,8 @@
 #
 # Partition by range, create normal valid table 
 #
+# disabled in this clone
+--error 1005
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -42,5 +44,4 @@
 (partition x1 values less than (5),
  partition x2 values less than (10),
  partition x3 values less than (20));
-
-drop table t1;
+show warnings;