summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2002-07-24 19:55:08 +0300
committermonty@mashka.mysql.fi <>2002-07-24 19:55:08 +0300
commitc702a1f8fda0814db36801b91c601329225f8030 (patch)
tree31ee919bea7e4456572b62d5ea7302dc58bc0b6a /sql/set_var.cc
parent00089b8148dfc8b3e4cf2be94ec33fc51665f529 (diff)
downloadmariadb-git-c702a1f8fda0814db36801b91c601329225f8030.tar.gz
Removed wrong implementation of CUBE/ROLLUP
Fixed bugfix of INSERT ... SET db_name.table_name.column_name Changed locking to external-locking Fix client hangup for some invalid SQL queries.
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r--sql/set_var.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 1ec59c55b1b..ec8a9e83ed3 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -475,7 +475,7 @@ struct show_var_st init_vars[]= {
{sys_safe_show_db.name, (char*) &sys_safe_show_db, SHOW_SYS},
{sys_server_id.name, (char*) &sys_server_id, SHOW_SYS},
{sys_slave_net_timeout.name,(char*) &sys_slave_net_timeout, SHOW_SYS},
- {"skip_locking", (char*) &my_disable_locking, SHOW_MY_BOOL},
+ {"skip_external_locking", (char*) &my_disable_locking, SHOW_MY_BOOL},
{"skip_networking", (char*) &opt_disable_networking, SHOW_BOOL},
{"skip_show_database", (char*) &opt_skip_show_db, SHOW_BOOL},
{sys_slow_launch_time.name, (char*) &sys_slow_launch_time, SHOW_SYS},