Commit 97243651 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
parents 6a1e7d8c 74d84bc8

mysql-test/r/ndb_basic.result

+1 −1
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ c125 int, 
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,

mysql-test/t/ndb_basic.test

+4 −2
Original line number Diff line number Diff line
@@ -404,7 +404,9 @@ drop table t1; 
#

# 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 @@ c125 int, 
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;



#

sql/sql_base.cc

+10 −0
Original line number Diff line number Diff line
@@ -3912,8 +3912,18 @@ Field *find_field_in_table_sef(TABLE *table, const char *name) 
{

  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))