Commit 0a665ab0 authored by unknown's avatar unknown
Browse files

Fix merge problem.

parent 5306a211

sql/sql_parse.cc

+2 −2
Original line number Diff line number Diff line
@@ -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;