summaryrefslogtreecommitdiff
path: root/support-files/db.opt
diff options
context:
space:
mode:
authorMichael Widenius <monty@mariadb.org>2014-05-03 19:12:17 +0300
committerMichael Widenius <monty@mariadb.org>2014-05-03 19:12:17 +0300
commita10a9448b0902ca2e677f3274c06b6bf697ba3b5 (patch)
tree3248845e3cf640e07de30fe3a4cac83b31f0de09 /support-files/db.opt
parentf137be800e3d6be71cbb3d4013c9fa56112c1f89 (diff)
downloadmariadb-git-a10a9448b0902ca2e677f3274c06b6bf697ba3b5.tar.gz
Added new states to be able to better diagnose where server hangs.
- Table locks now ends with state "After table lock" - Open table now ends with state "After opening tables" - All calls to close_thread_tables(), not only from mysql_execute_command(), has state "closing tables" - Added state "executing" for mysql admin commands, like CACHE INDEX, REPAIR TABLE etc. - Added state "Finding key cache" for CACHE INDEX - Added state "Filling schema table" when we generate temporary table for SHOW commands and information schema. Other things: Add limit from innobase for thread_sleep_delay. This fixed a failing tests case. Added db.opt to support-files to make 'make package' work mysql-test/suite/funcs_1/datadict/processlist_val.inc: Use new state mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result: Updated test result because of new state mysql-test/suite/funcs_1/r/processlist_val_no_prot.result: Updated test result because of new state sql/CMakeLists.txt: Have option files in support-files sql/lock.cc: Added new state 'After table lock' sql/sql_admin.cc: Added state "executing" and "Sending data" for mysql admin commands, like CACHE INDEX, REPAIR TABLE etc. Added state "Finding key cache" sql/sql_base.cc: open tables now ends with state "After table lock", instead of NULL sql/sql_parse.cc: Moved state "closing tables" to close_thread_tables() sql/sql_show.cc: Added state "Filling schema table" when we generate temporary table for SHOW commands and information schema. storage/xtradb/buf/buf0buf.c: Removed compiler warning storage/xtradb/handler/ha_innodb.cc: Add limit from innobase for thread_sleep_delay. This fixed a failing tests case. support-files/db.opt: cmakes needs this to create data/test directory
Diffstat (limited to 'support-files/db.opt')
-rw-r--r--support-files/db.opt2
1 files changed, 2 insertions, 0 deletions
diff --git a/support-files/db.opt b/support-files/db.opt
new file mode 100644
index 00000000000..d8429c4e0de
--- /dev/null
+++ b/support-files/db.opt
@@ -0,0 +1,2 @@
+default-character-set=latin1
+default-collation=latin1_swedish_ci