mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
This commit is contained in:
tomas@poseidon.ndb.mysql.com 2006-02-13 20:52:42 +01:00
commit b04be2212f
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/r/ndb_basic.result
View file

@ -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,

6
mysql-test/t/ndb_basic.test
View file

@ -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;
#

10
sql/sql_base.cc
View file

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