diff options
author | unknown <monty@mashka.mysql.fi> | 2002-09-17 05:17:32 +0300 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2002-09-17 05:17:32 +0300 |
commit | ddcc49ec62c271a4f022a673b39c8693ed4e7a86 (patch) | |
tree | 6684292d18658097f30b2ff7eadd9af7357a4e51 /innobase/include | |
parent | afe8d4fc2416a08fba8cc10068af8a7467d674cc (diff) | |
parent | 6f8b510a2b96637ecf7aa52353f1367212140cf8 (diff) | |
download | mariadb-git-ddcc49ec62c271a4f022a673b39c8693ed4e7a86.tar.gz |
Merge with 3.23.53
Docs/manual.texi:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
sql/sql_table.cc:
Auto merged
sql/filesort.cc:
merge
Diffstat (limited to 'innobase/include')
-rw-r--r-- | innobase/include/srv0srv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/innobase/include/srv0srv.h b/innobase/include/srv0srv.h index 178c7b6971f..9de5e9ccfc9 100644 --- a/innobase/include/srv0srv.h +++ b/innobase/include/srv0srv.h @@ -53,7 +53,7 @@ extern ulint srv_n_log_files; extern ulint srv_log_file_size; extern ibool srv_log_archive_on; extern ulint srv_log_buffer_size; -extern ibool srv_flush_log_at_trx_commit; +extern ulint srv_flush_log_at_trx_commit; extern byte srv_latin1_ordering[256];/* The sort order table of the latin1 character set */ |