database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Post-merge fixes, some quite complex. client/mysqlbinlog.cc and sql/log_event.cc

Browse Source 
merged manually by guilhem.


client/mysqlbinlog.cc:
  Post-merge fixes; manually merged by guilhem.
include/mysqld_error.h:
  Post-merge fixes.
mysql-test/r/drop_temp_table.result:
  Post-merge fixes.
mysql-test/r/insert.result:
  Post-merge fixes.
mysql-test/r/mysqlbinlog.result:
  Post-merge fixes.
mysql-test/r/query_cache.result:
  Post-merge fixes.
mysql-test/r/rpl_error_ignored_table.result:
  Post-merge fixes.
mysql-test/r/rpl_relayrotate.result:
  Post-merge fixes.
mysql-test/r/rpl_trunc_binlog.result:
  Post-merge fixes.
mysql-test/r/sp-error.result:
  Post-merge fixes.
mysql-test/r/sp.result:
  Post-merge fixes.
mysql-test/r/system_mysql_db.result:
  Post-merge fixes.
mysql-test/r/variables.result:
  Post-merge fixes.
mysql-test/t/rpl_error_ignored_table.test:
  Post-merge fixes.
mysql-test/t/sp-error.test:
  Post-merge fixes.
sql/ha_innodb.cc:
  Post-merge fixes.
sql/log_event.cc:
  Post-merge fixes; manually merged by guilhem.
sql/set_var.cc:
  Post-merge fixes.
sql/share/danish/errmsg.txt:
  Post-merge fixes.
sql/share/dutch/errmsg.txt:
  Post-merge fixes.
sql/share/english/errmsg.txt:
  Post-merge fixes.
sql/share/estonian/errmsg.txt:
  Post-merge fixes.
sql/sp.cc:
  Post-merge fixes.
sql/sql_insert.cc:
  Post-merge fixes.
sql/sql_table.cc:
  Post-merge fixes.
This commit is contained in:
unknown
2004-04-28 12:08:54 +02:00
parent c635d37479
commit 2eecc377a6
25 changed files with 1049 additions and 842 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/drop_temp_table.result
View File

@ -9,6 +9,10 @@ select get_lock("a",10);
get_lock("a",10)
1
show binlog events;
master-bin.000001 246 Query 1 246 use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`table:name`
master-bin.000001 375 Query 1 375 use `drop-temp+table-test`; DO RELEASE_LOCK("a")
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 95 Server ver: VERSION, Binlog ver: 4
master-bin.000001 95 Query 1 190 use `test`; create database `drop-temp+table-test`
master-bin.000001 190 Query 1 306 use `drop-temp+table-test`; create temporary table `table:name` (a int)
master-bin.000001 306 Query 1 457 use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`table:name`
master-bin.000001 457 Query 1 550 use `drop-temp+table-test`; DO RELEASE_LOCK("a")
drop database `drop-temp+table-test`;

1
mysql-test/r/insert.result
View File

@ -324,6 +324,7 @@ f_double_u 0
f_float_u 0
f_double_15_1_u 0.0
f_float_3_1_u 0.0
use test;
drop table if exists t1,t2,t3;
create table t1(id1 int not null auto_increment primary key, t char(12));
create table t2(id2 int not null, t char(12));

38
mysql-test/r/mysqlbinlog.result
View File

