1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge to latest 5.0-bugteam tree

Browse Source
This commit is contained in:
Satya B 2009-04-24 16:53:56 +05:30
commit 55533a7efd
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/mysqldump.result
View File

@ -3557,7 +3557,6 @@ DROP TABLE t1,t2;
-- Dump completed on DATE -- Dump completed on DATE
SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
# #
# Bug #42635: mysqldump includes views that were excluded using # Bug #42635: mysqldump includes views that were excluded using
# the --ignore-table option # the --ignore-table option
@ -3693,6 +3692,7 @@ UNLOCK TABLES;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
DROP TABLE `כדשגכחךלדגכחשךדגחכךלדגכ`; DROP TABLE `כדשגכחךלדגכחשךדגחכךלדגכ`;
SET NAMES latin1; SET NAMES latin1;
SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
# #
# End of 5.0 tests # End of 5.0 tests
# #

6
mysql-test/t/mysqldump.test
View File

@ -1646,9 +1646,6 @@ DROP TABLE t1,t2;
--replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// / on [0-9 :-]+/ on DATE/ --replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// / on [0-9 :-]+/ on DATE/
--exec $MYSQL_DUMP test --exec $MYSQL_DUMP test
# We reset concurrent_inserts value to whatever it was at the start of the test
SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
--echo # --echo #
--echo # Bug #42635: mysqldump includes views that were excluded using --echo # Bug #42635: mysqldump includes views that were excluded using
--echo # the --ignore-table option --echo # the --ignore-table option
@ -1681,6 +1678,9 @@ CREATE TABLE `כדשגכחךלדגכחשךדגחכךלדגכ` ( f1 INT );
DROP TABLE `כדשגכחךלדגכחשךדגחכךלדגכ`; DROP TABLE `כדשגכחךלדגכחשךדגחכךלדגכ`;
SET NAMES latin1; SET NAMES latin1;
# We reset concurrent_inserts value to whatever it was at the start of the test
# This line must be executed _after_ all test cases.
SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;
--echo # --echo #
--echo # End of 5.0 tests --echo # End of 5.0 tests

10
sql/sql_table.cc
View File

@ -4376,6 +4376,16 @@ bool mysql_checksum_table(THD *thd, TABLE_LIST *tables, HA_CHECK_OPT *check_opt)
{ {
for (;;) for (;;)
{ {
if (thd->killed)
{
/*
we've been killed; let handler clean up, and remove the
partial current row from the recordset (embedded lib)
*/
t->file->ha_rnd_end();
thd->protocol->remove_last_row();
goto err;
}
ha_checksum row_crc= 0; ha_checksum row_crc= 0;
int error= t->file->rnd_next(t->record[0]); int error= t->file->rnd_next(t->record[0]);
if (unlikely(error)) if (unlikely(error))