bk commit into 5.1 tree (bar:1.2162)

[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
  1.2162 06/03/07 13:07:23 bar@stripped +1 -0
  Merge abarkov@stripped:/home/bk/mysql-5.1-new
  into  mysql.com:/usr/home/bar/mysql-5.1-new.b17142

  sql/table.cc
    1.213 06/03/07 13:07:13 bar@stripped +0 -0
    Auto merged

# 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.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.1-new.b17142/RESYNC

--- 1.212/sql/table.cc	2006-03-06 22:33:15 +04:00
+++ 1.213/sql/table.cc	2006-03-07 13:07:13 +04:00
@@ -298,6 +298,9 @@
   strxmov(path, share->normalized_path.str, reg_ext, NullS);
   if ((file= my_open(path, O_RDONLY | O_SHARE, MYF(0))) < 0)
   {
+    if (strchr(share->table_name.str, '@'))
+      goto err_not_open;
+
     /* Try unecoded 5.0 name */
     uint length;
     strxnmov(path, sizeof(path)-1,