summaryrefslogtreecommitdiff
path: root/sql/mysqld.h
diff options
context:
space:
mode:
authorGuilhem Bichot <guilhem@mysql.com>2010-11-05 14:16:27 +0100
committerGuilhem Bichot <guilhem@mysql.com>2010-11-05 14:16:27 +0100
commit03b9e73878c8953d8228dfefb0a14d4c09756cf3 (patch)
treef404754be54b6d7ec395be8cade2484f79a24e02 /sql/mysqld.h
parent7b0db1e9f216d22de95ca2e17e6f28cb9a307841 (diff)
downloadmariadb-git-03b9e73878c8953d8228dfefb0a14d4c09756cf3.tar.gz
Fix for BUG#57316 "It is not clear how to disable autocommit"
add boolean command-line option --autocommit. mysql-test/mysql-test-run.pl: do in --gdb like in --ddd: to let the developer debug the startup phase (like command-line options parsing), don't "run". It's the third time I do this change, it was previously lost by merges, port of 6.0 to next-mr... mysql-test/r/mysqld--help-notwin.result: new command-line option mysql-test/r/mysqld--help-win.result: a Linux user's best guess at what the Windows result should be mysql-test/suite/sys_vars/inc/autocommit_func2.inc: new test mysql-test/suite/sys_vars/t/autocommit_func2-master.opt: test new option mysql-test/suite/sys_vars/t/autocommit_func3-master.opt: test new option sql/mysqld.cc: new --autocommit sql/mysqld.h: new --autocommit sql/sql_partition.cc: What matters to this partitioning quote is to have the OPTION_QUOTE_SHOW_CREATE flag down, it's all that append_identifier() uses. So we make it explicit.
Diffstat (limited to 'sql/mysqld.h')
-rw-r--r--sql/mysqld.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h
index 6e81c240f7d..dc9f94c0d03 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -391,7 +391,8 @@ enum options_mysqld
OPT_UPDATE_LOG,
OPT_WANT_CORE,
OPT_ENGINE_CONDITION_PUSHDOWN,
- OPT_LOG_ERROR
+ OPT_LOG_ERROR,
+ OPT_AUTOCOMMIT
};