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

Manual merge from mysql-5.1-bugteam.

Browse Source 
Conflicts:
  - sql/mysql_priv.h
This commit is contained in:
Alexander Nozdrin
2010-01-30 21:47:11 +03:00
parent 60c9bda260 8a66b424f3
commit a59e381efa
28 changed files with 480 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));
@ -1653,7 +1654,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));