@ -14,6 +14,7 @@ insert into t1 values ("Alas");
flush logs;
--- Local --
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
use test;
SET TIMESTAMP=1000000000;
SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@ -26,13 +27,14 @@ insert into t1 values ("abirvalg");
SET INSERT_ID=1;
SET TIMESTAMP=1000000000;
insert into t2 values ();
LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-1-0' INTO TABLE t1 FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word);
LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-2-0' INTO TABLE t1 FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word);
LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-3-0' INTO TABLE t1 FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word);
LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-4-0' INTO TABLE t1 FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word);
LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-5-0' INTO TABLE t1 FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word);
LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-1-0' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word);
LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-2-0' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word);
LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-3-0' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word);
LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-4-0' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word);
LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-5-0' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word);
--- Broken LOAD DATA --
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
use test;
SET TIMESTAMP=1000000000;
SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@ -40,9 +42,11 @@ SET @@session.sql_mode=0;
insert into t1 values ("Alas");
--- --database --
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
SET INSERT_ID=1;
--- --position --
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
use test;
SET TIMESTAMP=1000000000;
SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@ -50,6 +54,7 @@ SET @@session.sql_mode=0;
insert into t1 values ("Alas");
--- Remote --
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
use test;
SET TIMESTAMP=1000000000;
SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@ -62,10 +67,14 @@ insert into t1 values ("abirvalg");
SET INSERT_ID=1;
SET TIMESTAMP=1000000000;
insert into t2 values ();
SET TIMESTAMP=1000000000;
insert into t1 values ("Alas");
LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-1-1' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word);
LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-2-1' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word);
LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-3-1' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word);
LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-4-1' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word);
LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-5-1' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word);
--- Broken LOAD DATA --
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
use test;
SET TIMESTAMP=1000000000;
SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@ -73,22 +82,11 @@ SET @@session.sql_mode=0;
insert into t1 values ("Alas");
--- --database --
use test;
SET TIMESTAMP=1000000000;
SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
SET @@session.sql_mode=0;
create table t1 (word varchar(20));
SET TIMESTAMP=1000000000;
create table t2 (id int auto_increment not null primary key);
SET TIMESTAMP=1000000000;
insert into t1 values ("abirvalg");
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
SET INSERT_ID=1;
SET TIMESTAMP=1000000000;
insert into t2 values ();
SET TIMESTAMP=1000000000;
insert into t1 values ("Alas");
--- --position --
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
use test;
SET TIMESTAMP=1000000000;
SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;

4
mysql-test/r/query_cache.result
View File

@ -857,7 +857,7 @@ Variable_name Value
Qcache_queries_in_cache 0
show status like "Qcache_inserts";
Variable_name Value
Qcache_inserts 9
Qcache_inserts 11
show status like "Qcache_hits";
Variable_name Value
Qcache_hits 6
@ -870,7 +870,7 @@ Variable_name Value
Qcache_queries_in_cache 1
show status like "Qcache_inserts";
Variable_name Value
Qcache_inserts 10
Qcache_inserts 12
show status like "Qcache_hits";
Variable_name Value
Qcache_hits 7

24
mysql-test/r/rpl_error_ignored_table.result
View File

@ -9,7 +9,7 @@ insert into t1 values (1),(1);
ERROR 23000: Duplicate entry '1' for key 1
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 MASTER_PORT 1 master-bin.000001 213 slave-relay-bin.000002 257 master-bin.000001 Yes Yes test.t3,test.t1,test.t2 0 0 213 257 None 0 No #
# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 273 # # master-bin.000001 Yes Yes test.t3,test.t1,test.t2 0 0 273 # None 0 No #
show tables like 't1';
Tables_in_test (t1)
drop table t1;
@ -26,14 +26,14 @@ select (@id := id) - id from t3;
0
kill @id;
drop table t2,t3;
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.000001 79 Query 1 79 use `test`; create table t1 (a int primary key)
master-bin.000001 149 Query 1 149 use `test`; insert into t1 values (1),(1)
master-bin.000001 213 Query 1 213 use `test`; drop table t1
master-bin.000001 261 Query 1 261 use `test`; create table t2 (a int primary key)
master-bin.000001 331 Query 1 331 use `test`; insert into t2 values(1)
master-bin.000001 390 Query 1 390 use `test`; create table t3 (id int)
master-bin.000001 449 Query 1 449 use `test`; insert into t3 values(connection_id())
master-bin.000001 522 Query 1 522 use `test`; update t2 set a = a + 1 + get_lock('crash_lock%20C', 10)
master-bin.000001 613 Query 1 613 use `test`; drop table t2,t3
show binlog events from 95;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 95 Query 1 187 use `test`; create table t1 (a int primary key)
master-bin.000001 187 Query 1 273 use `test`; insert into t1 values (1),(1)
master-bin.000001 273 Query 1 343 use `test`; drop table t1
master-bin.000001 343 Query 1 435 use `test`; create table t2 (a int primary key)
master-bin.000001 435 Query 1 516 use `test`; insert into t2 values(1)
master-bin.000001 516 Query 1 597 use `test`; create table t3 (id int)
master-bin.000001 597 Query 1 692 use `test`; insert into t3 values(connection_id())
master-bin.000001 692 Query 1 805 use `test`; update t2 set a = a + 1 + get_lock('crash_lock%20C', 10)
master-bin.000001 805 Query 1 878 use `test`; drop table t2,t3

6
mysql-test/r/rpl_relayrotate.result
View File

