diff options
| author | unknown <monty@donna.mysql.fi> | 2001-04-13 12:39:34 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-04-13 12:39:34 +0300 |
| commit | 0948956b802845699f9868b1e2c6b61a74f36b8d (patch) | |
| tree | fa1346a4b858344c1283c7f751d9a97ae77bd9f7 /sql/ha_innobase.h | |
| parent | ab0338a3981143c8aabbaaf99c43f4275df22ad4 (diff) | |
| parent | 3e6215d9d080c8f09499fe2693df085754f97d37 (diff) | |
| download | mariadb-git-0948956b802845699f9868b1e2c6b61a74f36b8d.tar.gz | |
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
Docs/manual.texi:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/ha_innobase.h')
| -rw-r--r-- | sql/ha_innobase.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_innobase.h b/sql/ha_innobase.h index 0d83b77fb61..e85d73bdae5 100644 --- a/sql/ha_innobase.h +++ b/sql/ha_innobase.h @@ -149,8 +149,8 @@ class ha_innobase: public handler enum thr_lock_type lock_type); }; -extern bool innobase_skip; -extern SHOW_COMP_OPTION have_innobase; +extern bool innodb_skip; +extern SHOW_COMP_OPTION have_innodb; extern uint innobase_init_flags, innobase_lock_type; extern ulong innobase_cache_size; extern char *innobase_home, *innobase_tmpdir, *innobase_logdir; |