Fix merge problem.

d0a2f4d9 · cmiller@zippy.cornsilk.net · f4354a87 · d0a2f4d9
Commit d0a2f4d9 authored Jan 18, 2007 by cmiller@zippy.cornsilk.net
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/sql_parse.cc sql/sql_parse.cc +2 -2

No files found.
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2955,10 +2955,10 @@ mysql_execute_command(THD *thd)
      goto end_with_restore_list;
 #ifndef HAVE_READLINK
-    if (create_info.data_file_name)
+    if (lex->create_info.data_file_name)
      push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0,
                   "DATA DIRECTORY option ignored");
-    if (create_info.index_file_name)
+    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;