Commit 96929f72 authored by unknown's avatar unknown
Browse files

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


configure.in:
  Auto merged
parents facda8f3 eb865dc6

configure.in

+2 −1
Original line number Diff line number Diff line
@@ -1144,7 +1144,8 @@ dnl Is this the right match for DEC OSF on alpha? 
      # gethostbyname_r is deprecated and doesn't work ok on OSF1

      CFLAGS="$CFLAGS -DUNDEF_HAVE_GETHOSTBYNAME_R"

      CXXFLAGS="$CXXFLAGS -DUNDEF_HAVE_GETHOSTBYNAME_R"

      ndb_cxxflags_fix="$ndb_cxxflags_fix -I/usr/include.dtk"

      # fix to handle include of <stdint.h> correctly on OSF1 with cxx compiler

      CXXFLAGS="$CXXFLAGS -I/usr/include/cxx -I/usr/include/cxx_cname -I/usr/include -I/usr/include.dtk"

    ;;

  *netware*)

    # No need for curses library so set it to null

mysql-test/r/ndb_basic.result

+147 −0
Original line number Diff line number Diff line
@@ -414,3 +414,150 @@ select * from t1 where b IS NOT NULL; 
a	b

1	

drop table t1;

create table t1 (

c1 int,

c2 int,

c3 int,

c4 int,

c5 int,

c6 int,

c7 int,

c8 int,

c9 int,

c10 int,

c11 int,

c12 int,

c13 int,

c14 int,

c15 int,

c16 int,

c17 int,

c18 int,

c19 int,

c20 int,

c21 int,

c22 int,

c23 int,

c24 int,

c25 int,

c26 int,

c27 int,

c28 int,

c29 int,

c30 int,

c31 int,

c32 int,

c33 int,

c34 int,

c35 int,

c36 int,

c37 int,

c38 int,

c39 int,

c40 int,

c41 int,

c42 int,

c43 int,

c44 int,

c45 int,

c46 int,

c47 int,

c48 int,

c49 int,

c50 int,

c51 int,

c52 int,

c53 int,

c54 int,

c55 int,

c56 int,

c57 int,

c58 int,

c59 int,

c60 int,

c61 int,

c62 int,

c63 int,

c64 int,

c65 int,

c66 int,

c67 int,

c68 int,

c69 int,

c70 int,

c71 int,

c72 int,

c73 int,

c74 int,

c75 int,

c76 int,

c77 int,

c78 int,

c79 int,

c80 int,

c81 int,

c82 int,

c83 int,

c84 int,

c85 int,

c86 int,

c87 int,

c88 int,

c89 int,

c90 int,

c91 int,

c92 int,

c93 int,

c94 int,

c95 int,

c96 int,

c97 int,

c98 int,

c99 int,

c100 int,

c101 int,

c102 int,

c103 int,

c104 int,

c105 int,

c106 int,

c107 int,

c108 int,

c109 int,

c110 int,

c111 int,

c112 int,

c113 int,

c114 int,

c115 int,

c116 int,

c117 int,

c118 int,

c119 int,

c120 int,

c121 int,

c122 int,

c123 int,

c124 int,

c125 int,

c126 int,

c127 int,

c128 int,

primary key(c1)) engine=ndb;

drop table t1;

create table t1 (

a1234567890123456789012345678901234567890 int primary key,

a12345678901234567890123456789a1234567890 int,

index(a12345678901234567890123456789a1234567890)

) engine=ndb;

show tables;

Tables_in_test

t1

insert into t1 values (1,1),(2,1),(3,1),(4,1),(5,2),(6,1),(7,1);

explain select * from t1 where a12345678901234567890123456789a1234567890=2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	a12345678901234567890123456789a1234567890	a12345678901234567890123456789a1234567890	5	const	10	Using where

select * from t1 where a12345678901234567890123456789a1234567890=2;

a1234567890123456789012345678901234567890	a12345678901234567890123456789a1234567890

5	2

drop table t1;

mysql-test/t/ndb_basic.test

+151 −0
Original line number Diff line number Diff line
@@ -371,3 +371,154 @@ select * from t1 order by b; 
select * from t1 where b IS NULL;

select * from t1 where b IS NOT NULL;

drop table t1;



#

# test the limit of no of attributes in one table

#



