Commit 8b855aec authored Dec 20, 2006 by unknown

Post-merge fix (related to bug 24200 changes)


sql/mysqld.cc:
  Post-merge fix
sql/set_var.cc:
  Post-merge fix

parent 9639b35a

sql/mysqld.cc

+3 −1

Original line number	Diff line number	Diff line
		@@ -391,6 +391,7 @@ extern my_bool innobase_log_archive,
		innobase_use_large_pages,
		innobase_use_native_aio,
		innobase_file_per_table, innobase_locks_unsafe_for_binlog,
		innobase_rollback_on_timeout,
		innobase_create_status_file;
		extern "C" {
		extern ulong srv_max_buf_pool_modified_pct;
		@@ -8154,7 +8155,8 @@ my_bool innobase_log_archive,
		innobase_use_doublewrite,
		innobase_use_checksums,
		innobase_file_per_table,
		innobase_locks_unsafe_for_binlog;
		innobase_locks_unsafe_for_binlog,
		innobase_rollback_on_timeout;

		extern "C" {
		ulong srv_max_buf_pool_modified_pct;

sql/set_var.cc

+2 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,8 @@ extern my_bool innobase_log_archive,
		innobase_use_doublewrite,
		innobase_use_checksums,
		innobase_file_per_table,
		innobase_locks_unsafe_for_binlog;
		innobase_locks_unsafe_for_binlog,
		innobase_rollback_on_timeout;

		extern "C" {
		extern ulong srv_max_buf_pool_modified_pct;