database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2022-03-11 09:53:40 +02:00
parent fabaac86a1 5503c40460
commit be6f9593fe
18 changed files with 175 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_lex.h
View File

@@ -1,5 +1,5 @@
/* Copyright (c) 2000, 2019, Oracle and/or its affiliates.
Copyright (c) 2010, 2021, MariaDB Corporation
Copyright (c) 2010, 2022, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -1948,6 +1948,11 @@ public:
*/
BINLOG_STMT_UNSAFE_AUTOINC_NOT_FIRST,
/**
Autoincrement lock mode is incompatible with STATEMENT binlog format.
*/
BINLOG_STMT_UNSAFE_AUTOINC_LOCK_MODE,
/**
INSERT .. SELECT ... SKIP LOCKED is unlikely to have the same
rows locked on the replica.