List:Commits« Previous MessageNext Message »
From:tomas Date:February 13 2006 7:34pm
Subject:bk commit into 5.1 tree (tomas:1.2130) BUG#17179
View as plain text  
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.2130 06/02/13 20:34:36 tomas@stripped +3 -0
  Bug #17179  	schema creation fails
  -flag was set on field intable share instead of table

  sql/sql_base.cc
    1.303 06/02/13 20:34:30 tomas@stripped +10 -0
    Bug #17179  	schema creation fails
    -flag was set on field intable share instead of table

  mysql-test/t/ndb_basic.test
    1.39 06/02/13 20:34:30 tomas@stripped +4 -2
    Bug #17179  	schema creation fails

  mysql-test/r/ndb_basic.result
    1.38 06/02/13 20:34:29 tomas@stripped +1 -1
    Bug #17179  	schema creation fails

# 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-new

--- 1.302/sql/sql_base.cc	2006-02-09 21:28:14 +01:00
+++ 1.303/sql/sql_base.cc	2006-02-13 20:34:30 +01:00
@@ -3912,8 +3912,18 @@
 {
   Field **field_ptr;
   if (table->s->name_hash.records)
+  {
     field_ptr= (Field**)hash_search(&table->s->name_hash,(byte*) name,
                                     strlen(name));
+    if (field_ptr)
+    {
+      /*
+        field_ptr points to field in TABLE_SHARE. Convert it to the matching
+        field in table
+      */
+      field_ptr= (table->field + (field_ptr - table->s->field));
+    }
+  }
   else
   {
     if (!(field_ptr= table->field))

--- 1.37/mysql-test/r/ndb_basic.result	2006-02-10 17:54:23 +01:00
+++ 1.38/mysql-test/r/ndb_basic.result	2006-02-13 20:34:29 +01:00
@@ -562,7 +562,7 @@
 c126 int,
 c127 int,
 c128 int,
-primary key(c1)) engine=ndb;
+primary key using hash(c1)) engine=ndb partition by key(c1);
 drop table t1;
 create table t1 (
 a1234567890123456789012345678901234567890 int primary key,

--- 1.38/mysql-test/t/ndb_basic.test	2006-02-10 17:54:23 +01:00
+++ 1.39/mysql-test/t/ndb_basic.test	2006-02-13 20:34:30 +01:00
@@ -404,7 +404,9 @@
 #
 # test the limit of no of attributes in one table
 #
-
+# also tests bug#17179, more than 31 attributes in
+# a partitioned table
+#
 create table t1 (
 c1 int,
 c2 int,
@@ -534,7 +536,7 @@
 c126 int,
 c127 int,
 c128 int,
-primary key(c1)) engine=ndb;
+primary key using hash(c1)) engine=ndb partition by key(c1);
 drop table t1;
 
 #
Thread
bk commit into 5.1 tree (tomas:1.2130) BUG#17179tomas13 Feb