mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Prevent adding 'CREATE TABLE .. SELECT' query to the binary log when the
insertion of new records partially failed. It would get logged because of the logic to log a partially-failed 'INSERT ... SELECT' (which can't be rolled back in non-transactional tables), but 'CREATE TABLE ... SELECT' is always rolled back on failure, even for non-transactional tables. (Bug #6682) (Original fix reimplemented after review by Serg and Guilhem.)
This commit is contained in:
@@ -31,14 +31,6 @@
|
||||
#endif
|
||||
|
||||
#include "sql_acl.h" // for SUPER_ACL
|
||||
# define tmp_disable_binlog(A) \
|
||||
ulong save_options= (A)->options, save_master_access= (A)->master_access; \
|
||||
(A)->options&= ~OPTION_BIN_LOG; \
|
||||
(A)->master_access|= SUPER_ACL; /* unneeded in 4.1 */
|
||||
|
||||
#define reenable_binlog(A) \
|
||||
(A)->options= save_options; \
|
||||
(A)->master_access= save_master_access;
|
||||
|
||||
extern HASH open_cache;
|
||||
static const char *primary_key_name="PRIMARY";
|
||||
|
||||
Reference in New Issue
Block a user