mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Fixed some problems for Windows build
VC++Files/client/mysql.dsp: Fixed omission of mysys\my_conio.c. VC++Files/client/mysql_ia64.dsp: Fixed omission of mysys\my_conio.c. client/mysqldump.c: VS compiler does not accept variable declarations within blocks. Such a behaviour complies with the Standard C.
This commit is contained in:
@ -144,6 +144,10 @@ SOURCE=.\readline.cpp
|
|||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=..\mysys\my_conio.c
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=.\sql_string.cpp
|
SOURCE=.\sql_string.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# End Target
|
# End Target
|
||||||
|
@ -130,6 +130,10 @@ SOURCE=.\readline.cpp
|
|||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=..\mysys\my_conio.c
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=.\sql_string.cpp
|
SOURCE=.\sql_string.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# End Target
|
# End Target
|
||||||
|
@ -2222,6 +2222,7 @@ static int dump_all_tables_in_db(char *database)
|
|||||||
static char *get_actual_table_name(const char *old_table_name, MEM_ROOT *root)
|
static char *get_actual_table_name(const char *old_table_name, MEM_ROOT *root)
|
||||||
{
|
{
|
||||||
char *name= 0;
|
char *name= 0;
|
||||||
|
ulong *lengths;
|
||||||
MYSQL_RES *tableRes;
|
MYSQL_RES *tableRes;
|
||||||
MYSQL_ROW row;
|
MYSQL_ROW row;
|
||||||
char query[50 + 2*NAME_LEN];
|
char query[50 + 2*NAME_LEN];
|
||||||
@ -2246,7 +2247,7 @@ static char *get_actual_table_name(const char *old_table_name, MEM_ROOT *root)
|
|||||||
if (numRows > 0)
|
if (numRows > 0)
|
||||||
{
|
{
|
||||||
row= mysql_fetch_row( tableRes );
|
row= mysql_fetch_row( tableRes );
|
||||||
ulong *lengths= mysql_fetch_lengths(tableRes);
|
lengths= mysql_fetch_lengths(tableRes);
|
||||||
name= strmake_root(root, row[0], lengths[0]);
|
name= strmake_root(root, row[0], lengths[0]);
|
||||||
}
|
}
|
||||||
mysql_free_result(tableRes);
|
mysql_free_result(tableRes);
|
||||||
|
Reference in New Issue
Block a user