maria-developers team mailing list archive
-
maria-developers team
-
Mailing list archive
-
Message #03060
[Branch ~maria-captains/maria/5.1] Rev 2852: bugfix from mysql-5.1, apparently lost in a merge
------------------------------------------------------------
revno: 2852
committer: Sergei Golubchik <sergii@xxxxxxxxx>
branch nick: maria-5.1
timestamp: Mon 2010-05-10 16:23:08 +0200
message:
bugfix from mysql-5.1, apparently lost in a merge
modified:
sql/sql_select.cc
--
lp:maria
https://code.launchpad.net/~maria-captains/maria/5.1
Your team Maria developers is subscribed to branch lp:maria.
To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription
=== modified file 'sql/sql_select.cc'
--- sql/sql_select.cc 2010-04-08 20:55:17 +0000
+++ sql/sql_select.cc 2010-05-10 14:23:08 +0000
@@ -10986,6 +10986,11 @@
if (table->s->db_type() != heap_hton ||
error != HA_ERR_RECORD_FILE_FULL)
{
+ /*
+ We don't want this error to be converted to a warning, e.g. in case of
+ INSERT IGNORE ... SELECT.
+ */
+ thd->fatal_error();
table->file->print_error(error,MYF(0));
DBUG_RETURN(1);
}