Commit aff1113b authored by unknown's avatar unknown
Browse files

Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50 

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51


client/mysql_upgrade.c:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/string.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
parents c7b6685f 377fc51a

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 (lex->create_info.data_file_name)

    if (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)

    if (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;