mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
14decc4fbc
(Mostly in DBUG_PRINT() and unused arguments) Fixed bug in query cache when used with traceing (--with-debug) Fixed memory leak in mysqldump Removed warnings from mysqltest scripts (replaced -- with #) BitKeeper/etc/ignore: added mysql-test/r/*.warnings BUILD/SETUP.sh: Don't build with BDB as default client/client_priv.h: Added OPT_DEBUG_INFO client/mysqlbinlog.cc: Fixed compiler warning client/mysqldump.c: Removed compiler warnings Added option --debug-info to detect memory leaks Fixed memory leak Don't backup cluster replication tables (if used with 5.1) cmd-line-utils/readline/bind.c: Fixed compiler warning cmd-line-utils/readline/chardefs.h: Fixed compiler warning cmd-line-utils/readline/complete.c: Fixed compiler warning cmd-line-utils/readline/display.c: Fixed compiler warning cmd-line-utils/readline/histexpand.c: Fixed compiler warning cmd-line-utils/readline/input.c: Fixed compiler warning cmd-line-utils/readline/isearch.c: Fixed compiler warning cmd-line-utils/readline/kill.c: Fixed compiler warning cmd-line-utils/readline/macro.c: Fixed compiler warning cmd-line-utils/readline/misc.c: Fixed compiler warning cmd-line-utils/readline/nls.c: Fixed compiler warning cmd-line-utils/readline/readline.c: Fixed compiler warning cmd-line-utils/readline/rltty.c: Fixed compiler warning cmd-line-utils/readline/search.c: Fixed compiler warning cmd-line-utils/readline/terminal.c: Fixed compiler warning cmd-line-utils/readline/text.c: Fixed compiler warning cmd-line-utils/readline/tilde.c: Fixed compiler warning cmd-line-utils/readline/undo.c: Fixed compiler warning cmd-line-utils/readline/util.c: Fixed compiler warning cmd-line-utils/readline/vi_mode.c: Fixed compiler warning dbug/dbug_analyze.c: Fixed compiler warning extra/yassl/src/ssl.cpp: Fixed compiler warning extra/yassl/testsuite/testsuite.cpp: Fixed compiler warning heap/_check.c: Fixed compiler warning heap/hp_delete.c: Fixed compiler warning heap/hp_hash.c: Fixed compiler warning heap/hp_open.c: Fixed compiler warning heap/hp_rkey.c: Fixed compiler warning heap/hp_rrnd.c: Fixed compiler warning heap/hp_write.c: Fixed compiler warning libmysql/libmysql.c: Fixed compiler warning libmysqld/libmysqld.c: Fixed compiler warning myisam/mi_close.c: Fixed compiler warning myisam/mi_delete.c: Fixed compiler warning myisam/mi_dynrec.c: Fixed compiler warning myisam/mi_keycache.c: Fixed compiler warning myisam/mi_page.c: Fixed compiler warning myisam/mi_statrec.c: Fixed compiler warning myisam/mi_test2.c: Fixed compiler warning myisam/mi_write.c: Fixed compiler warning myisam/myisampack.c: Fixed compiler warning myisammrg/myrg_extra.c: Fixed compiler warning mysql-test/mysql-test-run.pl: Remove .reject, .progress, .log and .warnings flag at start cluster -> mysql database (for 5.1) mysql-test/include/federated.inc: Remove mysqltest warnings mysql-test/include/sp-vars.inc: Remove mysqltest warnings mysql-test/mysql-test-run.sh: Fix so that 'make test' works again Remove .reject, .progress .log and .warnings files at startup mysql-test/r/ctype_cp1250_ch.result: Drop used tables at startup mysql-test/t/create.test: Remove mysqltest warnings mysql-test/t/csv.test: Remove mysqltest warnings mysql-test/t/ctype_collate.test: Remove mysqltest warnings mysql-test/t/ctype_cp1250_ch.test: Drop used tables at startup mysql-test/t/ctype_ucs.test: Remove mysqltest warnings mysql-test/t/func_sapdb.test: Remove mysqltest warnings mysql-test/t/func_str.test: Remove mysqltest warnings mysql-test/t/grant.test: Remove mysqltest warnings mysql-test/t/greedy_optimizer.test: Remove mysqltest warnings mysql-test/t/group_min_max.test: Remove mysqltest warnings mysql-test/t/innodb.test: Remove mysqltest warnings mysql-test/t/join.test: Remove mysqltest warnings mysql-test/t/limit.test: Remove mysqltest warnings mysql-test/t/null.test: Remove mysqltest warnings mysql-test/t/select.test: Remove mysqltest warnings mysql-test/t/sp-prelocking.test: Remove mysqltest warnings mysql-test/t/strict.test: Remove mysqltest warnings mysql-test/t/subselect.test: Remove mysqltest warnings mysql-test/t/type_newdecimal.test: Remove mysqltest warnings mysql-test/t/view_grant.test: Remove mysqltest warnings mysys/default.c: Fixed compiler warning mysys/hash.c: Fixed compiler warning mysys/list.c: Fixed compiler warning mysys/mf_iocache.c: Fixed compiler warning mysys/mf_keycache.c: Fixed compiler warning mysys/mf_keycaches.c: Fixed compiler warning mysys/my_alloc.c: Fixed compiler warning mysys/my_dup.c: Fixed compiler warning mysys/my_fopen.c: Fixed compiler warning mysys/my_fstream.c: Fixed compiler warning mysys/my_getwd.c: Fixed compiler warning mysys/my_handler.c: Fixed compiler warning Added missing enums in switch mysys/my_lib.c: Fixed compiler warning mysys/my_lread.c: Fixed compiler warning mysys/my_lwrite.c: Fixed compiler warning mysys/my_malloc.c: Fixed compiler warning mysys/my_pread.c: Fixed compiler warning mysys/my_read.c: Fixed compiler warning mysys/my_realloc.c: Fixed compiler warning mysys/my_seek.c: Fixed compiler warning mysys/my_write.c: Fixed compiler warning mysys/safemalloc.c: Fixed compiler warning mysys/thr_lock.c: Fixed compiler warning mysys/tree.c: Fixed compiler warning mysys/typelib.c: Fixed compiler warning ndb/include/logger/LogHandler.hpp: Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings) ndb/include/ndb_global.h.in: Added LINT_SET_PTR macro to be able to remove some compiler warnings ndb/include/util/InputStream.hpp: Fixed compiler warning ndb/include/util/OutputStream.hpp: Fixed compiler warning ndb/include/util/SimpleProperties.hpp: Fixed compiler warning ndb/src/common/debugger/EventLogger.cpp: remove if on 'signal' as this is a function pointer and is always true ndb/src/common/debugger/signaldata/BackupSignalData.cpp: Add missing enums ndb/src/common/logger/LogHandler.cpp: Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings) ndb/src/common/portlib/NdbMutex.c: Fixed compiler warning ndb/src/common/portlib/NdbThread.c: Fixed compiler warning ndb/src/common/transporter/Transporter.cpp: Swapped arguments to remove compiler warnings ndb/src/cw/cpcd/CPCD.hpp: Fixed compiler warning ndb/src/kernel/blocks/backup/Backup.cpp: Fixed compiler warning ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Fixed compiler warning ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Fixed compiler warning ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp: Fixed compiler warning ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Added missing enums ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Fixed compiler warning ndb/src/kernel/error/ErrorReporter.cpp: Fixed compiler warning ndb/src/kernel/error/ErrorReporter.hpp: Fixed compiler warning ndb/src/kernel/error/ndbd_exit_codes.c: Fixed compiler warning ndb/src/kernel/vm/TransporterCallback.cpp: Fixed compiler warning ndb/src/mgmapi/mgmapi.cpp: Fixed compiler warning ndb/src/mgmclient/CommandInterpreter.cpp: Fixed compiler warning ndb/src/mgmsrv/MgmtSrvr.cpp: Fixed compiler warning ndb/src/mgmsrv/Services.cpp: Fixed compiler warning ndb/src/ndbapi/ClusterMgr.cpp: Fixed compiler warning ndb/src/ndbapi/DictCache.cpp: Fixed compiler warning ndb/src/ndbapi/Ndb.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationDefine.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationExec.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationInt.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationSearch.cpp: Fixed compiler warning ndb/src/ndbapi/NdbTransaction.cpp: Fixed compiler warning ndb/src/ndbapi/Ndbif.cpp: Fixed compiler warning ndb/src/ndbapi/Ndbinit.cpp: Fixed compiler warning ndb/src/ndbapi/ndb_cluster_connection.cpp: Fixed compiler warning ndb/tools/drop_index.cpp: Fixed compiler warning ndb/tools/drop_tab.cpp: Fixed compiler warning ndb/tools/ndb_config.cpp: Fixed compiler warning regex/regexec.c: Fixed compiler warning server-tools/instance-manager/mysql_connection.cc: Fixed compiler warning sql/Makefile.am: Fix for bison 1.875, which adds an attribute statement that gcc 4.1.0 can't parse sql/filesort.cc: Fixed compiler warning sql/ha_archive.cc: Fixed compiler warning sql/ha_federated.cc: Fixed compiler warning sql/ha_federated.h: Fixed compiler warning sql/ha_innodb.cc: Fixed compiler warning sql/ha_myisam.cc: Fixed compiler warning sql/ha_myisammrg.cc: Fixed compiler warning sql/ha_ndbcluster.cc: Fixed compiler warning sql/handler.cc: Fixed compiler warning sql/item_cmpfunc.cc: Fixed compiler warning sql/item_subselect.cc: Fixed compiler warning sql/item_timefunc.cc: Fixed compiler warning sql/log_event.cc: Fixed compiler warning sql/mysqld.cc: Fixed compiler warning sql/net_serv.cc: Fixed compiler warning sql/opt_range.cc: Fixed compiler warning Formated DBUG statements to be as rest of code sql/slave.cc: Fixed compiler warning sql/sql_acl.cc: Fixed compiler warning sql/sql_cache.cc: Fixed compiler warning Fixed bug in query cache when used with DBUG traceing sql/sql_class.cc: Fixed compiler warning sql/sql_class.h: Fixed compiler warning sql/sql_delete.cc: Fixed compiler warning sql/sql_parse.cc: Fixed compiler warning Hack to fix my_sprintf() strings with %b sql/sql_prepare.cc: Fixed compiler warning Hack to fix my_sprintf() strings with %b sql/sql_repl.cc: Fixed compiler warning sql/sql_select.cc: Fixed compiler warning sql/sql_update.cc: Fixed compiler warning sql/sql_view.cc: Fixed compiler warning sql/strfunc.cc: Fixed compiler warning sql-common/client.c: Fixed compiler warning sql-common/my_time.c: Fixed compiler warning sql/table.cc: Fixed compiler warning sql/tztime.cc: Fixed compiler warning sql/unireg.cc: Fixed compiler warning strings/decimal.c: Fixed compiler warning tests/mysql_client_test.c: Fixed compiler warning vio/viosocket.c: Fixed compiler warning vio/viossl.c: Fixed compiler warning vio/viosslfactories.c: Fixed compiler warning
305 lines
5.5 KiB
Text
305 lines
5.5 KiB
Text
#
|
|
# Tests of prelocking-free execution of stored procedures.
|
|
# Currently two properties of prelocking-free SP execution are checked:
|
|
# - It is possible to execute DDL statements in prelocking-free stored
|
|
# procedure
|
|
# - The same procedure can be called in prelocking-free mode and
|
|
# in prelocked mode (from within a function).
|
|
|
|
--disable_warnings
|
|
drop database if exists mysqltest;
|
|
drop table if exists t1, t2, t3, t4;
|
|
drop procedure if exists sp1;
|
|
drop procedure if exists sp2;
|
|
drop procedure if exists sp3;
|
|
drop procedure if exists sp4;
|
|
drop function if exists f1;
|
|
drop function if exists f2;
|
|
drop function if exists f3;
|
|
--enable_warnings
|
|
|
|
# BUG#8072
|
|
|
|
create database mysqltest;
|
|
delimiter //;
|
|
use mysqltest//
|
|
create procedure sp1 ()
|
|
begin
|
|
drop table if exists t1;
|
|
select 1 as "my-col";
|
|
end;
|
|
//
|
|
delimiter ;//
|
|
|
|
select database();
|
|
call sp1();
|
|
select database();
|
|
|
|
use test;
|
|
select database();
|
|
call mysqltest.sp1();
|
|
select database();
|
|
|
|
drop procedure mysqltest.sp1;
|
|
drop database mysqltest;
|
|
|
|
# BUG#8766
|
|
|
|
delimiter //;
|
|
create procedure sp1()
|
|
begin
|
|
create table t1 (a int);
|
|
insert into t1 values (10);
|
|
end//
|
|
|
|
create procedure sp2()
|
|
begin
|
|
create table t2(a int);
|
|
insert into t2 values(1);
|
|
call sp1();
|
|
end//
|
|
|
|
create function f1() returns int
|
|
begin
|
|
return (select max(a) from t1);
|
|
end//
|
|
|
|
create procedure sp3()
|
|
begin
|
|
call sp1();
|
|
select 'func', f1();
|
|
end//
|
|
|
|
delimiter ;//
|
|
|
|
call sp1();
|
|
select 't1',a from t1;
|
|
|
|
drop table t1;
|
|
call sp2();
|
|
select 't1',a from t1;
|
|
select 't2',a from t2;
|
|
drop table t1, t2;
|
|
|
|
call sp3();
|
|
select 't1',a from t1;
|
|
|
|
drop table t1;
|
|
|
|
drop procedure sp1;
|
|
drop procedure sp2;
|
|
drop procedure sp3;
|
|
drop function f1;
|
|
|
|
delimiter //;
|
|
create procedure sp1()
|
|
begin
|
|
create temporary table t2(a int);
|
|
insert into t2 select * from t1;
|
|
end//
|
|
|
|
create procedure sp2()
|
|
begin
|
|
create temporary table t1 (a int);
|
|
insert into t1 values(1);
|
|
call sp1();
|
|
select 't1', a from t1;
|
|
select 't2', a from t2;
|
|
drop table t1;
|
|
drop table t2;
|
|
end//
|
|
|
|
delimiter ;//
|
|
call sp2();
|
|
|
|
drop procedure sp1;
|
|
drop procedure sp2;
|
|
|
|
# Miscelaneous tests
|
|
create table t1 (a int);
|
|
insert into t1 values(1),(2);
|
|
create table t2 as select * from t1;
|
|
create table t3 as select * from t1;
|
|
create table t4 as select * from t1;
|
|
delimiter //;
|
|
create procedure sp1(a int)
|
|
begin
|
|
select a;
|
|
end //
|
|
|
|
create function f1() returns int
|
|
begin
|
|
return (select max(a) from t1);
|
|
end //
|
|
|
|
delimiter ;//
|
|
|
|
CALL sp1(f1());
|
|
|
|
#############
|
|
delimiter //;
|
|
create procedure sp2(a int)
|
|
begin
|
|
select * from t3;
|
|
select a;
|
|
end //
|
|
|
|
create procedure sp3()
|
|
begin
|
|
select * from t1;
|
|
call sp2(5);
|
|
end //
|
|
|
|
create procedure sp4()
|
|
begin
|
|
select * from t2;
|
|
call sp3();
|
|
end //
|
|
|
|
delimiter ;//
|
|
call sp4();
|
|
|
|
drop procedure sp1;
|
|
drop procedure sp2;
|
|
drop procedure sp3;
|
|
drop procedure sp4;
|
|
drop function f1;
|
|
|
|
# Test that prelocking state restoration works with cursors
|
|
--disable_warnings
|
|
drop view if exists v1;
|
|
--enable_warnings
|
|
delimiter //;
|
|
|
|
create function f1(ab int) returns int
|
|
begin
|
|
declare i int;
|
|
set i= (select max(a) from t1 where a < ab) ;
|
|
return i;
|
|
end //
|
|
|
|
create function f2(ab int) returns int
|
|
begin
|
|
declare i int;
|
|
set i= (select max(a) from t2 where a < ab) ;
|
|
return i;
|
|
end //
|
|
|
|
create view v1 as
|
|
select t3.a as x, t4.a as y, f2(3) as z
|
|
from t3, t4 where t3.a = t4.a //
|
|
|
|
create procedure sp1()
|
|
begin
|
|
declare a int;
|
|
set a= (select f1(4) + count(*) A from t1, v1);
|
|
end //
|
|
|
|
|
|
create function f3() returns int
|
|
begin
|
|
call sp1();
|
|
return 1;
|
|
end //
|
|
|
|
call sp1() //
|
|
|
|
select f3() //
|
|
select f3() //
|
|
|
|
call sp1() //
|
|
|
|
# ---------------
|
|
drop procedure sp1//
|
|
drop function f3//
|
|
|
|
create procedure sp1()
|
|
begin
|
|
declare x int;
|
|
declare c cursor for select f1(3) + count(*) from v1;
|
|
open c;
|
|
fetch c into x;
|
|
end;//
|
|
|
|
create function f3() returns int
|
|
begin
|
|
call sp1();
|
|
return 1;
|
|
end //
|
|
|
|
call sp1() //
|
|
call sp1() //
|
|
|
|
select f3() //
|
|
call sp1() //
|
|
|
|
delimiter ;//
|
|
drop view v1;
|
|
drop table t1,t2,t3,t4;
|
|
drop function f1;
|
|
drop function f2;
|
|
drop function f3;
|
|
drop procedure sp1;
|
|
|
|
#
|
|
# Bug#15683 "crash, Function on nested VIEWs, Prepared statement"
|
|
# Check that when creating the prelocking list a nested view
|
|
# is not merged until it's used.
|
|
#
|
|
--disable_warnings
|
|
drop table if exists t1;
|
|
drop view if exists v1, v2, v3;
|
|
drop function if exists bug15683;
|
|
--enable_warnings
|
|
create table t1 (f1 bigint, f2 varchar(20), f3 bigint);
|
|
insert into t1 set f1 = 1, f2 = 'schoenenbourg', f3 = 1;
|
|
create view v1 as select 1 from t1 union all select 1;
|
|
create view v2 as select 1 from v1;
|
|
create view v3 as select 1 as f1 from v2;
|
|
|
|
delimiter |;
|
|
create function bug15683() returns bigint
|
|
begin
|
|
return (select count(*) from v3);
|
|
end|
|
|
delimiter ;|
|
|
|
|
prepare stmt from "select bug15683()";
|
|
execute stmt;
|
|
execute stmt;
|
|
deallocate prepare stmt;
|
|
drop table t1;
|
|
drop view v1, v2, v3;
|
|
drop function bug15683;
|
|
|
|
|
|
#
|
|
# Bug#19634 "Re-execution of multi-delete which involve trigger/stored
|
|
# function crashes server"
|
|
#
|
|
--disable_warnings
|
|
drop table if exists t1, t2, t3;
|
|
drop function if exists bug19634;
|
|
--enable_warnings
|
|
create table t1 (id int, data int);
|
|
create table t2 (id int);
|
|
create table t3 (data int);
|
|
create function bug19634() returns int return (select count(*) from t3);
|
|
prepare stmt from "delete t1 from t1, t2 where t1.id = t2.id and bug19634()";
|
|
# This should not crash server
|
|
execute stmt;
|
|
execute stmt;
|
|
deallocate prepare stmt;
|
|
|
|
create trigger t1_bi before delete on t1 for each row insert into t3 values (old.data);
|
|
prepare stmt from "delete t1 from t1, t2 where t1.id = t2.id";
|
|
|
|
execute stmt;
|
|
execute stmt;
|
|
deallocate prepare stmt;
|
|
|
|
drop function bug19634;
|
|
drop table t1, t2, t3;
|
|
|
|
|
|
--echo End of 5.0 tests
|