mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +01:00
c70a9fa1e3
The problem is that the server could crash when attempting to access a non-conformant proc system table. One such case was a crash when invoking stored procedure related statements on a 5.1 server with a proc system table in the 5.0 format. The solution is to validate the proc system table format before attempts to access it are made. If the table is not in the format that the server expects, a message is written to the error log and the statement that caused the table to be accessed fails. mysql-test/r/sp-destruct.result: Add test case result for Bug#41726 mysql-test/t/sp-destruct.test: Add test case for Bug#41726 sql/event_db_repository.cc: Update code to use new structures. sql/sp.cc: Describe the proc table format and use it to validate when opening a instance of the table. Add a check to insure that a error message is written to the error log only once. sql/sql_acl.cc: Remove unused variable and use new structure. sql/sql_acl.h: Export field definition. sql/table.cc: Accept the field count and definition in a single structure. sql/table.h: Combine the field count and definition in a single structure. Transform function into a class in order to support different ways of reporting a error. Add a pointer cache to TABLE_SHARE.
199 lines
5.6 KiB
Text
199 lines
5.6 KiB
Text
#
|
|
# Destructive stored procedure tests
|
|
#
|
|
# We do horrible things to the mysql.proc table here, so any unexpected
|
|
# failures here might leave it in an undetermined state.
|
|
#
|
|
# In the case of trouble you might want to skip this.
|
|
#
|
|
|
|
# embedded server returns different paths in error messages
|
|
# in lines like 'call bug14233();'
|
|
# mysqltest should be fixed to allow REPLACE_RESULT in error message
|
|
-- source include/not_embedded.inc
|
|
|
|
# Supress warnings written to the log file
|
|
call mtr.add_suppression("Column count of mysql.proc is wrong. Expected 20, found 19. The table is probably corrupted");
|
|
|
|
# Backup proc table
|
|
let $MYSQLD_DATADIR= `select @@datadir`;
|
|
--copy_file $MYSQLD_DATADIR/mysql/proc.frm $MYSQLTEST_VARDIR/tmp/proc.frm
|
|
--copy_file $MYSQLD_DATADIR/mysql/proc.MYD $MYSQLTEST_VARDIR/tmp/proc.MYD
|
|
--copy_file $MYSQLD_DATADIR/mysql/proc.MYI $MYSQLTEST_VARDIR/tmp/proc.MYI
|
|
|
|
use test;
|
|
|
|
--disable_warnings
|
|
drop procedure if exists bug14233;
|
|
drop function if exists bug14233;
|
|
drop table if exists t1;
|
|
drop view if exists v1;
|
|
--enable_warnings
|
|
|
|
create procedure bug14233()
|
|
set @x = 42;
|
|
|
|
create function bug14233_f() returns int
|
|
return 42;
|
|
|
|
create table t1 (id int);
|
|
create trigger t1_ai after insert on t1 for each row call bug14233();
|
|
|
|
# Unsupported tampering with the mysql.proc definition
|
|
alter table mysql.proc drop type;
|
|
--error ER_COL_COUNT_DOESNT_MATCH_CORRUPTED
|
|
call bug14233();
|
|
--error ER_COL_COUNT_DOESNT_MATCH_CORRUPTED
|
|
create view v1 as select bug14233_f();
|
|
--error ER_COL_COUNT_DOESNT_MATCH_CORRUPTED
|
|
insert into t1 values (0);
|
|
--error ER_COL_COUNT_DOESNT_MATCH_CORRUPTED
|
|
show procedure status;
|
|
|
|
flush table mysql.proc;
|
|
|
|
# Thrashing the .frm file
|
|
--remove_file $MYSQLD_DATADIR/mysql/proc.frm
|
|
--write_file $MYSQLD_DATADIR/mysql/proc.frm
|
|
saljdfa
|
|
EOF
|
|
--replace_result $MYSQLTEST_VARDIR . master-data// '' '\\' '/'
|
|
--error ER_NOT_FORM_FILE
|
|
call bug14233();
|
|
--replace_result $MYSQLTEST_VARDIR . master-data// '' '\\' '/'
|
|
--error ER_NOT_FORM_FILE
|
|
create view v1 as select bug14233_f();
|
|
--replace_result $MYSQLTEST_VARDIR . master-data// '' '\\' '/'
|
|
--error ER_NOT_FORM_FILE
|
|
insert into t1 values (0);
|
|
|
|
flush table mysql.proc;
|
|
|
|
# Drop the mysql.proc table
|
|
--remove_file $MYSQLD_DATADIR/mysql/proc.frm
|
|
--remove_file $MYSQLD_DATADIR/mysql/proc.MYD
|
|
--remove_file $MYSQLD_DATADIR/mysql/proc.MYI
|
|
--error ER_NO_SUCH_TABLE
|
|
call bug14233();
|
|
--error ER_NO_SUCH_TABLE
|
|
create view v1 as select bug14233_f();
|
|
--error ER_NO_SUCH_TABLE
|
|
insert into t1 values (0);
|
|
|
|
# Restore mysql.proc
|
|
--copy_file $MYSQLTEST_VARDIR/tmp/proc.frm $MYSQLD_DATADIR/mysql/proc.frm
|
|
--copy_file $MYSQLTEST_VARDIR/tmp/proc.MYD $MYSQLD_DATADIR/mysql/proc.MYD
|
|
--copy_file $MYSQLTEST_VARDIR/tmp/proc.MYI $MYSQLD_DATADIR/mysql/proc.MYI
|
|
--remove_file $MYSQLTEST_VARDIR/tmp/proc.frm
|
|
--remove_file $MYSQLTEST_VARDIR/tmp/proc.MYD
|
|
--remove_file $MYSQLTEST_VARDIR/tmp/proc.MYI
|
|
|
|
flush table mysql.proc;
|
|
flush privileges;
|
|
|
|
delete from mysql.proc where name like 'bug14233%';
|
|
|
|
# Unsupported editing of mysql.proc, circumventing checks in "create ..."
|
|
insert into mysql.proc
|
|
(
|
|
db, name, type, specific_name, language, sql_data_access, is_deterministic,
|
|
security_type, param_list, returns, body, definer, created, modified,
|
|
sql_mode, comment, character_set_client, collation_connection, db_collation,
|
|
body_utf8
|
|
)
|
|
values
|
|
(
|
|
'test', 'bug14233_1', 'FUNCTION', 'bug14233_1', 'SQL', 'READS_SQL_DATA', 'NO',
|
|
'DEFINER', '', 'int(10)',
|
|
'select count(*) from mysql.user',
|
|
'root@localhost', NOW() , '0000-00-00 00:00:00', '', '',
|
|
'', '', '',
|
|
'select count(*) from mysql.user'
|
|
),
|
|
(
|
|
'test', 'bug14233_2', 'FUNCTION', 'bug14233_2', 'SQL', 'READS_SQL_DATA', 'NO',
|
|
'DEFINER', '', 'int(10)',
|
|
'begin declare x int; select count(*) into x from mysql.user; end',
|
|
'root@localhost', NOW() , '0000-00-00 00:00:00', '', '',
|
|
'', '', '',
|
|
'begin declare x int; select count(*) into x from mysql.user; end'
|
|
),
|
|
(
|
|
'test', 'bug14233_3', 'PROCEDURE', 'bug14233_3', 'SQL', 'READS_SQL_DATA','NO',
|
|
'DEFINER', '', '',
|
|
'alksj wpsj sa ^#!@ ',
|
|
'root@localhost', NOW() , '0000-00-00 00:00:00', '', '',
|
|
'', '', '',
|
|
'alksj wpsj sa ^#!@ '
|
|
);
|
|
|
|
--error ER_SP_PROC_TABLE_CORRUPT
|
|
select bug14233_1();
|
|
--error ER_SP_PROC_TABLE_CORRUPT
|
|
create view v1 as select bug14233_1();
|
|
|
|
--error ER_SP_PROC_TABLE_CORRUPT
|
|
select bug14233_2();
|
|
--error ER_SP_PROC_TABLE_CORRUPT
|
|
create view v1 as select bug14233_2();
|
|
|
|
--error ER_SP_PROC_TABLE_CORRUPT
|
|
call bug14233_3();
|
|
drop trigger t1_ai;
|
|
create trigger t1_ai after insert on t1 for each row call bug14233_3();
|
|
--error ER_SP_PROC_TABLE_CORRUPT
|
|
insert into t1 values (0);
|
|
|
|
# Clean-up
|
|
drop trigger t1_ai;
|
|
drop table t1;
|
|
|
|
#
|
|
# BUG#16303: erroneus stored procedures and functions should be droppable
|
|
#
|
|
drop function bug14233_1;
|
|
drop function bug14233_2;
|
|
drop procedure bug14233_3;
|
|
# Assert: These should show nothing.
|
|
show procedure status where db=DATABASE();
|
|
show function status where db=DATABASE();
|
|
|
|
#
|
|
# Bug#41726 upgrade from 5.0 to 5.1.30 crashes if you didn't run mysql_upgrade
|
|
#
|
|
|
|
|
|
--disable_warnings
|
|
DROP TABLE IF EXISTS proc_backup;
|
|
DROP PROCEDURE IF EXISTS p1;
|
|
--enable_warnings
|
|
|
|
--echo # Backup the proc table
|
|
|
|
RENAME TABLE mysql.proc TO proc_backup;
|
|
CREATE TABLE mysql.proc LIKE proc_backup;
|
|
FLUSH TABLE mysql.proc;
|
|
|
|
--echo # Test with a valid table.
|
|
|
|
CREATE PROCEDURE p1()
|
|
SET @foo = 10;
|
|
CALL p1();
|
|
--replace_column 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00'
|
|
SHOW PROCEDURE STATUS;
|
|
|
|
--echo # Modify a field of the table.
|
|
|
|
ALTER TABLE mysql.proc MODIFY comment CHAR (32);
|
|
|
|
--error ER_CANNOT_LOAD_FROM_TABLE
|
|
CREATE PROCEDURE p2()
|
|
SET @foo = 10;
|
|
--echo # Procedure loaded from the cache
|
|
CALL p1();
|
|
--error ER_CANNOT_LOAD_FROM_TABLE
|
|
SHOW PROCEDURE STATUS;
|
|
|
|
DROP TABLE mysql.proc;
|
|
RENAME TABLE proc_backup TO mysql.proc;
|
|
FLUSH TABLE mysql.proc;
|