Added support for hex strings to mysqlimport

A lot of new tests to mysqltest
Fixed bug with BDB tables and autocommit


BitKeeper/deleted/.del-delete.test~389410e29f2cebe5:
  Delete: mysql-test/t/delete.test
BitKeeper/deleted/.del-delete.result~e866a6678e29f186:
  Delete: mysql-test/r/delete.result
BitKeeper/deleted/.del-sel000014.test~74cb8c70f1d73fcc:
  Delete: mysql-test/t/sel000014.test
BitKeeper/deleted/.del-sel000015.test~7442bf9cbc96fe07:
  Delete: mysql-test/t/sel000015.test
BitKeeper/deleted/.del-sel000016.test~f495235f14c47ec:
  Delete: mysql-test/t/sel000016.test
BitKeeper/deleted/.del-sel000017.test~7c39f2b45a6aa780:
  Delete: mysql-test/t/sel000017.test
BitKeeper/deleted/.del-sel000018.test~16207f3ad74de75e:
  Delete: mysql-test/t/sel000018.test
BitKeeper/deleted/.del-sel000014.result~fc8de0ec89d9e35:
  Delete: mysql-test/r/sel000014.result
BitKeeper/deleted/.del-sel000015.result~cadbc52051d47bac:
  Delete: mysql-test/r/sel000015.result
BitKeeper/deleted/.del-sel000016.result~6177851869bd5b07:
  Delete: mysql-test/r/sel000016.result
BitKeeper/deleted/.del-sel000017.result~84ebf147850ff31c:
  Delete: mysql-test/r/sel000017.result
BitKeeper/deleted/.del-sel000018.result~562ac9094cf53aba:
  Delete: mysql-test/r/sel000018.result
BitKeeper/deleted/.del-sel000005.test~982fde89a4d6d886:
  Delete: mysql-test/t/sel000005.test
BitKeeper/deleted/.del-sel000006.test~291cc6c8d85e51df:
  Delete: mysql-test/t/sel000006.test
BitKeeper/deleted/.del-sel000005.result~d5410bb765199cc5:
  Delete: mysql-test/r/sel000005.result
BitKeeper/deleted/.del-sel000006.result~d38004d1acfc11a5:
  Delete: mysql-test/r/sel000006.result
BitKeeper/deleted/.del-sel000004.test~daf9ad4a1a31cd3c:
  Delete: mysql-test/t/sel000004.test
BitKeeper/deleted/.del-sel000007.test~f431e4f4739a24c3:
  Delete: mysql-test/t/sel000007.test
BitKeeper/deleted/.del-sel000008.test~b338ef585cadf7ae:
  Delete: mysql-test/t/sel000008.test
BitKeeper/deleted/.del-sel000009.test~a455c38f5c942cd1:
  Delete: mysql-test/t/sel000009.test
BitKeeper/deleted/.del-sel000010.test~ca07085ae92255f1:
  Delete: mysql-test/t/sel000010.test
BitKeeper/deleted/.del-sel000011.test~c2a971726c9d18d6:
  Delete: mysql-test/t/sel000011.test
BitKeeper/deleted/.del-sel000012.test~ae64bff363c42e92:
  Delete: mysql-test/t/sel000012.test
BitKeeper/deleted/.del-sel000013.test~ce8aa504ba4f74ba:
  Delete: mysql-test/t/sel000013.test
BitKeeper/deleted/.del-sel000019.test~8fd63c8dc6be8dbc:
  Delete: mysql-test/t/sel000019.test
BitKeeper/deleted/.del-sel000020.test~c5758ad18a6dff1e:
  Delete: mysql-test/t/sel000020.test
BitKeeper/deleted/.del-sel000021.test~94dd47de2872264a:
  Delete: mysql-test/t/sel000021.test
BitKeeper/deleted/.del-sel000022.test~6e3e5435e66875e9:
  Delete: mysql-test/t/sel000022.test
BitKeeper/deleted/.del-sel000023.test~7bdfcfaa278f837d:
  Delete: mysql-test/t/sel000023.test
BitKeeper/deleted/.del-sel000024.test~849f47e6cbdc4fe3:
  Delete: mysql-test/t/sel000024.test
BitKeeper/deleted/.del-sel000025.test~65b32b4b67e4c77:
  Delete: mysql-test/t/sel000025.test
