Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unification

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-recentcommmerge


BitKeeper/deleted/.del-ha_berkeley.cc:
  Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Auto merged
BitKeeper/triggers/post-commit:
  Auto merged
client/mysqlcheck.c:
  Auto merged
include/config-win.h:
  Auto merged
include/my_dbug.h:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/r/func_in.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/information_schema_db.result:
  Auto merged
mysql-test/t/func_in.test:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/table.h:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
storage/ndb/src/common/util/File.cpp:
  Auto merged
configure.in:
  Manual merge.
sql/CMakeLists.txt:
  Manual merge.
sql/mysql_priv.h:
  Manual merge.
sql/mysqld.cc:
  Manual merge.
sql/set_var.cc:
  Manual merge.
sql/slave.cc:
  Manual merge.
sql/sql_cache.cc:
  Manual merge.
sql/sql_class.cc:
  Manual merge.
sql/sql_lex.h:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
sql/sql_select.cc:
  Manual merge.
sql/sql_show.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
sql/sql_update.cc:
  Manual merge.
sql/sql_yacc.yy:
  Manual merge.

1 files changed, 0 insertions, 224 deletions

diff --git a/mysql-test/r/ndb_bitfield.result b/mysql-test/r/ndb_bitfield.result
deleted file mode 100644
index 59c4d420b22..00000000000
--- a/mysql-test/r/ndb_bitfield.result
+++ /dev/null
@@ -1,224 +0,0 @@
-drop table if exists t1;
-create table t1 (
-pk1 int not null primary key,
-b bit(64)
-) engine=ndbcluster;
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `pk1` int(11) NOT NULL,
-  `b` bit(64) DEFAULT NULL,
-  PRIMARY KEY (`pk1`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1
-insert into t1 values 
-(0,b'1111111111111111111111111111111111111111111111111111111111111111'),
-(1,b'1000000000000000000000000000000000000000000000000000000000000000'),
-(2,b'0000000000000000000000000000000000000000000000000000000000000001'),
-(3,b'1010101010101010101010101010101010101010101010101010101010101010'),
-(4,b'0101010101010101010101010101010101010101010101010101010101010101');
-select hex(b) from t1 order by pk1;
-hex(b)
-FFFFFFFFFFFFFFFF
-8000000000000000
-1
-AAAAAAAAAAAAAAAA
-5555555555555555
-drop table t1;
-create table t1 (
-pk1 int not null primary key,
-b bit(9)
-) engine=ndbcluster;
-insert into t1 values 
-(0,b'000000000'),
-(1,b'000000001'),
-(2,b'000000010'),
-(3,b'000000011'),
-(4,b'000000100');
-select hex(b) from t1 order by pk1;
-hex(b)
-0
-1
-2
-3
-4
-update t1 set b = b + b'101010101';
-select hex(b) from t1 order by pk1;
-hex(b)
-155
-156
-157
-158
-159
-drop table t1;
-create table t1 (a bit(7), b bit(9)) engine = ndbcluster;
-insert into t1 values 
-(94, 46), (31, 438), (61, 152), (78, 123), (88, 411), (122, 118), (0, 177),    
-(75, 42), (108, 67), (79, 349), (59, 188), (68, 206), (49, 345), (118, 380),   
-(111, 368), (94, 468), (56, 379), (77, 133), (29, 399), (9, 363), (23, 36),    
-(116, 390), (119, 368), (87, 351), (123, 411), (24, 398), (34, 202), (28, 499),
-(30, 83), (5, 178), (60, 343), (4, 245), (104, 280), (106, 446), (127, 403),   
-(44, 307), (68, 454), (57, 135);
-select a+0 from t1 order by a;
-a+0
-0
-4
-5
-9
-23
-24
-28
-29
-30
-31
-34
-44
-49
-56
-57
-59
-60
-61
-68
-68
-75
-77
-78
-79
-87
-88
-94
-94
-104
-106
-108
-111
-116
-118
-119
-122
-123
-127
-select b+0 from t1 order by b;
-b+0
-36
-42
-46
-67
-83
-118
-123
-133
-135
-152
-177
-178
-188
-202
-206
-245
-280
-307
-343
-345
-349
-351
-363
-368
-368
-379
-380
-390
-398
-399
-403
-411
-411
-438
-446
-454
-468
-499
-drop table t1;
-create table t1 (
-dummyKey INTEGER NOT NULL,
-a001 TINYINT,
-a010 TINYINT,
-a012 TINYINT,
-a015 TINYINT,
-a016 TINYINT,
-a017 TINYINT,
-a019 TINYINT,
-a029 TINYINT,
-a030 TINYINT,
-a031 TINYINT,
-a032 TINYINT,
-a042 TINYINT,
-a043 TINYINT,
-a044 TINYINT,
-a3001 TINYINT,
-a3002 TINYINT,
-a3003 TINYINT,
-a3004 TINYINT,
-a3005 TINYINT,
-a3021 TINYINT,
-a3022 TINYINT,
-a BIT(6),
-b BIT(6),
-c BIT(6),
-d TINYINT,
-e TINYINT,
-f TINYINT,
-g TINYINT,
-h TINYINT,
-i TINYINT,
-j TINYINT,
-k TINYINT,
-l TINYINT,
-m TINYINT,
-n TINYINT,
-o TINYINT,
-a034 TINYINT,
-PRIMARY KEY USING HASH (dummyKey) ) engine=ndb;
-INSERT INTO `t1` VALUES
-(1,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'000001',b'111111',b'111110',4,5,5,5,5,5,5,5,5,5,3,2,1),
-(2,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'000010',b'000000',b'111101',4,5,5,5,5,5,5,5,5,5,3,2,1),
-(3,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'000100',b'001111',b'111011',4,5,5,5,5,5,5,5,5,5,3,2,1),
-(4,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'001000',b'110000',b'110111',4,5,5,5,5,5,5,5,5,5,3,2,1),
-(5,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'010000',b'100001',b'101111',4,5,5,5,5,5,5,5,5,5,3,2,1),
-(6,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'100000',b'010010',b'011111',4,5,5,5,5,5,5,5,5,5,3,2,1),
-(7,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'000000',b'001100',b'111111',4,5,5,5,5,5,5,5,5,5,3,2,1),
-(8,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'111111',b'000000',b'000000',4,5,5,5,5,5,5,5,5,5,3,2,1);
-INSERT INTO `t1` VALUES (1,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x01,0x3F,0x3E,4,5,5,5,5,5,5,5,5,5,3,2,1);
-INSERT INTO `t1` VALUES (2,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x02,0x00,0x3D,4,5,5,5,5,5,5,5,5,5,3,2,1);
-INSERT INTO `t1` VALUES (3,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x04,0x0F,0x3B,4,5,5,5,5,5,5,5,5,5,3,2,1);
-INSERT INTO `t1` VALUES (4,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x08,0x30,0x37,4,5,5,5,5,5,5,5,5,5,3,2,1);
-INSERT INTO `t1` VALUES (5,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x10,0x21,0x2F,4,5,5,5,5,5,5,5,5,5,3,2,1);
-INSERT INTO `t1` VALUES (6,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x20,0x12,0x1F,4,5,5,5,5,5,5,5,5,5,3,2,1);
-INSERT INTO `t1` VALUES (7,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x00,0x0C,0x3F,4,5,5,5,5,5,5,5,5,5,3,2,1);
-INSERT INTO `t1` VALUES (8,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x3F,0x00,0x00,4,5,5,5,5,5,5,5,5,5,3,2,1);
-drop table t1;
-create table t1 (
-pk1 bit(9) not null primary key,
-b int
-) engine=ndbcluster;
-ERROR HY000: Can't create table 'test.t1' (errno: 906)
-show warnings;
-Level	Code	Message
-Error	1296	Got error 906 'Unsupported attribute type in index' from NDB
-Error	1005	Can't create table 'test.t1' (errno: 906)
-create table t1 (
-pk1 int not null primary key,
-b bit(9),
-key(b)
-) engine=ndbcluster;
-ERROR HY000: Can't create table 'test.t1' (errno: 906)
-show warnings;
-Level	Code	Message
-Error	1296	Got error 906 'Unsupported attribute type in index' from NDB
-Error	1005	Can't create table 'test.t1' (errno: 906)
-create table t1 (
-pk1 int primary key,
-b bit(32) not null
-) engine=ndbcluster;
-insert into t1 values (1,1);
-drop table t1;