mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-02 13:15:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Backport Bug#37148 to 5.1

Browse source
This commit is contained in:
He Zhenxing 2010-01-24 15:03:23 +08:00
commit 2b16517522
28 changed files with 472 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sql/sql_view.cc
View file

@ -662,8 +662,9 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
buff.append(views->source.str, views->source.length);
int errcode= query_error_code(thd, TRUE);
thd->binlog_query(THD::STMT_QUERY_TYPE,
buff.ptr(), buff.length(), FALSE, FALSE, errcode);
if (thd->binlog_query(THD::STMT_QUERY_TYPE,
buff.ptr(), buff.length(), FALSE, FALSE, errcode))
res= TRUE;
}
VOID(pthread_mutex_unlock(&LOCK_open));
@ -1652,7 +1653,8 @@ bool mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode)
/* if something goes wrong, bin-log with possible error code,
otherwise bin-log with error code cleared.
*/
write_bin_log(thd, !something_wrong, thd->query(), thd->query_length());
if (write_bin_log(thd, !something_wrong, thd->query(), thd->query_length()))
something_wrong= 1;
}
VOID(pthread_mutex_unlock(&LOCK_open));