1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-4451 Attempt to write-lock a SEQUENCE table with log-bin enabled causes ER_BINLOG_ROW_ENGINE

Browse Source 
mark the SEQUENCE engine as both SBR and RBR capable :)
This commit is contained in:
Sergei Golubchik 2013-06-16 17:19:53 +02:00
parent 08a1ac9d35
commit e53b603f7c
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/sequence/mysql-test/sequence/simple.result
View File

@ -269,3 +269,7 @@ master-bin.000001 # Query # # use test; insert t1 select * from seq_1_to_10
master-bin.000001 # Xid # # COMMIT /* XID */
drop table t1;
drop table seq_1_to_1;
set binlog_format=statement;
lock table seq_1_to_2 write;
set binlog_format=row;
lock table seq_1_to_2 write;

9
storage/sequence/mysql-test/sequence/simple.test
View File

@ -95,3 +95,12 @@ drop table t1;
# MDEV-4449 SEQUENCE depends on TEST_SQL_DISCOVERY for discovering tables upon DDL
#
drop table seq_1_to_1;
#
# MDEV-4451 Attempt to write-lock a SEQUENCE table with log-bin enabled causes ER_BINLOG_ROW_ENGINE_AND_STMT_ENGINE
#
set binlog_format=statement;
lock table seq_1_to_2 write;
set binlog_format=row;
lock table seq_1_to_2 write;

3
storage/sequence/sequence.cc
View File

@ -45,7 +45,8 @@ private:
public:
ha_seq(handlerton *hton, TABLE_SHARE *table_arg)
: handler(hton, table_arg), seqs(0) { }
ulonglong table_flags() const { return 0; }
ulonglong table_flags() const
{ return HA_BINLOG_ROW_CAPABLE | HA_BINLOG_STMT_CAPABLE; }
/* open/close/locking */
int create(const char *name, TABLE *table_arg,