diff options
author | unknown <monty@mashka.mysql.fi> | 2002-09-11 14:49:38 +0300 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2002-09-11 14:49:38 +0300 |
commit | 26bf87c9391edb1df27d1a1e42a98ccf9215f6b1 (patch) | |
tree | 780174860f876a082066a96b632c69be18d7282f /sql/ha_innodb.h | |
parent | d221f3ff172305e4576505180408e4ac2ba2a6c2 (diff) | |
parent | 6a06c4c534ac68f9d0469f31c869fe1d20b1e463 (diff) | |
download | mariadb-git-26bf87c9391edb1df27d1a1e42a98ccf9215f6b1.tar.gz |
Merge with 3.23.53
Build-tools/Do-compile:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
innobase/trx/trx0undo.c:
Auto merged
sql/ha_innodb.h:
Auto merged
Docs/manual.texi:
merge
sql/ha_innodb.cc:
merge
sql/mysqld.cc:
merge
Diffstat (limited to 'sql/ha_innodb.h')
-rw-r--r-- | sql/ha_innodb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h index d70a58c75f1..978d504b117 100644 --- a/sql/ha_innodb.h +++ b/sql/ha_innodb.h @@ -182,6 +182,7 @@ extern long innobase_force_recovery, innobase_thread_concurrency; extern char *innobase_data_home_dir, *innobase_data_file_path; extern char *innobase_log_group_home_dir, *innobase_log_arch_dir; extern char *innobase_unix_file_flush_method; +extern long innobase_flush_log_at_trx_commit; /* The following variables have to be my_bool for SHOW VARIABLES to work */ extern my_bool innobase_log_archive, innobase_use_native_aio, innobase_fast_shutdown; |