Commit b79da888 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Changed innodb_unix_file_flush_method -> innodb_flush_method 

Cleaned up error messages.
parent f614f19e

BitKeeper/etc/logging_ok

+1 −1
Original line number Diff line number Diff line 
mikef@nslinuxw4.bedford.progress.com
 
monty@hundin.mysql.fi

mysql-test/mysql-test-run.sh

+6 −0
Original line number Diff line number Diff line
@@ -143,6 +143,10 @@ while test $# -gt 0; do 
      EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT $1"

      SLEEP_TIME=`$ECHO "$1" | $SED -e "s;--sleep=;;"`

      ;;

    --mysqld=*)

       TMP=`$ECHO "$1" | $SED -e "s;--mysqld-=;"`

       EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT $TMP"

       ;;

    --gcov )

      if [ x$BINARY_DIST = x1 ] ; then

	$ECHO "Cannot do coverage test without the source - please use source dist"
@@ -158,12 +162,14 @@ while test $# -gt 0; do 
	$ECHO "Note: you will get more meaningful output on a source distribution compiled with debugging option when running tests with -gdb option"

      fi

      DO_GDB=1

      USE_RUNNING_SERVER=""

      ;;

    --ddd )

      if [ x$BINARY_DIST = x1 ] ; then

	$ECHO "Note: you will get more meaningful output on a source distribution compiled with debugging option when running tests with -gdb option"

      fi

      DO_DDD=1

      USE_RUNNING_SERVER=""

      ;;

    --skip-*)

      EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT $1"

sql/ha_innobase.cc

+6 −7
Original line number Diff line number Diff line
@@ -679,7 +679,7 @@ ha_innobase::bas_ext() const 
				/* out: file extension strings, currently not

				used */

{

	static const char* ext[] = {".InnoDB_table_inside_tablespace", NullS};

	static const char* ext[] = {".InnoDB", NullS};



	return(ext);

}
@@ -779,12 +779,11 @@ ha_innobase::open( 


 	if (NULL == (ib_table = dict_table_get(norm_name, NULL))) {



	  fprintf(stderr, "InnoDB: Cannot find table %s from the internal\n"

		  "InnoDB: data dictionary of InnoDB though the .frm file\n"

		  "InnoDB: for the table exists. Maybe you have deleted\n"

		  "InnoDB: and created again an InnoDB database but\n"

                  "InnoDB: forgotten to delete the corresponding\n"

		  "InnoDB: .frm files of old InnoDB tables?\n",

	  fprintf(stderr, "\

Cannot find table %s from the internal data dictionary\n\

of InnoDB though the .frm file for the table exists. Maybe you have deleted\n\

and created again an InnoDB database but forgotten to delete the\n\

corresponding .frm files of old InnoDB tables?\n",

		  norm_name);



	        free_share(share);

sql/mysqld.cc

+2 −1
Original line number Diff line number Diff line
@@ -2796,7 +2796,7 @@ struct show_var_st init_vars[]= { 
  {"innodb_log_arch_dir",   (char*) &innobase_log_arch_dir, 	    SHOW_CHAR_PTR},

  {"innodb_log_archive",    (char*) &innobase_log_archive, 	    SHOW_MY_BOOL},

  {"innodb_log_group_home_dir", (char*) &innobase_log_group_home_dir, SHOW_CHAR_PTR},

  {"innodb_unix_file_flush_method", (char*) &innobase_unix_file_flush_method, SHOW_CHAR_PTR},

  {"innodb_flush_method",    (char*) &innobase_unix_file_flush_method, SHOW_CHAR_PTR},

#endif

  {"interactive_timeout",     (char*) &net_interactive_timeout,     SHOW_LONG},

  {"join_buffer_size",        (char*) &join_buff_size,              SHOW_LONG},
@@ -3073,6 +3073,7 @@ static void usage(void) 
  puts("\

  --innodb_data_home_dir=dir   The common part for Innodb table spaces\n\

  --innodb_data_file_path=dir  Path to individual files and their sizes\n\

  --innodb_flush_method=#      Which method to flush data\n\

  --innodb_flush_log_at_trx_commit[=#]\n\

			       Set to 0 if you don't want to flush logs\n\

  --innodb_log_arch_dir=dir    Where full logs should be archived\n\