BitKeeper/deleted/.del-sel000026.test~d8aa2d614f23b1:
  Delete: mysql-test/t/sel000026.test
BitKeeper/deleted/.del-sel000027.test~ab44bb57a580de9:
  Delete: mysql-test/t/sel000027.test
BitKeeper/deleted/.del-sel000028.test~db9bfc0a808fb629:
  Delete: mysql-test/t/sel000028.test
BitKeeper/deleted/.del-sel000029.test~6aae34dbb3ee86d9:
  Delete: mysql-test/t/sel000029.test
BitKeeper/deleted/.del-sel000030.test~a29683eac3e7b706:
  Delete: mysql-test/t/sel000030.test
BitKeeper/deleted/.del-sel000004.result~1f8d1265be521c17:
  Delete: mysql-test/r/sel000004.result
BitKeeper/deleted/.del-sel000007.result~df455e49f9727c4f:
  Delete: mysql-test/r/sel000007.result
BitKeeper/deleted/.del-sel000008.result~67a459ff62c84d6a:
  Delete: mysql-test/r/sel000008.result
BitKeeper/deleted/.del-sel000009.result~e042b35ab131fb3:
  Delete: mysql-test/r/sel000009.result
BitKeeper/deleted/.del-sel000010.result~eee5b9631a1e0066:
  Delete: mysql-test/r/sel000010.result
BitKeeper/deleted/.del-sel000011.result~6907fe356973ed25:
  Delete: mysql-test/r/sel000011.result
BitKeeper/deleted/.del-sel000012.result~be18991fc28954c2:
  Delete: mysql-test/r/sel000012.result
BitKeeper/deleted/.del-sel000013.result~513389e06c96af73:
  Delete: mysql-test/r/sel000013.result
BitKeeper/deleted/.del-sel000019.result~2870fe1c4998d929:
  Delete: mysql-test/r/sel000019.result
BitKeeper/deleted/.del-sel000020.result~faa670294ef5fa91:
  Delete: mysql-test/r/sel000020.result
BitKeeper/deleted/.del-sel000021.result~8f0ce4ec26e0c21d:
  Delete: mysql-test/r/sel000021.result
BitKeeper/deleted/.del-sel000022.result~34828a43753ee767:
  Delete: mysql-test/r/sel000022.result
BitKeeper/deleted/.del-sel000023.result~13e112d77573bf17:
  Delete: mysql-test/r/sel000023.result
BitKeeper/deleted/.del-sel000024.result~b10d449624f48d07:
  Delete: mysql-test/r/sel000024.result
BitKeeper/deleted/.del-sel000025.result~f31e08fcca805f35:
  Delete: mysql-test/r/sel000025.result
BitKeeper/deleted/.del-sel000026.result~854fa951666b7982:
  Delete: mysql-test/r/sel000026.result
BitKeeper/deleted/.del-sel000027.result~cfd73fe738f27da:
  Delete: mysql-test/r/sel000027.result
BitKeeper/deleted/.del-sel000028.result~13ff5add6ac24908:
  Delete: mysql-test/r/sel000028.result
BitKeeper/deleted/.del-sel000029.result~c6d071781808aa26:
  Delete: mysql-test/r/sel000029.result
BitKeeper/deleted/.del-sel000030.result~98d496948e15064d:
  Delete: mysql-test/r/sel000030.result
BitKeeper/deleted/.del-alt000001.test~633aed61c4bad94c:
  Delete: mysql-test/t/alt000001.test
BitKeeper/deleted/.del-alt000001.result~393103dbf15f35c9:
  Delete: mysql-test/r/alt000001.result
BitKeeper/deleted/.del-mrg000001.dummy.result~bf7e6d609f22b897:
  Delete: mysql-test/r/mrg000001.dummy.result
BitKeeper/deleted/.del-mrg000001.result~db2ef2e717ab8332:
  Delete: mysql-test/r/mrg000001.result
BitKeeper/deleted/.del-mrg000002.result~745be0854aaaaf5e:
  Delete: mysql-test/r/mrg000002.result
BitKeeper/deleted/.del-mrg000001.test~e0327f9d1e6cb4e:
  Delete: mysql-test/t/mrg000001.test
BitKeeper/deleted/.del-mrg000002.test~16b3a176adc0f311:
  Delete: mysql-test/t/mrg000002.test
