Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0

into hundin.mysql.fi:/home/marko/k/mysql-4.0

4 files changed, 20 insertions, 9 deletions

diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index 2e441b4f085..1a870ce3abf 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -4346,12 +4346,12 @@ ha_innobase::update_table_comment(
 			   (ulong) innobase_get_free_space());
 		dict_print_info_on_foreign_keys(FALSE, file, prebuilt->table);
 		flen = ftell(file);
-		if(length + flen + 3 > 64000) {
+		if (flen < 0) {
+			flen = 0;
+		} else if (length + flen + 3 > 64000) {
 			flen = 64000 - 3 - length;
 		}
 
-		ut_ad(flen > 0);
-
 		/* allocate buffer for the full string, and
 		read the contents of the temporary file */
 
@@ -4414,12 +4414,12 @@ ha_innobase::get_foreign_key_create_info(void)
 		prebuilt->trx->op_info = (char*)"";
 
 		flen = ftell(file);
-		if(flen > 64000 - 1) {
+		if (flen < 0) {
+			flen = 0;
+		} else if(flen > 64000 - 1) {
 			flen = 64000 - 1;
 		}
 
-		ut_ad(flen >= 0);
-
 		/* allocate buffer for the string, and
 		read the contents of the temporary file */
 
@@ -4800,12 +4800,12 @@ innodb_show_status(
 	srv_printf_innodb_monitor(srv_monitor_file);
 	flen = ftell(srv_monitor_file);
 	os_file_set_eof(srv_monitor_file);
-	if(flen > 64000 - 1) {
+	if (flen < 0) {
+		flen = 0;
+	} else if (flen > 64000 - 1) {
 		flen = 64000 - 1;
 	}
 
-	ut_ad(flen > 0);
-
 	/* allocate buffer for the string, and
 	read the contents of the temporary file */
 
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h
index 74acc0640c9..7bf20771680 100644
--- a/sql/ha_innodb.h
+++ b/sql/ha_innodb.h
@@ -208,6 +208,7 @@ extern my_bool innobase_log_archive,
 extern "C" {
 extern ulong srv_max_buf_pool_modified_pct;
 extern ulong srv_max_purge_lag;
+extern ulong srv_auto_extend_increment;
 }
 
 extern TYPELIB innobase_lock_typelib;
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index c6ec942d0d9..f104e461d6a 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -3518,6 +3518,7 @@ enum options_mysqld {
   OPT_INNODB_FORCE_RECOVERY,
   OPT_INNODB_STATUS_FILE,
   OPT_INNODB_MAX_DIRTY_PAGES_PCT,
+  OPT_INNODB_AUTOEXTEND_INCREMENT,
   OPT_INNODB_TABLE_LOCKS,
   OPT_BDB_CACHE_SIZE,
   OPT_BDB_LOG_BUFFER_SIZE,
@@ -3659,6 +3660,11 @@ struct my_option my_long_options[] =
    "Path to individual files and their sizes",
    0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #ifdef HAVE_INNOBASE_DB
+  {"innodb_autoextend_increment", OPT_INNODB_AUTOEXTEND_INCREMENT,
+   "Data file autoextend increment in megabytes",
+   (gptr*) &srv_auto_extend_increment,
+   (gptr*) &srv_auto_extend_increment,
+   0, GET_LONG, REQUIRED_ARG, 8L, 1L, 1000L, 0, 1L, 0},
   {"innodb_data_home_dir", OPT_INNODB_DATA_HOME_DIR,
    "The common part for Innodb table spaces", (gptr*) &innobase_data_home_dir,
    (gptr*) &innobase_data_home_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0,
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 122daa0ea95..aa6ddb63a04 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -265,6 +265,8 @@ sys_var_long_ptr        sys_innodb_max_dirty_pages_pct("innodb_max_dirty_pages_p
                                                         &srv_max_buf_pool_modified_pct);
 sys_var_long_ptr	sys_innodb_max_purge_lag("innodb_max_purge_lag",
 							&srv_max_purge_lag);
+sys_var_long_ptr	sys_innodb_autoextend_increment("innodb_autoextend_increment",
+							&srv_auto_extend_increment);
 sys_var_thd_bool	sys_innodb_table_locks("innodb_table_locks",
                                                &SV::innodb_table_locks);
 #endif 					     
@@ -454,6 +456,7 @@ sys_var *sys_variables[]=
 #ifdef HAVE_INNOBASE_DB
   &sys_innodb_max_dirty_pages_pct,
   &sys_innodb_max_purge_lag,
+  &sys_innodb_autoextend_increment,
   &sys_innodb_table_locks,
 #endif    
   &sys_unique_checks
@@ -508,6 +511,7 @@ struct show_var_st init_vars[]= {
   {"init_file",               (char*) &opt_init_file,               SHOW_CHAR_PTR},
 #ifdef HAVE_INNOBASE_DB
   {"innodb_additional_mem_pool_size", (char*) &innobase_additional_mem_pool_size, SHOW_LONG },
+  {sys_innodb_autoextend_increment.name, (char*) &sys_innodb_autoextend_increment, SHOW_SYS},
   {"innodb_buffer_pool_size", (char*) &innobase_buffer_pool_size, SHOW_LONG },
   {"innodb_data_file_path", (char*) &innobase_data_file_path,	    SHOW_CHAR_PTR},
   {"innodb_data_home_dir",  (char*) &innobase_data_home_dir,	    SHOW_CHAR_PTR},