summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-10-20 11:24:08 +0300
committerunknown <monty@mysql.com>2004-10-20 11:24:08 +0300
commited8ec2cf1613e1bb57705698b8962e767fd89320 (patch)
tree5012e0497271e138067e54c110bf06958ba1f520 /sql/sql_class.h
parent2428fb5c2b01aba74fb3cb49bca9d690c203b715 (diff)
downloadmariadb-git-ed8ec2cf1613e1bb57705698b8962e767fd89320.tar.gz
Code cleanups (done during review of new code)
Rename innodb_table_locks_old_behavior -> innodb_table_locks Set innodb_table_locks to off by default to get same behaviour as in MySQL 4.0.20 (This means that Innodb ignore table locks by default, which makes it easier to combine MyISAM and InnoDB to simulate a transaction) libmysql/libmysql.c: Use ulong instead of unsigned long Reuse _dig_vec() myisam/myisampack.c: Simplify code mysql-test/r/innodb-lock.result: new test case mysql-test/t/innodb-lock.test: new test case sql/ha_innodb.cc: Rename innodb_table_locks_old_behavior -> innodb_table_locks sql/mysqld.cc: Rename innodb_table_locks_old_behavior -> innodb_table_locks Set this off by default to get same behaviour as in MySQL 4.0.20 sql/set_var.cc: Rename innodb_table_locks_old_behavior -> innodb_table_locks sql/sql_class.h: Rename innodb_table_locks_old_behavior -> innodb_table_locks
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 8c383d5848d..4250ebdd568 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -339,7 +339,7 @@ struct system_variables
my_bool new_mode;
my_bool query_cache_wlock_invalidate;
#ifdef HAVE_INNOBASE_DB
- my_bool innodb_table_locks_old_behavior;
+ my_bool innodb_table_locks;
#endif /* HAVE_INNOBASE_DB */
CONVERT *convert_set;