@ -16,6 +16,9 @@ master_pos_wait('master-bin.001',3000)>=0
select max(a) from t1;
max(a)
8000
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 MASTER_MYPORT 1 master-bin.000001 687207 # # master-bin.000001 Yes Yes 0 0 687207 # None 0 No #
show status like "binlog_cache_use";
Variable_name Value
Binlog_cache_use 1
@ -31,7 +34,4 @@ Binlog_cache_use 2
show status like "binlog_cache_disk_use";
Variable_name Value
Binlog_cache_disk_use 1
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 MASTER_MYPORT 1 master-bin.000001 687207 # # master-bin.000001 Yes Yes 0 0 687207 # None 0 No #
drop table t1;

2
mysql-test/r/rpl_trunc_binlog.result
View File

@ -10,4 +10,4 @@ reset slave;
start slave;
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 MASTER_PORT 1 master-bin.000002 4 slave-relay-bin.000002 123 master-bin.000001 Yes No 0 Rolling back unfinished transaction (no COMMIT or ROLLBACK) from relay log. A probable cause is that the master died while writing the transaction to its binary log. 0 79 326 None 0 No #
# 127.0.0.1 root MASTER_PORT 1 master-bin.000002 4 # # master-bin.000001 Yes No 0 Rolling back unfinished transaction (no COMMIT or ROLLBACK) from relay log. A probable cause is that the master died while writing the transaction to its binary log. 0 79 # None 0 No #

4
mysql-test/r/sp-error.result
View File

@ -35,7 +35,7 @@ call foo()|
ERROR 42000: PROCEDURE foo does not exist
drop procedure if exists foo|
Warnings:
Warning 1292 PROCEDURE foo does not exist
Warning 1297 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 1298 Referring to uninitialized variable y
Warning 1303 Referring to uninitialized variable y
drop procedure foo|
create procedure foo()
return 42|

2
mysql-test/r/sp.result
View File

@ -1048,7 +1048,7 @@ drop table if exists t3|
create table t3 (s1 smallint)|
insert into t3 values (123456789012)|
Warnings:
Warning 1263 Data truncated, out of range for column 's1' at row 1
Warning 1264 Data truncated, out of range for column 's1' at row 1
create procedure bug2780()
begin
declare exit handler for sqlwarning set @x = 1;

1
mysql-test/r/system_mysql_db.result
View File

@ -8,6 +8,7 @@ help_keyword
help_relation
help_topic
host
proc
tables_priv
user
show create table db;

2
mysql-test/r/variables.result
View File

@ -364,7 +364,7 @@ set sql_log_bin=1;
set sql_log_off=1;
set sql_log_update=1;
Warnings:
Note 1302 The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored.
Note 1307 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;

2
mysql-test/t/rpl_error_ignored_table.test
View File

@ -48,7 +48,7 @@ connection master;
--error 0,1053;
reap;
connection master1;
show binlog events from 79;
show binlog events from 95;
save_master_pos;
connection slave;
# SQL slave thread should not have stopped (because table of the killed

98
mysql-test/t/sp-error.test
View File

