bk commit into 5.1 tree (Kristofer.Pettersson:1.2361)

[kpettersson]

Below is the list of changes that have just been committed into a local
5.1 repository of Kristofer Pettersson. When Kristofer Pettersson 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, 2006-12-11 13:22:47+01:00, Kristofer.Pettersson@naruto. +1 -0
  Merge naruto.:C:/cpp/bug17489/my51-bug17489
  into  naruto.:C:/cpp/mysql-5.1-maint
  MERGE: 1.2353.1.2

  sql/sql_parse.cc@stripped, 2006-12-11 13:22:28+01:00, Kristofer.Pettersson@naruto. +0 -0
    Auto merged
    MERGE: 1.610.1.1

# 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:	Kristofer.Pettersson
# Host:	naruto.
# Root:	C:/cpp/mysql-5.1-maint/RESYNC

--- 1.611/sql/sql_parse.cc	2006-12-11 13:23:16 +01:00
+++ 1.612/sql/sql_parse.cc	2006-12-11 13:23:17 +01:00
@@ -2955,6 +2955,12 @@ mysql_execute_command(THD *thd)
       goto end_with_restore_list;
 
 #ifndef HAVE_READLINK
+    if (lex->create_info.data_file_name)
+      push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0,
+                   "DATA DIRECTORY option ignored");
+    if (lex->create_info.index_file_name)
+      push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0,
+                   "INDEX DIRECTORY option ignored");
     lex->create_info.data_file_name=lex->create_info.index_file_name=0;
 #else
     /* Fix names if symlinked tables */