diff options
author | Michael Widenius <monty@askmonty.org> | 2011-02-25 17:45:53 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2011-02-25 17:45:53 +0200 |
commit | d46aee702ed79cf536f9fcb1dce68db8ab8b111f (patch) | |
tree | b002cc385739378d6d51feb1afcc263efc3d810a /sql/table.cc | |
parent | 07b5d554ee62543cea0dc5bb36883446b9dcaa4a (diff) | |
download | mariadb-git-d46aee702ed79cf536f9fcb1dce68db8ab8b111f.tar.gz |
Fixed compiler and build error:
- Fixed main.mysqlcheck error on windows
- Fixed 'can't drop database pbxt' failure when running pbxt.mysqlslap
sql/table.cc:
When using not legal file names for checking a non existing table, one got a warning in the log file which caused mysql.mysqlcheck to fail
storage/innodb_plugin/row/row0upd.c:
Fixed compiler warning
storage/pbxt/src/table_xt.cc:
Remove table that is dropped from 'repair-pending'.
Fixed 'can't drop database pbxt' failure when running pbxt.mysqlslap
Diffstat (limited to 'sql/table.cc')
-rw-r--r-- | sql/table.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/table.cc b/sql/table.cc index efbca69e67f..90d113bcbc5 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -2217,13 +2217,17 @@ void open_table_error(TABLE_SHARE *share, int error, int db_errno, int errarg) { int err_no; char buff[FN_REFLEN]; - myf errortype= ME_ERROR+ME_WAITTANG; + myf errortype= ME_ERROR+ME_WAITTANG; // Write fatals error to log DBUG_ENTER("open_table_error"); switch (error) { case 7: case 1: - if (db_errno == ENOENT) + /* + Test if file didn't exists. We have to also test for EINVAL as this + may happen on windows when opening a file with a not legal file name + */ + if (db_errno == ENOENT || db_errno == EINVAL) my_error(ER_NO_SUCH_TABLE, MYF(0), share->db.str, share->table_name.str); else { |