From 14289d42edec950a6cc9f3db1e242cf8595e207d Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 7 Jun 2001 00:10:59 +0300 Subject: Changed innodb_unix_file_flush_method -> innodb_flush_method Cleaned up error messages. mysql-test/mysql-test-run.sh: Added option --mysqld to send arguments to mysqld. sql/ha_innobase.cc: Shortended messages a bit to correspond to the rest of MySQL. sql/mysqld.cc: Changed innodb_unix_file_flush_method -> innodb_flush_method BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted --- sql/ha_innobase.cc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'sql/ha_innobase.cc') diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc index 51ea5f40018..6bae31902c3 100644 --- a/sql/ha_innobase.cc +++ b/sql/ha_innobase.cc @@ -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); -- cgit v1.2.1