@ -32,18 +32,18 @@ create function func1() returns int
return 42|
# Can't create recursively
--error 1290
--error 1295
create procedure foo()
create procedure bar() set @x=3|
--error 1290
--error 1295
create procedure foo()
create function bar() returns double return 2.3|
# Already exists
--error 1291
--error 1296
create procedure proc1()
set @x = 42|
--error 1291
--error 1296
create function func1() returns int
return 42|
@ -51,39 +51,39 @@ drop procedure proc1|
drop function func1|
# Does not exist
--error 1292
--error 1297
alter procedure foo|
--error 1292
--error 1297
alter function foo|
--error 1292
--error 1297
drop procedure foo|
--error 1292
--error 1297
drop function foo|
--error 1292
--error 1297
call foo()|
drop procedure if exists foo|
--error 1292
--error 1297
show create procedure foo|
# LEAVE/ITERATE with no match
--error 1295
--error 1300
create procedure foo()
foo: loop
leave bar;
end loop|
--error 1295
--error 1300
create procedure foo()
foo: loop
iterate bar;
end loop|
--error 1295
--error 1300
create procedure foo()
foo: begin
iterate foo;
end|
# Redefining label
--error 1296
--error 1301
create procedure foo()
foo: loop
foo: loop
@ -92,7 +92,7 @@ foo: loop
end loop foo|
# End label mismatch
--error 1297
--error 1302
create procedure foo()
foo: loop
set @x=2;
@ -107,12 +107,12 @@ end|
drop procedure foo|
# RETURN in FUNCTION only
--error 1300
--error 1305
create procedure foo()
return 42|
# Doesn't allow queries in FUNCTIONs (for now :-( )
--error 1301
--error 1306
create function foo() returns int
begin
declare x int;
@ -126,19 +126,19 @@ create procedure p(x int)
create function f(x int) returns int
return x+42|
--error 1305
--error 1310
call p()|
--error 1305
--error 1310
call p(1, 2)|
--error 1305
--error 1310
select f()|
--error 1305
--error 1310
select f(1, 2)|
drop procedure p|
drop function f|
--error 1306
--error 1311
create procedure p(val int, out res int)
begin
declare x int default 0;
@ -152,7 +152,7 @@ begin
end if;
end|
--error 1306
--error 1311
create procedure p(val int, out res int)
begin
declare x int default 0;
@ -167,7 +167,7 @@ begin
end if;
end|
--error 1307
--error 1312
create function f(val int) returns int
begin
declare x int;
@ -185,12 +185,12 @@ begin
end if;
end|
--error 1308
--error 1313
select f(10)|
drop function f|
--error 1309
--error 1314
create procedure p()
begin
declare c cursor for insert into test.t1 values ("foo", 42);
@ -199,7 +199,7 @@ begin
close c;
end|
--error 1310
--error 1315
create procedure p()
begin
declare x int;
@ -209,7 +209,7 @@ begin
close c;
end|
--error 1311
--error 1316
create procedure p()
begin
declare c cursor for select * from test.t;
@ -231,7 +231,7 @@ begin
open c;
close c;
end|
--error 1312
--error 1317
call p()|
drop procedure p|
@ -243,11 +243,11 @@ begin
close c;
close c;
end|
--error 1313
--error 1318
call p()|
drop procedure p|
--error 1292
--error 1297
alter procedure bar3 sql security invoker|
--error 1059
alter procedure bar3 name
@ -261,7 +261,7 @@ drop table if exists t1|
create table t1 (val int, x float)|
insert into t1 values (42, 3.1), (19, 1.2)|
--error 1314
--error 1319
create procedure p()
begin
declare x int;
@ -281,7 +281,7 @@ begin
fetch c into x;
close c;
end|
--error 1315
--error 1320
call p()|
drop procedure p|
@ -296,34 +296,34 @@ begin
fetch c into x, y, z;
close c;
end|
--error 1315
--error 1320
call p()|
drop procedure p|
--error 1317
--error 1322
create procedure p(in x int, x char(10))
begin
end|
--error 1317
--error 1322
create function p(x int, x char(10))
begin
end|
--error 1318
--error 1323
create procedure p()
begin
declare x float;
declare x int;
end|
--error 1319
--error 1324
create procedure p()
begin
declare c condition for 1064;
declare c condition for 1065;
end|
--error 1320
--error 1325
create procedure p()
begin
declare c cursor for select * from t1;
@ -331,18 +331,18 @@ begin
end|
# USE is not allowed
--error 1323
--error 1328
create procedure u()
use sptmp|
# Enforced standard order of declarations
--error 1324
--error 1329
create procedure p()
begin
declare c cursor for select * from t1;
declare x int;
end|
--error 1324
--error 1329
create procedure p()
begin
declare x int;
@ -350,7 +350,7 @@ begin
declare foo condition for sqlstate '42S99';
end|
--error 1325
--error 1330
create procedure p()
begin
declare x int;
@ -375,13 +375,13 @@ drop procedure bug1965|
#
# BUG#1966
#
--error 1314
--error 1319
select 1 into a|
#
# BUG#336
#
--error 1322
--error 1327
create procedure bug336(id char(16))
begin
declare x int;
@ -391,7 +391,7 @@ end|
#
# BUG#1654
#
--error 1301
--error 1306
create function bug1654()
returns int
return (select sum(t.data) from test.t2 t)|
@ -429,7 +429,7 @@ begin
fetch c1 into v1;
end|
--error 1313
--error 1318
call bug2259()|
drop procedure bug2259|
@ -485,7 +485,7 @@ begin
end case;
return 2;
end|
--error 1326
--error 1331
select bug3287()|
drop function bug3287|
@ -496,7 +496,7 @@ when 0 then
when 1 then
insert into test.t1 values (x, 1.1);
end case|
--error 1326
--error 1331
call bug3287(2)|
drop procedure bug3287|