summaryrefslogtreecommitdiff
path: root/sql/datadict.cc
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2017-05-23 17:18:31 +0300
committerMonty <monty@mariadb.org>2017-05-23 21:12:27 +0300
commit6a779a6d28fa69be4c89b72205a11398859f07ca (patch)
tree3989411d5e69eca72359ab909c10e37cf778378e /sql/datadict.cc
parentd9304914bed2d6d45dbc9f43aa1e2f7ea3bbeb13 (diff)
downloadmariadb-git-6a779a6d28fa69be4c89b72205a11398859f07ca.tar.gz
Make SEQUENCE working with replication
- Old sequence code forced row based replication for any statements that refered to a sequence table. What is new is that row based replication is now sequence aware: - NEXT VALUE is now generating a short row based event with only next_value and round being replicated. - Short row based events are now on the slave updated as trough SET_VALUE(sequence_name) - Full row based events are on the slave updated with a full insert, which is practically same as ALTER SEQUENCE. - INSERT on a SEQUENCE table does now a EXCLUSIVE LOCK to ensure that it is logged in binary log before any following NEXT VALUE calls. - Enable all sequence tests and fixed found bugs - ALTER SEQUENCE doesn't anymore allow changes that makes the next_value outside of allowed range - SEQUENCE changes are done with TL_WRITE_ALLOW_WRITE. Because of this one can generate a statement for MyISAM with both TL_WRITE_CONCURRENT_INSERT and TL_WRITE_ALLOW_WRITE. To fix a warning I had to add an extra test in thr_lock.c for this. - Removed UPDATE of SEQUENCE (no need to support this as we have ALTER SEQUENCE, which takes the EXCLUSIVE lock properly. - Removed DBUG_ASSERT() in MDL_context::upgrade_shared_lock. This was removed upstream in MySQL 5.6 in 72f823de453. - Simplified test in decided_logging_format() by using sql_command_flags() - Fix that we log DROP SEQUENCE correctly. - Fixed that Aria works with SEQUENCE
Diffstat (limited to 'sql/datadict.cc')
-rw-r--r--sql/datadict.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/datadict.cc b/sql/datadict.cc
index b5a6a6794ce..edc9fe5681b 100644
--- a/sql/datadict.cc
+++ b/sql/datadict.cc
@@ -88,6 +88,12 @@ Table_type dd_frm_type(THD *thd, char *path, LEX_CSTRING *engine_name,
engine_name->length= 0;
dbt= header[3];
+ if (((header[39] >> 4) & 3) == HA_CHOICE_YES)
+ {
+ DBUG_PRINT("info", ("Sequence found"));
+ *is_sequence= 1;
+ }
+
/* cannot use ha_resolve_by_legacy_type without a THD */
if (thd && dbt < DB_TYPE_FIRST_DYNAMIC)
{
@@ -99,9 +105,6 @@ Table_type dd_frm_type(THD *thd, char *path, LEX_CSTRING *engine_name,
}
}
- if (((header[39] >> 4) & 3) == HA_CHOICE_YES)
- *is_sequence= 1;
-
/* read the true engine name */
{
MY_STAT state;