diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-10-16 19:05:10 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-10-16 19:05:10 +0300 |
| commit | 320d4912f4e6318d7ac080692ed780b6f1557e54 (patch) | |
| tree | 66490ad10c369a5769b1adb2c70bad7536a903b3 /mysql-test | |
| parent | 6f38e3083f0d867af8d1499fba92c7eaae295726 (diff) | |
| download | mariadb-git-320d4912f4e6318d7ac080692ed780b6f1557e54.tar.gz | |
Fixes after last merge.
Ignore changed keyblocks when on does DELETE FROM table_name;
acinclude.m4:
Don't give warnings when using openssl installed in /usr/include with gcc 3.x
myisam/mi_delete_all.c:
Ignore changed keyblocks when on does DELETE FROM table_name;
mysql-test/r/null_key.result:
Fix null test
sql/ha_innodb.cc:
Fix bug in last merge
sql/sql_parse.cc:
Fix bug introduced with merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/null_key.result | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/mysql-test/r/null_key.result b/mysql-test/r/null_key.result index 91cd9dbbc7c..bb8531a9fee 100644 --- a/mysql-test/r/null_key.result +++ b/mysql-test/r/null_key.result @@ -188,10 +188,43 @@ id uniq_id 4 2 7 3 8 4 +DROP table t1,t2; +CREATE TABLE `t1` ( +`order_id` char(32) NOT NULL default '', +`product_id` char(32) NOT NULL default '', +`product_type` int(11) NOT NULL default '0', +PRIMARY KEY (`order_id`,`product_id`,`product_type`) +) TYPE=MyISAM; +CREATE TABLE `t2` ( +`order_id` char(32) NOT NULL default '', +`product_id` char(32) NOT NULL default '', +`product_type` int(11) NOT NULL default '0', +PRIMARY KEY (`order_id`,`product_id`,`product_type`) +) TYPE=MyISAM; +INSERT INTO t1 (order_id, product_id, product_type) VALUES +('3d7ce39b5d4b3e3d22aaafe9b633de51',1206029, 3), +('3d7ce39b5d4b3e3d22aaafe9b633de51',5880836, 3), +('9d9aad7764b5b2c53004348ef8d34500',2315652, 3); +INSERT INTO t2 (order_id, product_id, product_type) VALUES +('9d9aad7764b5b2c53004348ef8d34500',2315652, 3); +select t1.* from t1 +left join t2 using(order_id, product_id, product_type) +where t2.order_id=NULL; order_id product_id product_type +select t1.* from t1 +left join t2 using(order_id, product_id, product_type) +where t2.order_id is NULL; order_id product_id product_type 3d7ce39b5d4b3e3d22aaafe9b633de51 1206029 3 3d7ce39b5d4b3e3d22aaafe9b633de51 5880836 3 +drop table t1,t2; +create table t1 (id int); +insert into t1 values (null), (0); +create table t2 (id int); +insert into t2 values (null); +select * from t1, t2 where t1.id = t2.id; id id +alter table t1 add key id (id); +select * from t1, t2 where t1.id = t2.id; id id -DROP table t1,t2; +drop table t1,t2; |