diff options
author | monty@mishka.local <> | 2004-09-15 22:10:31 +0300 |
---|---|---|
committer | monty@mishka.local <> | 2004-09-15 22:10:31 +0300 |
commit | 91ff64e107866821efc8591fc6ecf28f3b7ee9a0 (patch) | |
tree | d4323a7f81c07c98095c922e124755d6ac3253b8 /sql/sql_help.cc | |
parent | 3ce78a27cdcb9b0ba4d6e0f36f2953cf8db7b518 (diff) | |
download | mariadb-git-91ff64e107866821efc8591fc6ecf28f3b7ee9a0.tar.gz |
Added options --auto-increment-increment and --auto-increment-offset.
This allows one to setup a master <-> master replication with non conflicting auto-increment series.
Cleaned up binary log code to make it easyer to add new state variables.
Added simpler 'upper level' logic for artificial events (events that should not cause cleanups on slave).
Simplified binary log handling.
Changed how auto_increment works together with to SET INSERT_ID=# to make it more predictable: Now the inserted rows in a multi-row statement are set independent of the existing rows in the table. (Before only InnoDB did this correctly)
Diffstat (limited to 'sql/sql_help.cc')
-rw-r--r-- | sql/sql_help.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_help.cc b/sql/sql_help.cc index 8fc0671c808..cba74c93a6a 100644 --- a/sql/sql_help.cc +++ b/sql/sql_help.cc @@ -640,7 +640,7 @@ int mysqld_help(THD *thd, const char *mask) uint mlen= strlen(mask); MEM_ROOT *mem_root= &thd->mem_root; - if (res= open_and_lock_tables(thd, tables)) + if ((res= open_and_lock_tables(thd, tables))) goto end; /* Init tables and fields to be usable from items |