bk commit into 5.1 tree (bar:1.2550)

[bar]

Below is the list of changes that have just been committed into a local
5.1 repository of bar. When bar does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-15 11:53:46+05:00, bar@stripped +2 -0
  Additional fix for bug N26402:
  An attempt to open file with name '????????.frm'
  can produce different errors:
  - ER_NO_SUCH_TABLE on Unix
  - ER_FILE_NOT_FOUND on Windows
  because QUESTION MARK has special meaning on Windows.
  Make sure that any of these two errors happens.

  mysql-test/r/show_check.result@stripped, 2007-06-15 11:53:44+05:00, bar@stripped +1 -1
    Additional fix for bug N26402

  mysql-test/t/show_check.test@stripped, 2007-06-15 11:53:44+05:00, bar@stripped +1 -1
    Additional fix for bug N26402

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bar
# Host:	bar.myoffice.izhnet.ru
# Root:	/home/bar/mysql-work/mysql-5.1.b26402

--- 1.112/mysql-test/r/show_check.result	2007-06-14 16:28:31 +05:00
+++ 1.113/mysql-test/r/show_check.result	2007-06-15 11:53:44 +05:00
@@ -753,5 +753,5 @@ Tables_in_test	Table_type
 drop table `été`;
 set names latin1;
 show columns from `#mysql50#????????`;
-ERROR 42S02: Table 'test.#mysql50#????????' doesn't exist
+Got one of the listed errors
 End of 5.1 tests

--- 1.77/mysql-test/t/show_check.test	2007-06-14 16:28:31 +05:00
+++ 1.78/mysql-test/t/show_check.test	2007-06-15 11:53:44 +05:00
@@ -596,7 +596,7 @@ set names latin1;
 #
 # Bug#26402 Server crashes with old-style named table
 #
---error ER_NO_SUCH_TABLE
+--error ER_NO_SUCH_TABLE,ER_FILE_NOT_FOUND
 show columns from `#mysql50#????????`;
 
 --echo End of 5.1 tests