diff options
| author | unknown <ingo@mysql.com> | 2005-03-02 10:56:13 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-03-02 10:56:13 +0100 |
| commit | cc4455631a51c999324759391f6f843cf97fd923 (patch) | |
| tree | 04e597e0f2cb62e0de40965ce2cecaf4f015f6ab /innobase/include | |
| parent | c4409a7cbf9b43ed450340ba9dd6a33f821df5f2 (diff) | |
| parent | 26f75ffc83e39ee915e8d4973955c950ddabb35b (diff) | |
| download | mariadb-git-cc4455631a51c999324759391f6f843cf97fd923.tar.gz | |
Merge
innobase/include/srv0srv.h:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
myisam/mi_create.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/myisamdef.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
mysql-test/r/myisam.result:
SCCS merged
mysql-test/t/myisam.test:
SCCS merged
sql/ha_innodb.h:
SCCS merged
Diffstat (limited to 'innobase/include')
| -rw-r--r-- | innobase/include/srv0srv.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/innobase/include/srv0srv.h b/innobase/include/srv0srv.h index 27cdaf2e505..5d76ac3d775 100644 --- a/innobase/include/srv0srv.h +++ b/innobase/include/srv0srv.h @@ -52,7 +52,7 @@ extern ulint* srv_data_file_is_raw_partition; extern ibool srv_auto_extend_last_data_file; extern ulint srv_last_file_size_max; -extern ulint srv_auto_extend_increment; +extern ulong srv_auto_extend_increment; extern ibool srv_created_new_raw; @@ -112,11 +112,9 @@ extern ibool srv_use_checksums; extern ibool srv_set_thread_priorities; extern int srv_query_thread_priority; -extern ulint srv_max_purge_lag; +extern ulong srv_max_purge_lag; extern ibool srv_use_awe; extern ibool srv_use_adaptive_hash_indexes; - -extern ulint srv_max_purge_lag; /*-------------------------------------------*/ extern ulint srv_n_rows_inserted; |