mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Fix merge problem.
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user