summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/func_group.result2
-rw-r--r--mysql-test/r/func_test.result10
-rw-r--r--mysql-test/r/grant.result2
-rw-r--r--mysql-test/r/loaddata.result2
-rw-r--r--mysql-test/r/lowercase_table.result3
-rw-r--r--mysql-test/r/mix_innodb_myisam_binlog.result94
-rw-r--r--mysql-test/r/myisam.result6
-rw-r--r--mysql-test/r/range.result36
-rw-r--r--mysql-test/r/rpl_loaddata.result2
-rw-r--r--mysql-test/r/rpl_loaddata_rule_m.result4
-rw-r--r--mysql-test/r/rpl_loaddata_rule_s.result4
-rw-r--r--mysql-test/r/rpl_log.result19
-rw-r--r--mysql-test/r/union.result8
-rw-r--r--mysql-test/t/lowercase_table.test2
-rw-r--r--mysql-test/t/myisam.test2
-rw-r--r--mysql-test/t/union.test4
16 files changed, 105 insertions, 95 deletions
diff --git a/mysql-test/r/func_group.result b/mysql-test/r/func_group.result
index 8fad9d16dc2..3af75b3c5bc 100644
--- a/mysql-test/r/func_group.result
+++ b/mysql-test/r/func_group.result
@@ -551,7 +551,7 @@ id select_type table type possible_keys key key_len ref rows Extra
explain
select min(a1) from t1 where a1 between a3 and 'KKK';
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 ALL PRIMARY NULL NULL NULL 14 Using where
+1 SIMPLE t1 ALL NULL NULL NULL NULL 14 Using where
explain
select min(a4) from t1 where (a4 + 0.01) between 0.07 and 0.08;
id select_type table type possible_keys key key_len ref rows Extra
diff --git a/mysql-test/r/func_test.result b/mysql-test/r/func_test.result
index a58c26f7507..851c308ba3e 100644
--- a/mysql-test/r/func_test.result
+++ b/mysql-test/r/func_test.result
@@ -1,4 +1,4 @@
-DROP TABLE IF EXISTS t1,t2;
+drop table if exists t1,t2;
select 0=0,1>0,1>=1,1<0,1<=0,1!=0,strcmp("abc","abcd"),strcmp("b","a"),strcmp("a","a") ;
0=0 1>0 1>=1 1<0 1<=0 1!=0 strcmp("abc","abcd") strcmp("b","a") strcmp("a","a")
1 1 1 0 0 1 -1 1 0
@@ -125,10 +125,10 @@ ERROR HY000: Illegal mix of collations (koi8r_general_ci,EXPLICIT) and (koi8r_bi
select _koi8r'a' LIKE _latin1'A';
ERROR HY000: Illegal mix of collations (koi8r_general_ci,COERCIBLE) and (latin1_swedish_ci,COERCIBLE) for operation 'like'
CREATE TABLE t1 ( faq_group_id int(11) NOT NULL default '0', faq_id int(11) NOT NULL default '0', title varchar(240) default NULL, keywords text, description longblob, solution longblob, status tinyint(4) NOT NULL default '0', access_id smallint(6) default NULL, lang_id smallint(6) NOT NULL default '0', created datetime NOT NULL default '0000-00-00 00:00:00', updated datetime default NULL, last_access datetime default NULL, last_notify datetime default NULL, solved_count int(11) NOT NULL default '0', static_solved int(11) default NULL, solved_1 int(11) default NULL, solved_2 int(11) default NULL, solved_3 int(11) default NULL, solved_4 int(11) default NULL, solved_5 int(11) default NULL, expires datetime default NULL, notes text, assigned_to smallint(6) default NULL, assigned_group smallint(6) default NULL, last_edited_by smallint(6) default NULL, orig_ref_no varchar(15) binary default NULL, c$fundstate smallint(6) default NULL, c$contributor smallint(6) default NULL, UNIQUE KEY t1$faq_id (faq_id), KEY t1$group_id$faq_id (faq_group_id,faq_id), KEY t1$c$fundstate (c$fundstate) ) TYPE=MyISAM;
- INSERT INTO t1 VALUES (82,82,'How to use the DynaVox Usage Counts Feature','usages count, number, corner, white, box, button','<as-html>\r\n<table width=\"100%\" border=\"0\">\r\n <tr>\r\n <td width=\"3%\"> </td>\r\n <td width=\"97%\">\r\n <h3><font face=\"Verdana, Arial, Helvetica, sans-serif\" color=\"#000000\">How \r\n To</font><!-- #BeginEditable \"CS_troubleshoot_question\" --><font face=\"Verdana, Arial, Helvetica, sans-serif\" color=\"#000099\"><font color=\"#000000\">: \r\n Display or Hide the Usage Counts to find out how many times each button is being selected. </font></font><!-- #EndEditable --></h3>\r\n </td>\r\n </tr>\r\n</table>','<as-html>\r\n <table width=\"100%\" border=\"0\">\r\n <tr>\r\n <td width=\"3%\"> </td>\r\n \r\n<td width=\"97%\"><!-- #BeginEditable \"CS_troubleshoot_answer\" --> \r\n \r\n<p><font color=\"#000000\" face=\"Verdana, Arial, Helvetica, sans-serif\">1. Select \r\n the <i>On/Setup</i> button to access the DynaVox Setup Menu.<br>\r\n 2. Select <b>Button Features.</b><br>\r\n 3. Below the <b>OK</b> button is the <b>Usage Counts</b> button.<br>\r\n a. If it says \"Hidden\" then the Usage Counts will not be displayed.<br>\r\n b. If it says \"Displayed\" then the Usage Counts will be shown.<br>\r\n c. Select the <b>Usage Counts</b> Option Ring once and it will toggle \r\n to the alternative option.<br>\r\n 4. Once the correct setting has been chosen, select <b>OK</b> to leave the <i>Button \r\n Features</i> menu.<br>\r\n 5. Select <b>OK</b> out of the <i>Setup</i> menu and return to the communication \r\n page.</font></p>\r\n <p><font color=\"#000000\" face=\"Verdana, Arial, Helvetica, sans-serif\">For \r\n further information on <i>Usage Counts,</i> see the <i>Button Features \r\n Menu Entry</i> in the DynaVox/DynaMyte Reference Manual.</font></p>\r\n<!-- #EndEditable --></td>\r\n </tr>\r\n</table>',4,1,1,'2001-11-16 16:43:34','2002-11-25 12:09:43','2003-07-24 01:04:48',NULL,11,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,11,NULL,NULL,NULL);
- CREATE TABLE t2 ( access_id smallint(6) NOT NULL default '0', name varchar(20) binary default NULL, rank smallint(6) NOT NULL default '0', KEY t2$access_id (access_id) ) TYPE=MyISAM;
- INSERT INTO t2 VALUES (1,'Everyone',2),(2,'Help',3),(3,'Customer Support',1);
- SELECT f_acc.rank, a1.rank, a2.rank FROM t1 LEFT JOIN t1 f1 ON (f1.access_id=1 AND f1.faq_group_id = t1.faq_group_id) LEFT JOIN t2 a1 ON (a1.access_id = f1.access_id) LEFT JOIN t1 f2 ON (f2.access_id=3 AND f2.faq_group_id = t1.faq_group_id) LEFT JOIN t2 a2 ON (a2.access_id = f2.access_id), t2 f_acc WHERE LEAST(a1.rank,a2.rank) = f_acc.rank;
+INSERT INTO t1 VALUES (82,82,'How to use the DynaVox Usage Counts Feature','usages count, number, corner, white, box, button','<as-html>\r\n<table width=\"100%\" border=\"0\">\r\n <tr>\r\n <td width=\"3%\"> </td>\r\n <td width=\"97%\">\r\n <h3><font face=\"Verdana, Arial, Helvetica, sans-serif\" color=\"#000000\">How \r\n To</font><!-- #BeginEditable \"CS_troubleshoot_question\" --><font face=\"Verdana, Arial, Helvetica, sans-serif\" color=\"#000099\"><font color=\"#000000\">: \r\n Display or Hide the Usage Counts to find out how many times each button is being selected. </font></font><!-- #EndEditable --></h3>\r\n </td>\r\n </tr>\r\n</table>','<as-html>\r\n <table width=\"100%\" border=\"0\">\r\n <tr>\r\n <td width=\"3%\"> </td>\r\n \r\n<td width=\"97%\"><!-- #BeginEditable \"CS_troubleshoot_answer\" --> \r\n \r\n<p><font color=\"#000000\" face=\"Verdana, Arial, Helvetica, sans-serif\">1. Select \r\n the <i>On/Setup</i> button to access the DynaVox Setup Menu.<br>\r\n 2. Select <b>Button Features.</b><br>\r\n 3. Below the <b>OK</b> button is the <b>Usage Counts</b> button.<br>\r\n a. If it says \"Hidden\" then the Usage Counts will not be displayed.<br>\r\n b. If it says \"Displayed\" then the Usage Counts will be shown.<br>\r\n c. Select the <b>Usage Counts</b> Option Ring once and it will toggle \r\n to the alternative option.<br>\r\n 4. Once the correct setting has been chosen, select <b>OK</b> to leave the <i>Button \r\n Features</i> menu.<br>\r\n 5. Select <b>OK</b> out of the <i>Setup</i> menu and return to the communication \r\n page.</font></p>\r\n <p><font color=\"#000000\" face=\"Verdana, Arial, Helvetica, sans-serif\">For \r\n further information on <i>Usage Counts,</i> see the <i>Button Features \r\n Menu Entry</i> in the DynaVox/DynaMyte Reference Manual.</font></p>\r\n<!-- #EndEditable --></td>\r\n </tr>\r\n</table>',4,1,1,'2001-11-16 16:43:34','2002-11-25 12:09:43','2003-07-24 01:04:48',NULL,11,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,11,NULL,NULL,NULL);
+CREATE TABLE t2 ( access_id smallint(6) NOT NULL default '0', name varchar(20) binary default NULL, rank smallint(6) NOT NULL default '0', KEY t2$access_id (access_id) ) TYPE=MyISAM;
+INSERT INTO t2 VALUES (1,'Everyone',2),(2,'Help',3),(3,'Customer Support',1);
+SELECT f_acc.rank, a1.rank, a2.rank FROM t1 LEFT JOIN t1 f1 ON (f1.access_id=1 AND f1.faq_group_id = t1.faq_group_id) LEFT JOIN t2 a1 ON (a1.access_id = f1.access_id) LEFT JOIN t1 f2 ON (f2.access_id=3 AND f2.faq_group_id = t1.faq_group_id) LEFT JOIN t2 a2 ON (a2.access_id = f2.access_id), t2 f_acc WHERE LEAST(a1.rank,a2.rank) = f_acc.rank;
rank rank rank
2 2 NULL
DROP TABLE t1,t2;
diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result
index 20698852b98..df6f8fe3615 100644
--- a/mysql-test/r/grant.result
+++ b/mysql-test/r/grant.result
@@ -145,7 +145,7 @@ show grants for drop_user@localhost;
Grants for drop_user@localhost
GRANT ALL PRIVILEGES ON *.* TO 'drop_user'@'localhost' WITH GRANT OPTION
GRANT ALL PRIVILEGES ON `test`.* TO 'drop_user'@'localhost' WITH GRANT OPTION
-GRANT SELECT (a) ON `test`.`t1` TO 'drop_user'@'localhost'
+GRANT USAGE ON `test`.`t1` TO 'drop_user'@'localhost'
revoke all privileges, grant from drop_user@localhost;
show grants for drop_user@localhost;
Grants for drop_user@localhost
diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result
index 7d21ede0345..d738431e016 100644
--- a/mysql-test/r/loaddata.result
+++ b/mysql-test/r/loaddata.result
@@ -30,6 +30,8 @@ NULL 2003-03-03 2003-03-03 NULL
drop table t1;
create table t1 (a text, b text);
load data infile '../../std_data/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';
+Warnings:
+Warning 1260 Record count is fewer than the column count at row 3
select concat('|',a,'|'), concat('|',b,'|') from t1;
concat('|',a,'|') concat('|',b,'|')
|Field A| |Field B|
diff --git a/mysql-test/r/lowercase_table.result b/mysql-test/r/lowercase_table.result
index dc5ae633ca5..9c6b212a4b6 100644
--- a/mysql-test/r/lowercase_table.result
+++ b/mysql-test/r/lowercase_table.result
@@ -13,7 +13,8 @@ SELECT T2.id from t1 as T2 LIMIT 1;
id
1
SELECT T2.id from t1 as t2 LIMIT 1;
-Unknown table 'T2' in field list
+id
+1
RENAME TABLE T1 TO T2;
ALTER TABLE T2 ADD new_col int not null;
ALTER TABLE T2 RENAME T3;
diff --git a/mysql-test/r/mix_innodb_myisam_binlog.result b/mysql-test/r/mix_innodb_myisam_binlog.result
index 8a3415a81d0..dd9876b4f90 100644
--- a/mysql-test/r/mix_innodb_myisam_binlog.result
+++ b/mysql-test/r/mix_innodb_myisam_binlog.result
@@ -8,10 +8,10 @@ insert into tm select * from ti;
commit;
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
-master-bin.001 79 Query 1 79 use test; BEGIN
-master-bin.001 119 Query 1 79 use test; insert into ti values(1)
-master-bin.001 178 Query 1 79 use test; insert into tm select * from ti
-master-bin.001 244 Query 1 244 use test; COMMIT
+master-bin.000001 79 Query 1 79 use ; BEGIN
+master-bin.000001 119 Query 1 79 use ; insert into ti values(1)
+master-bin.000001 178 Query 1 79 use ; insert into tm select * from ti
+master-bin.000001 244 Query 1 244 use ; COMMIT
delete from ti;
delete from tm;
reset master;
@@ -22,10 +22,10 @@ rollback;
Warning: Some non-transactional changed tables couldn't be rolled back
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
-master-bin.001 79 Query 1 79 use test; BEGIN
-master-bin.001 119 Query 1 79 use test; insert into ti values(2)
-master-bin.001 178 Query 1 79 use test; insert into tm select * from ti
-master-bin.001 244 Query 1 244 use test; ROLLBACK
+master-bin.000001 79 Query 1 79 use ; BEGIN
+master-bin.000001 119 Query 1 79 use ; insert into ti values(2)
+master-bin.000001 178 Query 1 79 use ; insert into tm select * from ti
+master-bin.000001 244 Query 1 244 use ; ROLLBACK
delete from ti;
delete from tm;
reset master;
@@ -39,13 +39,13 @@ Warning: Some non-transactional changed tables couldn't be rolled back
commit;
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
-master-bin.001 79 Query 1 79 use test; BEGIN
-master-bin.001 119 Query 1 79 use test; insert into ti values(3)
-master-bin.001 178 Query 1 79 use test; savepoint my_savepoint
-master-bin.001 235 Query 1 79 use test; insert into ti values(4)
-master-bin.001 294 Query 1 79 use test; insert into tm select * from ti
-master-bin.001 360 Query 1 79 use test; rollback to savepoint my_savepoint
-master-bin.001 429 Query 1 429 use test; COMMIT
+master-bin.000001 79 Query 1 79 use ; BEGIN
+master-bin.000001 119 Query 1 79 use ; insert into ti values(3)
+master-bin.000001 178 Query 1 79 use ; savepoint my_savepoint
+master-bin.000001 235 Query 1 79 use ; insert into ti values(4)
+master-bin.000001 294 Query 1 79 use ; insert into tm select * from ti
+master-bin.000001 360 Query 1 79 use ; rollback to savepoint my_savepoint
+master-bin.000001 429 Query 1 429 use ; COMMIT
delete from ti;
delete from tm;
reset master;
@@ -64,14 +64,14 @@ a
7
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
-master-bin.001 79 Query 1 79 use test; BEGIN
-master-bin.001 119 Query 1 79 use test; insert into ti values(5)
-master-bin.001 178 Query 1 79 use test; savepoint my_savepoint
-master-bin.001 235 Query 1 79 use test; insert into ti values(6)
-master-bin.001 294 Query 1 79 use test; insert into tm select * from ti
-master-bin.001 360 Query 1 79 use test; rollback to savepoint my_savepoint
-master-bin.001 429 Query 1 79 use test; insert into ti values(7)
-master-bin.001 488 Query 1 488 use test; COMMIT
+master-bin.000001 79 Query 1 79 use ; BEGIN
+master-bin.000001 119 Query 1 79 use ; insert into ti values(5)
+master-bin.000001 178 Query 1 79 use ; savepoint my_savepoint
+master-bin.000001 235 Query 1 79 use ; insert into ti values(6)
+master-bin.000001 294 Query 1 79 use ; insert into tm select * from ti
+master-bin.000001 360 Query 1 79 use ; rollback to savepoint my_savepoint
+master-bin.000001 429 Query 1 79 use ; insert into ti values(7)
+master-bin.000001 488 Query 1 488 use ; COMMIT
delete from ti;
delete from tm;
reset master;
@@ -86,10 +86,10 @@ get_lock("a",10)
1
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
-master-bin.001 79 Query 1 79 use test; BEGIN
-master-bin.001 119 Query 1 79 use test; insert into ti values(8)
-master-bin.001 178 Query 1 79 use test; insert into tm select * from ti
-master-bin.001 244 Query 1 244 use test; ROLLBACK
+master-bin.000001 79 Query 1 79 use ; BEGIN
+master-bin.000001 119 Query 1 79 use ; insert into ti values(8)
+master-bin.000001 178 Query 1 79 use ; insert into tm select * from ti
+master-bin.000001 244 Query 1 244 use ; ROLLBACK
delete from ti;
delete from tm;
reset master;
@@ -97,8 +97,8 @@ insert into ti values(9);
insert into tm select * from ti;
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
-master-bin.001 79 Query 1 79 use test; insert into ti values(9)
-master-bin.001 138 Query 1 138 use test; insert into tm select * from ti
+master-bin.000001 79 Query 1 79 use ; insert into ti values(9)
+master-bin.000001 138 Query 1 138 use ; insert into tm select * from ti
delete from ti;
delete from tm;
reset master;
@@ -107,17 +107,17 @@ begin;
insert into tm select * from ti;
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
-master-bin.001 79 Query 1 79 use test; insert into ti values(10)
-master-bin.001 139 Query 1 139 use test; insert into tm select * from ti
+master-bin.000001 79 Query 1 79 use ; insert into ti values(10)
+master-bin.000001 139 Query 1 139 use ; insert into tm select * from ti
insert into ti values(11);
commit;
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
-master-bin.001 79 Query 1 79 use test; insert into ti values(10)
-master-bin.001 139 Query 1 139 use test; insert into tm select * from ti
-master-bin.001 205 Query 1 205 use test; BEGIN
-master-bin.001 245 Query 1 205 use test; insert into ti values(11)
-master-bin.001 305 Query 1 305 use test; COMMIT
+master-bin.000001 79 Query 1 79 use ; insert into ti values(10)
+master-bin.000001 139 Query 1 139 use ; insert into tm select * from ti
+master-bin.000001 205 Query 1 205 use ; BEGIN
+master-bin.000001 245 Query 1 205 use ; insert into ti values(11)
+master-bin.000001 305 Query 1 305 use ; COMMIT
alter table tm type=INNODB;
delete from ti;
delete from tm;
@@ -128,10 +128,10 @@ insert into tm select * from ti;
commit;
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
-master-bin.001 79 Query 1 79 use test; BEGIN
-master-bin.001 119 Query 1 79 use test; insert into ti values(12)
-master-bin.001 179 Query 1 79 use test; insert into tm select * from ti
-master-bin.001 245 Query 1 245 use test; COMMIT
+master-bin.000001 79 Query 1 79 use ; BEGIN
+master-bin.000001 119 Query 1 79 use ; insert into ti values(12)
+master-bin.000001 179 Query 1 79 use ; insert into tm select * from ti
+master-bin.000001 245 Query 1 245 use ; COMMIT
delete from ti;
delete from tm;
reset master;
@@ -153,9 +153,9 @@ rollback to savepoint my_savepoint;
commit;
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
-master-bin.001 79 Query 1 79 use test; BEGIN
-master-bin.001 119 Query 1 79 use test; insert into ti values(14)
-master-bin.001 179 Query 1 179 use test; COMMIT
+master-bin.000001 79 Query 1 79 use ; BEGIN
+master-bin.000001 119 Query 1 79 use ; insert into ti values(14)
+master-bin.000001 179 Query 1 179 use ; COMMIT
delete from ti;
delete from tm;
reset master;
@@ -173,8 +173,8 @@ a
18
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
-master-bin.001 79 Query 1 79 use test; BEGIN
-master-bin.001 119 Query 1 79 use test; insert into ti values(16)
-master-bin.001 179 Query 1 79 use test; insert into ti values(18)
-master-bin.001 239 Query 1 239 use test; COMMIT
+master-bin.000001 79 Query 1 79 use ; BEGIN
+master-bin.000001 119 Query 1 79 use ; insert into ti values(16)
+master-bin.000001 179 Query 1 79 use ; insert into ti values(18)
+master-bin.000001 239 Query 1 239 use ; COMMIT
drop table ti,tm;
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
index 0cd35e63d91..4fa71dbaecc 100644
--- a/mysql-test/r/myisam.result
+++ b/mysql-test/r/myisam.result
@@ -290,6 +290,12 @@ update t1 set i1=0, i2=0, i3=0, i4=0, i5=0, i6=0, i7=0;
check table t1;
Table Op Msg_type Msg_text
test.t1 check status OK
+delete from t1 where i8=1;
+select i1,i2 from t1;
+i1 i2
+check table t1;
+Table Op Msg_type Msg_text
+test.t1 check status OK
drop table t1;
CREATE TABLE `t1` (
`post_id` mediumint(8) unsigned NOT NULL auto_increment,
diff --git a/mysql-test/r/range.result b/mysql-test/r/range.result
index 86203fb6786..df84dd55d04 100644
--- a/mysql-test/r/range.result
+++ b/mysql-test/r/range.result
@@ -230,27 +230,27 @@ create table t1 (x int, y int, index(x), index(y));
insert into t1 (x) values (1),(2),(3),(4),(5),(6),(7),(8),(9);
update t1 set y=x;
explain select * from t1, t1 t2 where t1.y = 2 and t2.x between 7 and t1.y+0;
-table type possible_keys key key_len ref rows Extra
-t1 ref y y 5 const 1 Using where
-t2 range x x 5 NULL 4 Using where
+id select_type table type possible_keys key key_len ref rows Extra
+1 SIMPLE t1 ref y y 5 const 1 Using where
+1 SIMPLE t2 range x x 5 NULL 4 Using where
explain select * from t1, t1 t2 where t1.y = 2 and t2.x >= 7 and t2.x <= t1.y+0;
-table type possible_keys key key_len ref rows Extra
-t1 ref y y 5 const 1 Using where
-t2 range x x 5 NULL 4 Using where
+id select_type table type possible_keys key key_len ref rows Extra
+1 SIMPLE t1 ref y y 5 const 1 Using where
+1 SIMPLE t2 range x x 5 NULL 4 Using where
explain select * from t1, t1 t2 where t1.y = 2 and t2.x between t1.y-1 and t1.y+1;
-table type possible_keys key key_len ref rows Extra
-t1 ref y y 5 const 1 Using where
-t2 ALL x NULL NULL NULL 9 Range checked for each record (index map: 1)
+id select_type table type possible_keys key key_len ref rows Extra
+1 SIMPLE t1 ref y y 5 const 1 Using where
+1 SIMPLE t2 ALL x NULL NULL NULL 9 Range checked for each record (index map: 1)
explain select * from t1, t1 t2 where t1.y = 2 and t2.x >= t1.y-1 and t2.x <= t1.y+1;
-table type possible_keys key key_len ref rows Extra
-t1 ref y y 5 const 1 Using where
-t2 ALL x NULL NULL NULL 9 Range checked for each record (index map: 1)
+id select_type table type possible_keys key key_len ref rows Extra
+1 SIMPLE t1 ref y y 5 const 1 Using where
+1 SIMPLE t2 ALL x NULL NULL NULL 9 Range checked for each record (index map: 1)
explain select * from t1, t1 t2 where t1.y = 2 and t2.x between 0 and t1.y;
-table type possible_keys key key_len ref rows Extra
-t1 ref y y 5 const 1 Using where
-t2 ALL x NULL NULL NULL 9 Using where
+id select_type table type possible_keys key key_len ref rows Extra
+1 SIMPLE t1 ref y y 5 const 1 Using where
+1 SIMPLE t2 ALL x NULL NULL NULL 9 Using where
explain select * from t1, t1 t2 where t1.y = 2 and t2.x >= 0 and t2.x <= t1.y;
-table type possible_keys key key_len ref rows Extra
-t1 ref y y 5 const 1 Using where
-t2 range x x 5 NULL 2 Using where
+id select_type table type possible_keys key key_len ref rows Extra
+1 SIMPLE t1 ref y y 5 const 1 Using where
+1 SIMPLE t2 range x x 5 NULL 2 Using where
drop table t1;
diff --git a/mysql-test/r/rpl_loaddata.result b/mysql-test/r/rpl_loaddata.result
index b8c0285e825..975ba1a9fe1 100644
--- a/mysql-test/r/rpl_loaddata.result
+++ b/mysql-test/r/rpl_loaddata.result
@@ -22,7 +22,7 @@ day id category name
2003-04-22 2416 a bbbbb
show master status;
File Position Binlog_do_db Binlog_ignore_db
-slave-bin.001 964
+slave-bin.000001 964
drop table t1;
drop table t2;
drop table t3;
diff --git a/mysql-test/r/rpl_loaddata_rule_m.result b/mysql-test/r/rpl_loaddata_rule_m.result
index 8d8ed749c71..c98b3fb358f 100644
--- a/mysql-test/r/rpl_loaddata_rule_m.result
+++ b/mysql-test/r/rpl_loaddata_rule_m.result
@@ -1,9 +1,9 @@
-slave stop;
+stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-slave start;
+start slave;
reset master;
create database test2;
create table t1(a int, b int, unique(b));
diff --git a/mysql-test/r/rpl_loaddata_rule_s.result b/mysql-test/r/rpl_loaddata_rule_s.result
index a84368501a9..26893cb1e9e 100644
--- a/mysql-test/r/rpl_loaddata_rule_s.result
+++ b/mysql-test/r/rpl_loaddata_rule_s.result
@@ -1,9 +1,9 @@
-slave stop;
+stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-slave start;
+start slave;
reset master;
create table t1(a int, b int, unique(b));
load data infile '../../std_data/rpl_loaddata.dat' into table test.t1;
diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result
index 1583ac3038d..0c876d30ef4 100644
--- a/mysql-test/r/rpl_log.result
+++ b/mysql-test/r/rpl_log.result
@@ -12,7 +12,10 @@ create table t1(n int not null auto_increment primary key);
insert into t1 values (NULL);
drop table t1;
create table t1 (word char(20) not null);
-load data infile '../../std_data/words.dat' into table t1;
+load data infile '../../std_data/words.dat' into table t1 ignore 1 lines;
+select count(*) from t1;
+count(*)
+69
drop table t1;
show binlog events;
Log_name Pos Event_type Server_id Orig_log_pos Info
@@ -81,16 +84,16 @@ slave-bin.000001 200 Query 1 200 use `test`; insert into t1 values (NULL)
slave-bin.000001 263 Query 1 263 use `test`; drop table t1
slave-bin.000001 311 Query 1 311 use `test`; create table t1 (word char(20) not null)
slave-bin.000001 386 Create_file 1 386 db=test;table=t1;file_id=1;block_len=581
-slave-bin.000001 1065 Exec_load 1 1056 ;file_id=1
-slave-bin.000001 1088 Query 1 1079 use `test`; drop table t1
-slave-bin.000001 1136 Query 1 4 use `test`; create table t5 (a int)
-slave-bin.000001 1194 Query 1 62 use `test`; drop table t5
+slave-bin.000001 1065 Exec_load 1 1065 ;file_id=1
+slave-bin.000001 1088 Query 1 1088 use `test`; drop table t1
+slave-bin.000001 1136 Query 1 1136 use `test`; create table t5 (a int)
+slave-bin.000001 1194 Query 1 1194 use `test`; drop table t5
slave-bin.000001 1242 Rotate 2 1242 slave-bin.000002;pos=4
show binlog events in 'slave-bin.000002' from 4;
Log_name Pos Event_type Server_id Orig_log_pos Info
-slave-bin.000002 4 Query 1 110 use `test`; create table t1 (n int)
-slave-bin.000002 62 Query 1 168 use `test`; insert into t1 values (1)
-slave-bin.000002 122 Query 1 228 use `test`; drop table t1
+slave-bin.000002 4 Query 1 4 use `test`; create table t1 (n int)
+slave-bin.000002 62 Query 1 62 use `test`; insert into t1 values (1)
+slave-bin.000002 122 Query 1 122 use `test`; drop table t1
show slave status;
Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Replicate_do_table Replicate_ignore_table Replicate_wild_do_table Replicate_wild_ignore_table Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key
127.0.0.1 root MASTER_PORT 1 master-bin.000002 276 slave-relay-bin.000003 214 master-bin.000002 Yes Yes 0 0 276 214 No
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result
index 888fe1b29f8..952ed566132 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -348,11 +348,7 @@ select found_rows();
found_rows()
4
(SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION SELECT * FROM t2 LIMIT 1;
-a
-1
-select found_rows();
-found_rows()
-4
+ERROR 42000: You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use
SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1 UNION all SELECT * FROM t2 LIMIT 2;
a
1
@@ -435,7 +431,7 @@ a
3
3
(SELECT * FROM t1) UNION all (SELECT SQL_CALC_FOUND_ROWS * FROM t2) LIMIT 1;
-Wrong usage/placement of 'SQL_CALC_FOUND_ROWS'
+ERROR 42000: Wrong usage/placement of 'SQL_CALC_FOUND_ROWS'
drop table t1,t2;
CREATE TABLE t1 ( id int(3) unsigned default '0') TYPE=MyISAM;
INSERT INTO t1 (id) VALUES("1");
diff --git a/mysql-test/t/lowercase_table.test b/mysql-test/t/lowercase_table.test
index 2e5cb5f89fc..28e45bde5c5 100644
--- a/mysql-test/t/lowercase_table.test
+++ b/mysql-test/t/lowercase_table.test
@@ -11,7 +11,7 @@ INSERT INTO T1 VALUES (1, 'a'), (2, 'b'), (3, 'c');
SELECT * FROM t1;
SELECT T1.id from T1 LIMIT 1;
SELECT T2.id from t1 as T2 LIMIT 1;
---error 1109
+# This gave an error in 4.0, but it's fixed in 4.1
SELECT T2.id from t1 as t2 LIMIT 1;
RENAME TABLE T1 TO T2;
ALTER TABLE T2 ADD new_col int not null;
diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test
index 55449dafa3a..541f2be65d5 100644
--- a/mysql-test/t/myisam.test
+++ b/mysql-test/t/myisam.test
@@ -299,7 +299,7 @@ update t1 set b=repeat('a',256);
update t1 set i1=0, i2=0, i3=0, i4=0, i5=0, i6=0, i7=0;
check table t1;
delete from t1 where i8=1;
-select * from t1;
+select i1,i2 from t1;
check table t1;
drop table t1;
diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test
index e7bda27d43e..dfb5a15bf40 100644
--- a/mysql-test/t/union.test
+++ b/mysql-test/t/union.test
@@ -212,8 +212,10 @@ select found_rows();
select found_rows();
(SELECT SQL_CALC_FOUND_ROWS * FROM t1) UNION all (SELECT * FROM t2 LIMIT 1);
select found_rows();
+# This used to work in 4.0 but not anymore in 4.1
+--error 1149
(SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION SELECT * FROM t2 LIMIT 1;
-select found_rows();
+#select found_rows();
# In these case found_rows() should work
SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1 UNION all SELECT * FROM t2 LIMIT 2;
View Lorry Controller Status