database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fixed previous patch, wrong if() -test.

Browse Source
This commit is contained in:
unknown
2007-04-04 20:32:31 +03:00
parent fbd929f802
commit 0b4db8addd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_parse.cc
View File

@ -3571,8 +3571,8 @@ end_with_restore_list:
res= TRUE; // cannot happen res= TRUE; // cannot happen
else else
{ {
if ((thd->options & OPTION_KEEP_LOG) && if (((thd->options & OPTION_KEEP_LOG) || thd->no_trans_update.all) &&
thd->no_trans_update.all && !thd->slave_thread) !thd->slave_thread)
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_WARNING_NOT_COMPLETE_ROLLBACK, ER_WARNING_NOT_COMPLETE_ROLLBACK,
ER(ER_WARNING_NOT_COMPLETE_ROLLBACK)); ER(ER_WARNING_NOT_COMPLETE_ROLLBACK));