database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Made sp.test more repeatable.

Browse Source
This commit is contained in:
dlenev@brandersnatch.localdomain
2004-08-13 20:02:52 +04:00
parent c92db89c44
commit 15547058e5
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,3 +1,4 @@
reset master;
use test;
drop table if exists t1;
drop table if exists t2;
@@ -1457,7 +1458,6 @@ show keys from t1;
show master status;
show open tables like 'foo';
show privileges;
show processlist;
show slave hosts;
show slave status;
show status like 'foo';
@@ -1513,8 +1513,6 @@ Shutdown Server Admin To shut down the server
Super Server Admin To use KILL thread, SET GLOBAL, CHANGE MASTER, etc.
Update Tables To update existing rows
Usage Server Admin No privileges - allow connect only
Id User Host db Command Time State Info
1 root localhost test Query 0 query end call bug4902()
Server_id Host Port Rpl_recovery_rank Master_id
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
Variable_name Value
@@ -1569,8 +1567,6 @@ Shutdown Server Admin To shut down the server
Super Server Admin To use KILL thread, SET GLOBAL, CHANGE MASTER, etc.
Update Tables To update existing rows
Usage Server Admin No privileges - allow connect only
Id User Host db Command Time State Info
1 root localhost test Query 0 query end call bug4902()
Server_id Host Port Rpl_recovery_rank Master_id
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
Variable_name Value
@@ -1578,6 +1574,17 @@ Tables_in_test (foo) table_type
Variable_name Value
Level Code Message
drop procedure bug4902|
create procedure bug4902_2()
begin
show processlist;
end|
call bug4902_2()|
Id User Host db Command Time State Info
# root localhost test Query 0 NULL call bug4902_2()
call bug4902_2()|
Id User Host db Command Time State Info
# root localhost test Query 0 NULL call bug4902_2()
drop procedure bug4902_2|
drop table if exists t3|
create procedure bug4904()
begin

16
mysql-test/t/sp.test
View File

@@ -3,6 +3,10 @@
#
#
# Let us reset binary logs in order to make show master status
# in test for bug 4902 repeatable.
reset master;
use test;
--disable_warnings
@@ -1701,7 +1705,6 @@ begin
show master status;
show open tables like 'foo';
show privileges;
show processlist;
show slave hosts;
show slave status;
show status like 'foo';
@@ -1717,6 +1720,17 @@ call bug4902()|
drop procedure bug4902|
# We need separate SP for SHOW PROCESSLIST since we want use replace_column
create procedure bug4902_2()
begin
show processlist;
end|
--replace_column 1 #
call bug4902_2()|
--replace_column 1 #
call bug4902_2()|
drop procedure bug4902_2|
#
# BUG#4904
#