diff options
| author | unknown <monty@mysql.com> | 2004-10-20 16:24:28 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-10-20 16:24:28 +0300 |
| commit | 560d7bcdd0c80551b7844b3669be503113c91ddf (patch) | |
| tree | f3f6e81dac72352598beb9c21f116d2ef7f9c3ef /sql/sql_class.h | |
| parent | 7bdb93aa7e8b2c4d003f68635af8e1cbe757f6e6 (diff) | |
| parent | ec8779e95a46b3dfff492196ad004cb2716df3c3 (diff) | |
| download | mariadb-git-560d7bcdd0c80551b7844b3669be503113c91ddf.tar.gz | |
Merge with 4.0
BitKeeper/etc/logging_ok:
auto-union
Docs/Support/texi2html:
Auto merged
innobase/trx/trx0rec.c:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/t/innodb-lock.test:
Auto merged
mysys/thr_lock.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/sql_acl.cc:
Keep old code
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index aea31f7db54..c30e1c321b0 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -396,6 +396,9 @@ struct system_variables my_bool low_priority_updates; my_bool new_mode; my_bool query_cache_wlock_invalidate; +#ifdef HAVE_INNOBASE_DB + my_bool innodb_table_locks; +#endif /* HAVE_INNOBASE_DB */ my_bool old_passwords; /* Only charset part of these variables is sensible */ |