bk commit into 5.1 tree (mskold:1.2324) BUG#24301

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty 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, 2006-11-15 12:05:05+01:00, mskold@stripped +3 -0
  bug #24301  Next command hangs in mysql after creating new NDB table via LIKE operation.: Locked mutex LOCK_open during operation

  mysql-test/r/ndb_basic.result@stripped, 2006-11-15 12:04:54+01:00, mskold@stripped +15 -0
    bug #24301  Next command hangs in mysql after creating new NDB table via LIKE operation.: Locked mutex LOCK_open during operation

  mysql-test/t/ndb_basic.test@stripped, 2006-11-15 12:04:54+01:00, mskold@stripped +9 -0
    bug #24301  Next command hangs in mysql after creating new NDB table via LIKE operation.: Locked mutex LOCK_open during operation

  sql/sql_table.cc@stripped, 2006-11-15 12:04:53+01:00, mskold@stripped +2 -1
    bug #24301  Next command hangs in mysql after creating new NDB table via LIKE operation.: Locked mutex LOCK_open during operation

# 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:	mskold
# Host:	linux.site
# Root:	/windows/Linux_space/MySQL/mysql-5.1-new-ndb

--- 1.372/sql/sql_table.cc	2006-11-15 12:05:14 +01:00
+++ 1.373/sql/sql_table.cc	2006-11-15 12:05:14 +01:00
@@ -4745,8 +4745,9 @@ bool mysql_create_like_table(THD* thd, T
   my_copy(src_path, dst_path, MYF(MY_DONT_OVERWRITE_FILE));
 #endif
   dst_path[dst_path_length - reg_ext_length]= '\0';  // Remove .frm
+  pthread_mutex_lock(&LOCK_open);  
   err= ha_create_table(thd, dst_path, db, table_name, create_info, 1);
-
+  pthread_mutex_unlock(&LOCK_open);
   if (create_info->options & HA_LEX_CREATE_TMP_TABLE)
   {
     if (err || !open_temporary_table(thd, dst_path, db, table_name, 1))

--- 1.46/mysql-test/r/ndb_basic.result	2006-11-15 12:05:15 +01:00
+++ 1.47/mysql-test/r/ndb_basic.result	2006-11-15 12:05:15 +01:00
@@ -758,4 +758,19 @@ c VARCHAR(255) NOT NULL,
 CONSTRAINT pk_b_c_id PRIMARY KEY (b,c),
 CONSTRAINT fk_a FOREIGN KEY(a) REFERENCES t1(a))engine=ndb;
 drop table t1, t2;
+create table t1 (a int not null primary key, b int) engine=ndb;
+insert into t1 values(1,1),(2,2),(3,3);
+create table t2 like t1;
+insert into t2 select * from t1;
+select * from t1 order by a;
+a	b
+1	1
+2	2
+3	3
+select * from t2 order by a;
+a	b
+1	1
+2	2
+3	3
+drop table t1, t2;
 End of 5.1 tests

--- 1.45/mysql-test/t/ndb_basic.test	2006-11-15 12:05:15 +01:00
+++ 1.46/mysql-test/t/ndb_basic.test	2006-11-15 12:05:15 +01:00
@@ -738,4 +738,13 @@ CREATE TABLE t2(a VARCHAR(255) NOT NULL,
                 CONSTRAINT fk_a FOREIGN KEY(a) REFERENCES t1(a))engine=ndb;
 drop table t1, t2;
 
+# bug#24301
+create table t1 (a int not null primary key, b int) engine=ndb;
+insert into t1 values(1,1),(2,2),(3,3);
+create table t2 like t1;
+insert into t2 select * from t1;
+select * from t1 order by a;
+select * from t2 order by a;
+drop table t1, t2;
+
 --echo End of 5.1 tests