diff options
author | unknown <pem@mysql.comhem.se> | 2004-05-14 16:00:57 +0200 |
---|---|---|
committer | unknown <pem@mysql.comhem.se> | 2004-05-14 16:00:57 +0200 |
commit | 3a272c1fa91121d3792a558840d2b764d758f4e9 (patch) | |
tree | d27d078b95ca20c323af435a836f475562c863d0 /mysql-test/r | |
parent | e9c1e75b48e5d2c0047a3e88b35667a33d6395e4 (diff) | |
download | mariadb-git-3a272c1fa91121d3792a558840d2b764d758f4e9.tar.gz |
Post-merge fixes.
Note: One sp.test still fails (prime), and rpl_server_id2.test fails (will be fixed by guilhem ASAP).
mysql-test/r/index_merge.result:
Fixed syntax error (no ',' after last index in create table any more).
mysql-test/r/index_merge_bdb.result:
Fixed syntax error (no ',' after last index in create table any more).
mysql-test/r/index_merge_innodb.result:
Fixed syntax error (no ',' after last index in create table any more).
mysql-test/r/index_merge_innodb2.result:
Fixed syntax error (no ',' after last index in create table any more).
mysql-test/r/rpl_server_id1.result:
Update result after merge.
mysql-test/r/sp-error.result:
Update result after merge.
mysql-test/r/variables.result:
Update result after merge.
mysql-test/t/index_merge.test:
Fixed syntax error (no ',' after last index in create table any more).
mysql-test/t/index_merge_bdb.test:
Fixed syntax error (no ',' after last index in create table any more).
mysql-test/t/index_merge_innodb.test:
Fixed syntax error (no ',' after last index in create table any more).
mysql-test/t/index_merge_innodb2.test:
Fixed syntax error (no ',' after last index in create table any more).
mysql-test/t/sp-error.test:
Post-merge fix of error codes.
sql/opt_range.cc:
Manually merged by Monty.
sql/opt_range.h:
Manually merged by Monty.
sql/slave.cc:
Post-merge fixes with some help from Guilhem.
sql/slave.h:
Post-merge fixes with some help from Guilhem.
sql/sp_head.cc:
Got rid of warning (reordering initialization).
sql/sql_parse.cc:
Post-merge fix: Need to set/reset select_limit at SP CALL time as well.
tests/client_test.c:
Post-merge fix: key_len length in explain has changed.
Diffstat (limited to 'mysql-test/r')
-rw-r--r-- | mysql-test/r/index_merge.result | 4 | ||||
-rw-r--r-- | mysql-test/r/index_merge_bdb.result | 2 | ||||
-rw-r--r-- | mysql-test/r/index_merge_innodb.result | 2 | ||||
-rw-r--r-- | mysql-test/r/index_merge_innodb2.result | 2 | ||||
-rw-r--r-- | mysql-test/r/rpl_server_id1.result | 2 | ||||
-rw-r--r-- | mysql-test/r/sp-error.result | 4 | ||||
-rw-r--r-- | mysql-test/r/variables.result | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/r/index_merge.result b/mysql-test/r/index_merge.result index 6859d9db728..15e909c5af9 100644 --- a/mysql-test/r/index_merge.result +++ b/mysql-test/r/index_merge.result @@ -2,7 +2,7 @@ drop table if exists t0, t1, t2, t3,t4; create table t0 ( key1 int not null, -INDEX i1(key1), +INDEX i1(key1) ); alter table t0 add key2 int not null, add index i2(key2); alter table t0 add key3 int not null, add index i3(key3); @@ -217,7 +217,7 @@ key3 int not null, index i1a (key1a, key1b), index i1b (key1b, key1a), index i2_1(key2, key2_1), -index i2_2(key2, key2_1), +index i2_2(key2, key2_1) ); insert into t4 select key1,key1,key1 div 10, key1 % 10, key1 % 10, key1 from t0; select * from t4 where key1a = 3 or key1b = 4; diff --git a/mysql-test/r/index_merge_bdb.result b/mysql-test/r/index_merge_bdb.result index 77d5ba31e53..3113bf95d3a 100644 --- a/mysql-test/r/index_merge_bdb.result +++ b/mysql-test/r/index_merge_bdb.result @@ -6,7 +6,7 @@ key2 int, filler char(200), filler2 char(200), index(key1), -index(key2), +index(key2) ) engine=bdb; select * from t1 where (key1 >= 2 and key1 <= 10) or (pk >= 4 and pk <=8 ); pk key1 key2 filler filler2 diff --git a/mysql-test/r/index_merge_innodb.result b/mysql-test/r/index_merge_innodb.result index 91718f00f9b..70dd3d4f4f0 100644 --- a/mysql-test/r/index_merge_innodb.result +++ b/mysql-test/r/index_merge_innodb.result @@ -4,7 +4,7 @@ create table t1 key1 int not null, key2 int not null, INDEX i1(key1), -INDEX i2(key2), +INDEX i2(key2) ) engine=innodb; explain select * from t1 where key1 < 5 or key2 > 197; id select_type table type possible_keys key key_len ref rows Extra diff --git a/mysql-test/r/index_merge_innodb2.result b/mysql-test/r/index_merge_innodb2.result index ee0439a7660..91dd989fe90 100644 --- a/mysql-test/r/index_merge_innodb2.result +++ b/mysql-test/r/index_merge_innodb2.result @@ -6,7 +6,7 @@ key2 int, filler char(200), filler2 char(200), index(key1), -index(key2), +index(key2) ) engine=innodb; select * from t1 where (key1 >= 2 and key1 <= 10) or (pk >= 4 and pk <=8 ); pk key1 key2 filler filler2 diff --git a/mysql-test/r/rpl_server_id1.result b/mysql-test/r/rpl_server_id1.result index 8c383802de4..b51022b0017 100644 --- a/mysql-test/r/rpl_server_id1.result +++ b/mysql-test/r/rpl_server_id1.result @@ -10,7 +10,7 @@ stop slave; change master to master_port=SLAVE_PORT; show slave status; Slave_IO_State 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 Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master - 127.0.0.1 root SLAVE_PORT 1 4 slave-relay-bin.000001 4 No No # 0 0 0 4 None 0 No NULL + 127.0.0.1 root SLAVE_PORT 1 4 slave-relay-bin.000001 4 No No # 0 0 0 95 None 0 No NULL start slave; insert into t1 values (1); show status like "slave_running"; diff --git a/mysql-test/r/sp-error.result b/mysql-test/r/sp-error.result index b2bba71ea6d..1231c6398ee 100644 --- a/mysql-test/r/sp-error.result +++ b/mysql-test/r/sp-error.result @@ -35,7 +35,7 @@ call foo()| ERROR 42000: PROCEDURE foo does not exist drop procedure if exists foo| Warnings: -Warning 1297 PROCEDURE foo does not exist +Warning 1298 PROCEDURE foo does not exist show create procedure foo| ERROR 42000: PROCEDURE foo does not exist create procedure foo() @@ -71,7 +71,7 @@ declare y int; set x = y; end| Warnings: -Warning 1303 Referring to uninitialized variable y +Warning 1304 Referring to uninitialized variable y drop procedure foo| create procedure foo() return 42| diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index f25a48525bb..67c1d5b3e33 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -364,7 +364,7 @@ set sql_log_bin=1; set sql_log_off=1; set sql_log_update=1; Warnings: -Note 1307 The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored. +Note 1308 The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored. set sql_low_priority_updates=1; set sql_max_join_size=200; select @@sql_max_join_size,@@max_join_size; |