diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-06-07 00:10:59 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-06-07 00:10:59 +0300 |
| commit | 14289d42edec950a6cc9f3db1e242cf8595e207d (patch) | |
| tree | 89a2fbd97f136d90cae80a89baedf7940baa49ef /sql/ha_innobase.cc | |
| parent | bb72939a5bf0d950aec3224292948f01caa986bd (diff) | |
| download | mariadb-git-14289d42edec950a6cc9f3db1e242cf8595e207d.tar.gz | |
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
Diffstat (limited to 'sql/ha_innobase.cc')
| -rw-r--r-- | sql/ha_innobase.cc | 13 |
1 files changed, 6 insertions, 7 deletions
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); |