create table t1 (

c1 int,

c2 int,

c3 int,

c4 int,

c5 int,

c6 int,

c7 int,

c8 int,

c9 int,

c10 int,

c11 int,

c12 int,

c13 int,

c14 int,

c15 int,

c16 int,

c17 int,

c18 int,

c19 int,

c20 int,

c21 int,

c22 int,

c23 int,

c24 int,

c25 int,

c26 int,

c27 int,

c28 int,

c29 int,

c30 int,

c31 int,

c32 int,

c33 int,

c34 int,

c35 int,

c36 int,

c37 int,

c38 int,

c39 int,

c40 int,

c41 int,

c42 int,

c43 int,

c44 int,

c45 int,

c46 int,

c47 int,

c48 int,

c49 int,

c50 int,

c51 int,

c52 int,

c53 int,

c54 int,

c55 int,

c56 int,

c57 int,

c58 int,

c59 int,

c60 int,

c61 int,

c62 int,

c63 int,

c64 int,

c65 int,

c66 int,

c67 int,

c68 int,

c69 int,

c70 int,

c71 int,

c72 int,

c73 int,

c74 int,

c75 int,

c76 int,

c77 int,

c78 int,

c79 int,

c80 int,

c81 int,

c82 int,

c83 int,

c84 int,

c85 int,

c86 int,

c87 int,

c88 int,

c89 int,

c90 int,

c91 int,

c92 int,

c93 int,

c94 int,

c95 int,

c96 int,

c97 int,

c98 int,

c99 int,

c100 int,

c101 int,

c102 int,

c103 int,

c104 int,

c105 int,

c106 int,

c107 int,

c108 int,

c109 int,

c110 int,

c111 int,

c112 int,

c113 int,

c114 int,

c115 int,

c116 int,

c117 int,

c118 int,

c119 int,

c120 int,

c121 int,

c122 int,

c123 int,

c124 int,

c125 int,

c126 int,

c127 int,

c128 int,

primary key(c1)) engine=ndb;

drop table t1;



#

# test max size of attribute name and truncation

#



create table t1 (

a1234567890123456789012345678901234567890 int primary key,

a12345678901234567890123456789a1234567890 int,

index(a12345678901234567890123456789a1234567890)

) engine=ndb;

show tables;

insert into t1 values (1,1),(2,1),(3,1),(4,1),(5,2),(6,1),(7,1);

explain select * from t1 where a12345678901234567890123456789a1234567890=2;

select * from t1 where a12345678901234567890123456789a1234567890=2;

drop table t1;

ndb/include/kernel/ndb_limits.h

+5 −0
Original line number Diff line number Diff line
@@ -117,4 +117,9 @@ 
 */

#define NDB_BLOB_HEAD_SIZE 2        /* sizeof(NdbBlob::Head) >> 2 */



/*

 * Long signals

 */

#define NDB_SECTION_SEGMENT_SZ 60



#endif

ndb/include/ndbapi/ndbapi_limits.h

+5 −4
Original line number Diff line number Diff line
@@ -22,12 +22,13 @@ 
#define NDB_MAX_DATABASE_NAME_SIZE 128

#define NDB_MAX_SCHEMA_NAME_SIZE 128

#define NDB_MAX_TAB_NAME_SIZE 128

#define NDB_MAX_ATTRIBUTES_IN_TABLE 91

#define NDB_MAX_ATTR_NAME_SIZE 32

#define NDB_MAX_ATTRIBUTES_IN_TABLE 128



#define NDB_MAX_TUPLE_SIZE_IN_WORDS 1023

#define NDB_MAX_TUPLE_SIZE_IN_WORDS 2013

#define NDB_MAX_KEYSIZE_IN_WORDS 1023

#define NDB_MAX_KEY_SIZE NDB_MAX_KEYSIZE_IN_WORDS*sizeof(Uint32)

#define NDB_MAX_TUPLE_SIZE NDB_MAX_TUPLE_SIZE_IN_WORDS*sizeof(uint32)

#define NDB_MAX_KEY_SIZE (NDB_MAX_KEYSIZE_IN_WORDS*4)

#define NDB_MAX_TUPLE_SIZE (NDB_MAX_TUPLE_SIZE_IN_WORDS*4)

#define NDB_MAX_ACTIVE_EVENTS 100



#endif