mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Added STDCALL to mysql_sever and mysql_thread variables
Merged error messages with 3.23.44 Fixed bug with DATA DIRECTORY on windows Docs/internals.texi: Update coding policies Docs/manual.texi: Minor general corrections acinclude.m4: Fixed wrong cpu-test configure.in: Remove CPU test, because this makes unportable binaries. include/mysql.h: Added STDCALL to mysql_sever and mysql_thread variables include/mysqld_error.h: Merged error messages with 3.23.44 libmysql/libmysql.c: Added STDCALL to mysql_sever and mysql_thread variables libmysqld/lib_sql.cc: Added STDCALL to mysql_sever and mysql_thread variables sql-bench/limits/db2.cfg: New limits file sql-bench/test-select.sh: Fixed bug in cache test sql/share/czech/errmsg.txt: Merged error messages with 3.23.44 sql/share/danish/errmsg.txt: Merged error messages with 3.23.44 sql/share/dutch/errmsg.txt: Merged error messages with 3.23.44 sql/share/english/errmsg.txt: Merged error messages with 3.23.44 sql/share/estonian/errmsg.txt: Merged error messages with 3.23.44 sql/share/french/errmsg.txt: Merged error messages with 3.23.44 sql/share/german/errmsg.txt: Merged error messages with 3.23.44 sql/share/greek/errmsg.txt: Merged error messages with 3.23.44 sql/share/hungarian/errmsg.txt: Merged error messages with 3.23.44 sql/share/italian/errmsg.txt: Merged error messages with 3.23.44 sql/share/japanese/errmsg.txt: Merged error messages with 3.23.44 sql/share/korean/errmsg.txt: Merged error messages with 3.23.44 sql/share/norwegian-ny/errmsg.txt: Merged error messages with 3.23.44 sql/share/norwegian/errmsg.txt: Merged error messages with 3.23.44 sql/share/polish/errmsg.txt: Merged error messages with 3.23.44 sql/share/portuguese/errmsg.txt: Merged error messages with 3.23.44 sql/share/romanian/errmsg.txt: Merged error messages with 3.23.44 sql/share/russian/errmsg.txt: Merged error messages with 3.23.44 sql/share/slovak/errmsg.txt: Merged error messages with 3.23.44 sql/share/spanish/errmsg.txt: Merged error messages with 3.23.44 sql/share/swedish/errmsg.txt: Merged error messages with 3.23.44 sql/share/ukrainian/errmsg.txt: Merged error messages with 3.23.44 sql/sql_parse.cc: Fix bug with DATA DIRECTORY on windows. sql/sql_select.cc: Cleanup
This commit is contained in:
@@ -1294,6 +1294,9 @@ mysql_execute_command(void)
|
||||
res=0;
|
||||
break;
|
||||
}
|
||||
#ifndef HAVE_READLINK
|
||||
lex->create_info.data_file_name=lex->create_info.index_file_name=0;
|
||||
#else
|
||||
/* Fix names if symlinked tables */
|
||||
if (append_file_to_dir(&lex->create_info.data_file_name, tables->name) ||
|
||||
append_file_to_dir(&lex->create_info.index_file_name, tables->name))
|
||||
@@ -1301,6 +1304,7 @@ mysql_execute_command(void)
|
||||
res=-1;
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
if (select_lex->item_list.elements) // With select
|
||||
{
|
||||
select_result *result;
|
||||
|
||||
Reference in New Issue
Block a user