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

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

sql/sql_parse.cc

@@ -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;