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

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

Browse Source 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
This commit is contained in:
msvensson@pilot.blaudden
2007-02-26 11:00:17 +01:00
parent da3c2d387f 1770993db7
commit 5f7dbe07cd
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mysql-test/include/get_binlog_dump_thread_id.inc
View File

@ -1,9 +1,22 @@
--exec $MYSQL test -e 'show processlist' | grep 'Binlog Dump' | cut -f1 > $MYSQLTEST_VARDIR/tmp/bl_dump_thread_id
--exec $MYSQL test -e "show processlist" > $MYSQLTEST_VARDIR/tmp/bl_dump_thread_id
--disable_warnings
drop table if exists t999;
--enable_warnings
create temporary table t999 (f int);
# Create a table to hold the process list
create temporary table t999(
id int,
user char(255),
host char(255),
db char(255),
Command char(255),
time int,
State char(255),
info char(255)
);
# Load processlist into table, headers will create seom warnings
--disable_warnings
--replace_result $MYSQLTEST_VARDIR "."
eval LOAD DATA INFILE "$MYSQLTEST_VARDIR/tmp/bl_dump_thread_id" into table t999;
let $id = `select f from t999`;
--enable_warnings
let $id = `select Id from t999 where Command="Binlog Dump"`;
drop table t999;

2
mysql-test/t/trigger-grant.test
View File

@ -368,6 +368,8 @@ open(FILE, "<", $fname) or die;
my @content= grep($_ !~ /^definers=/, <FILE>);
close FILE;
open(FILE, ">", $fname) or die;
# Use binary file mode to avoid CR/LF's being added on windows
binmode FILE;
print FILE @content;
print FILE "definers='' '\@' '\@abc\@def\@\@' '\@hostname' '\@abcdef\@\@\@hostname'\n";
close FILE;