Merge work.mysql.com:/home/bk/mysql-4.0

into tik.mysql.fi:/home/my/mysql-4.0


Docs/manual.texi:
  Auto merged

3 files changed, 19 insertions, 30 deletions

diff --git a/Docs/manual.texi b/Docs/manual.texi
index b068ddb926f..52256013093 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -52760,8 +52760,8 @@ update statements if you want to narrow down the problem.
 @cindex clients, debugging
 
 To be able to debug a MySQL client with the integrated debug package,
-you should configure MySQL with @code{--with-debug}.
-@xref{configure options}.
+you should configure MySQL with @code{--with-debug} or
+@code{--with-debug=full}.  @xref{configure options}.
 
 @tindex MYSQL_DEBUG environment variable
 @tindex Environment variable, MYSQL_DEBUG
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index e560dab1c9b..14e62d08b3f 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -210,9 +210,9 @@ while test $# -gt 0; do
       ;;
     --debug)
       EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT \
-       --debug=d:t:O,$MYSQL_TMP_DIR/master.trace"
+       --debug=d:t:O,$MYSQL_TEST_DIR/var/log/master.trace"
       EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT \
-       --debug=d:t:O,$MYSQL_TMP_DIR/slave.trace"
+       --debug=d:t:O,$MYSQL_TEST_DIR/var/log/slave.trace"
       EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT --debug"
       ;;
     -- )  shift; break ;;
@@ -589,7 +589,7 @@ start_slave()
     then
       $ECHO "set args $master_args" > $GDB_SLAVE_INIT
       ddd --debugger "gdb -x $GDB_SLAVE_INIT" $SLAVE_MYSQLD &
-      prompt_user "Hit enter to continue after you've started the master"
+      prompt_user "Hit enter to continue after you've started the slave"
     elif [ x$DO_GDB = x1 ]
     then
       $ECHO "set args $slave_args" > $GDB_SLAVE_INIT
diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc
index 5287c228637..87c40f5ea47 100644
--- a/sql/ha_innobase.cc
+++ b/sql/ha_innobase.cc
@@ -93,6 +93,7 @@ bool innobase_flush_log_at_trx_commit, innobase_log_archive,
 */
 
 char *innobase_data_file_path= (char*) "ibdata1:64M";
+char *internal_innobase_data_file_path=0;
 
 /* The following counter is used to convey information to InnoDB
 about server activity: in selects it is not sensible to call
@@ -219,7 +220,7 @@ innobase_mysql_print_thd(
   	}
 
   	if (thd->query) {
-    		printf(" %0.100s", thd->query);
+    		printf(" %-.100s", thd->query);
   	}  
 
   	printf("\n");
@@ -304,7 +305,7 @@ innobase_parse_data_file_paths_and_sizes(void)
 	ulint	size;
 	ulint	i	= 0;
 
-	str = innobase_data_file_path;
+	str = internal_innobase_data_file_path;
 
 	/* First calculate the number of data files and check syntax:
 	path:size[M];path:size[M]... . Note that a Windows path may
@@ -380,7 +381,7 @@ innobase_parse_data_file_paths_and_sizes(void)
 
 	/* Then store the actual values to our arrays */
 
-	str = innobase_data_file_path;
+	str = internal_innobase_data_file_path;
 	i = 0;
 
 	while (*str != '\0') {
@@ -544,21 +545,9 @@ innobase_init(void)
 	/* Set InnoDB initialization parameters according to the values
 	read from MySQL .cnf file */
 
-	if (!innobase_data_file_path)
-	{
-	  fprintf(stderr,
-       "Cannot initialize InnoDB as 'innodb_data_file_path' is not set.\n"
-       "If you do not want to use transactional InnoDB tables, add a line\n"
-       "skip-innodb\n"
-       "to the [mysqld] section of init parameters in your my.cnf\n"
-       "or my.ini. If you want to use InnoDB tables, add for example,\n"
-       "innodb_data_file_path = /mysql/data/ibdata1:20M\n"
-       "More information on setting the parameters you find in the\n"
-       "manual.\n");
-
-	  innodb_skip=1;
-	  DBUG_RETURN(FALSE);			// Continue without innobase
-	}
+	// Make a copy of innobase_data_file_path to not modify the original
+	internal_innobase_data_file_path=my_strdup(innobase_data_file_path,
+						   MYF(MY_WME));
 
 	srv_data_home = (innobase_data_home_dir ? innobase_data_home_dir :
 			 current_dir);
@@ -833,7 +822,7 @@ normalize_table_name(
 }
 
 /*********************************************************************
-Creates and opens a handle to a table which already exists in an Innnobase
+Creates and opens a handle to a table which already exists in an Innobase
 database. */
 
 int
@@ -2704,7 +2693,7 @@ ha_innobase::records_in_range(
    	DBUG_ENTER("records_in_range");
 
 	if (prebuilt->trx) {
-		prebuilt->trx->op_info = "estimating range size";
+		prebuilt->trx->op_info = (char*) "estimating range size";
 	}
    	
 	active_index = keynr;
@@ -2740,7 +2729,7 @@ ha_innobase::records_in_range(
     	my_free((char*) key_val_buff2, MYF(0));
 
 	if (prebuilt->trx) {
-		prebuilt->trx->op_info = "";
+		prebuilt->trx->op_info = (char*) "";
 	}
    	
 	DBUG_RETURN((ha_rows) n_rows);
@@ -2764,7 +2753,7 @@ ha_innobase::estimate_number_of_rows(void)
 
 	if (prebuilt->trx) {
 		prebuilt->trx->op_info =
-				"estimating upper bound of table size";
+				(char*) "estimating upper bound of table size";
 	}   	
 
  	DBUG_ENTER("info");
@@ -2780,7 +2769,7 @@ ha_innobase::estimate_number_of_rows(void)
 	/* The minimum clustered index record size is 20 bytes */
 
 	if (prebuilt->trx) {
-		prebuilt->trx->op_info = "";
+		prebuilt->trx->op_info = (char*) "";
 	}
    	
 	return((ha_rows) (1000 + data_file_length / 20));
@@ -2822,7 +2811,7 @@ ha_innobase::info(
  	DBUG_ENTER("info");
 
 	if (prebuilt->trx) {
-		prebuilt->trx->op_info = "calculating table stats";
+		prebuilt->trx->op_info = (char*) "calculating table stats";
 	}
    	
  	ib_table = prebuilt->table;
@@ -2888,7 +2877,7 @@ ha_innobase::info(
   	}
 
 	if (prebuilt->trx) {
-		prebuilt->trx->op_info = "";
+		prebuilt->trx->op_info = (char*) "";
 	}
    	
   	DBUG_VOID_RETURN;