Docs/manual.texi:
  Changelog
client/mysqlimport.c:
  Added support for hex strings
client/mysqltest.c:
  Added linenumbers in output
  Only allow '{' first on a row (Conflicts with ODBC {} syntax).
  Handle bigger queries.
  Handle double ''
  Truncate result files.
mysql-test/mysql-test-run.sh:
  Added --verbose
  cleanup
mysql-test/r/bdb.result:
  Updating of test
mysql-test/r/func_crypt.result:
  Updating of test
mysql-test/r/func_equal.result:
  Updating of test
mysql-test/r/func_str.result:
  Updating of test
mysql-test/r/ins000001.result:
  Updating of test
mysql-test/t/bdb.test:
  Updating of test
mysql-test/t/err000001.test:
  Updating of test
mysql-test/t/func_crypt.test:
  Updating of test
mysql-test/t/func_equal.test:
  Updating of test
mysql-test/t/func_str.test:
  Updating of test
mysql-test/t/ins000001.test:
  Updating of test
sql/gen_lex_hash.cc:
  Smaller table
sql/handler.cc:
  Fixed bug in auto_commit

1 files changed, 146 insertions, 0 deletions

diff --git a/mysql-test/t/key.test b/mysql-test/t/key.test
new file mode 100644
index 00000000000..4be459b0bb7
--- /dev/null
+++ b/mysql-test/t/key.test
@@ -0,0 +1,146 @@
+#
+# This failed for Elizabeth Mattijsen
+#
+
+drop table if exists t1,t2,t3;
+CREATE TABLE t1 (
+  ID CHAR(32) NOT NULL,
+  name CHAR(32) NOT NULL,
+  value CHAR(255),
+  INDEX indexIDname (ID(8),name(8))
+) ;
+
+INSERT INTO t1 VALUES
+('keyword','indexdir','/export/home/local/www/database/indexes/keyword');
+INSERT INTO t1 VALUES ('keyword','urlprefix','text/ /text');
+INSERT INTO t1 VALUES ('keyword','urlmap','/text/ /');
+INSERT INTO t1 VALUES ('keyword','attr','personal employee company');
+INSERT INTO t1 VALUES
+('emailgids','indexdir','/export/home/local/www/database/indexes/emailgids');
+INSERT INTO t1 VALUES ('emailgids','urlprefix','text/ /text');
+INSERT INTO t1 VALUES ('emailgids','urlmap','/text/ /');
+INSERT INTO t1 VALUES ('emailgids','attr','personal employee company');
+
+SELECT value FROM t1 WHERE ID='emailgids' AND name='attr';
+
+drop table t1;
+
+#
+# Problem with many key parts and many or
+#
+
+CREATE TABLE t1 (
+  price int(5) DEFAULT '0' NOT NULL,
+  area varchar(40) DEFAULT '' NOT NULL,
+  type varchar(40) DEFAULT '' NOT NULL,
+  transityes enum('Y','N') DEFAULT 'Y' NOT NULL,
+  shopsyes enum('Y','N') DEFAULT 'Y' NOT NULL,
+  schoolsyes enum('Y','N') DEFAULT 'Y' NOT NULL,
+  petsyes enum('Y','N') DEFAULT 'Y' NOT NULL,
+  KEY price (price,area,type,transityes,shopsyes,schoolsyes,petsyes)
+);
+
+INSERT INTO t1 VALUES (900,'Vancouver','Shared/Roomate','N','N','N','N');
+INSERT INTO t1 VALUES (900,'Vancouver','Shared/Roomate','N','N','N','N');
+INSERT INTO t1 VALUES (900,'Vancouver','Shared/Roomate','','','','');
+INSERT INTO t1 VALUES (900,'Vancouver','Shared/Roomate','Y','Y','Y','Y');
+INSERT INTO t1 VALUES (900,'Vancouver','Shared/Roomate','Y','Y','Y','Y');
+INSERT INTO t1 VALUES (900,'Vancouver','Shared/Roomate','Y','Y','Y','Y');
+INSERT INTO t1 VALUES (900,'Vancouver','Shared/Roomate','Y','Y','Y','Y');
+INSERT INTO t1 VALUES (900,'Vancouver','Shared/Roomate','Y','Y','Y','Y');
+
+ SELECT * FROM t1 WHERE area='Vancouver' and transityes='y' and schoolsyes='y' and ( ((type='1 Bedroom' or type='Studio/Bach') and (price<=500)) or ((type='2 Bedroom') and (price<=550)) or ((type='Shared/Roomate') and (price<=300)) or ((type='Room and Board') and (price<=500)) ) and price <= 400;
+
+drop table t1;
+
+#
+# problem med primary key
+#
+
+CREATE TABLE t1 (program enum('signup','unique','sliding') not null,  type enum('basic','sliding','signup'),  sites set('mt'),  PRIMARY KEY (program));
+# The following should give an error for wrong primary key
+!$1171 ALTER TABLE t1 modify program enum('signup','unique','sliding');
+drop table t1;
+
+#
+# Test of compressed decimal index.
+#
+
+CREATE TABLE t1 (
+  name varchar(50) DEFAULT '' NOT NULL,
+  author varchar(50) DEFAULT '' NOT NULL,
+  category decimal(10,0) DEFAULT '0' NOT NULL,
+  email varchar(50),
+  password varchar(50),
+  proxy varchar(50),
+  bitmap varchar(20),
+  msg varchar(255),
+  urlscol varchar(127),
+  urlhttp varchar(127),
+  timeout decimal(10,0),
+  nbcnx decimal(10,0),
+  creation decimal(10,0),
+  livinguntil decimal(10,0),
+  lang decimal(10,0),
+  type decimal(10,0),
+  subcat decimal(10,0),
+  subtype decimal(10,0),
+  reg char(1),
+  scs varchar(255),
+  capacity decimal(10,0),
+  userISP varchar(50),
+  CCident varchar(50) DEFAULT '' NOT NULL,
+  PRIMARY KEY (name,author,category)
+);
+INSERT INTO t1 VALUES
+('patnom','patauteur',0,'p.favre@cryo-networks.fr',NULL,NULL,'#p2sndnq6ae5g1u6t','essai\nsalut','scol://195.242.78.119:patauteur.patnom',NULL,NULL,NULL,950036174,-882087474,NULL,3,0,3,'1','Pub/patnom/futur_divers.scs',NULL,'pat','CC1');
+INSERT INTO t1 VALUES
+('LeNomDeMonSite','Marc',0,'m.barilley@cryo-networks.fr',NULL,NULL,NULL,NULL,'scol://195.242.78.119:Marc.LeNomDeMonSite',NULL,NULL,NULL,950560434,-881563214,NULL,3,0,3,'1','Pub/LeNomDeMonSite/domus_hibere.scs',NULL,'Marq','CC1');
+select * from t1 where name='patnom' and author='patauteur' and category=0;
+drop table t1;
+
+#
+# Problem with search on partial index
+#
+
+create table t1
+(
+  name_id int not null auto_increment,
+  name blob,
+  INDEX name_idx (name(5)),
+  primary key (name_id)
+);
+
+INSERT t1 VALUES(NULL,'/');
+INSERT t1 VALUES(NULL,'[T,U]_axpby');         
+SELECT * FROM t1 WHERE name='[T,U]_axpy';
+SELECT * FROM t1 WHERE name='[T,U]_axpby';
+create table t2
+(
+  name_id int not null auto_increment,
+  name char(255) binary,
+  INDEX name_idx (name(5)),
+  primary key (name_id)
+);
+INSERT t2 select * from t1;
+SELECT * FROM t2 WHERE name='[T,U]_axpy';
+SELECT * FROM t2 WHERE name='[T,U]_axpby';
+drop table t1,t2;
+
+#
+# Test bug with long primary key
+#
+
+create table t1
+(
+   SEQNO                         numeric(12 ) not null,
+   MOTYPEID                 numeric(12 ) not null,
+   MOINSTANCEID     numeric(12 ) not null,
+   ATTRID                       numeric(12 ) not null,
+   VALUE                         varchar(120) not null,
+   primary key (SEQNO, MOTYPEID, MOINSTANCEID, ATTRID, VALUE )
+);
+INSERT INTO t1 VALUES (1, 1, 1, 1, 'a'); 
+INSERT INTO t1 VALUES (1, 1, 1, 1, 'b'); 
+!$1062 INSERT INTO t1 VALUES (1, 1, 1, 1, 'a');
+drop table t1;