diff options
| author | Sergey Petrunia <psergey@askmonty.org> | 2009-06-25 02:44:14 +0400 |
|---|---|---|
| committer | Sergey Petrunia <psergey@askmonty.org> | 2009-06-25 02:44:14 +0400 |
| commit | e1250b86569f1fc3f634985b16892f5c702acbb7 (patch) | |
| tree | fcd8d2d04216de15e1efea171c5f155dc270d3e6 /mysql-test | |
| parent | defbdce7e8c69df85cdd8c630643ef1152330660 (diff) | |
| download | mariadb-git-e1250b86569f1fc3f634985b16892f5c702acbb7.tar.gz | |
MWL#17: Table elimination
- fix a typo bug in has_eqref_access_candidate()
- Adjust test to remove race condition
mysql-test/r/mysql-bug41486.result:
Adjust test to remove race condition
mysql-test/t/mysql-bug41486.test:
Adjust test to remove race condition
sql/item.cc:
MWL#17: Table elimination:
fix a typo bug in has_eqref_access_candidate()
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/mysql-bug41486.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/mysql-bug41486.test | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/r/mysql-bug41486.result b/mysql-test/r/mysql-bug41486.result index 02777ab587f..62a6712eae1 100644 --- a/mysql-test/r/mysql-bug41486.result +++ b/mysql-test/r/mysql-bug41486.result @@ -3,6 +3,9 @@ SET @old_max_allowed_packet= @@global.max_allowed_packet; SET @@global.max_allowed_packet = 2 * 1024 * 1024 + 1024; CREATE TABLE t1(data LONGBLOB); INSERT INTO t1 SELECT REPEAT('1', 2*1024*1024); +SELECT COUNT(*) FROM t1; +COUNT(*) +1 SET @old_general_log = @@global.general_log; SET @@global.general_log = 0; SET @@global.general_log = @old_general_log; diff --git a/mysql-test/t/mysql-bug41486.test b/mysql-test/t/mysql-bug41486.test index 6e014bca7d1..e7b0acc1935 100644 --- a/mysql-test/t/mysql-bug41486.test +++ b/mysql-test/t/mysql-bug41486.test @@ -27,7 +27,8 @@ connect (con1, localhost, root,,); CREATE TABLE t1(data LONGBLOB); INSERT INTO t1 SELECT REPEAT('1', 2*1024*1024); - +# The following is to remove the race between end of insert and start of MYSQL_DUMP: +SELECT COUNT(*) FROM t1; let $outfile= $MYSQLTEST_VARDIR/tmp/bug41486.sql; --error 0,1 remove_file $outfile; |