Commit 5efb70d7 authored by unknown's avatar unknown
Browse files

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.
parent f1b1c0eb

VC++Files/client/mysql.dsp

+4 −0
Original line number Diff line number Diff line
@@ -144,6 +144,10 @@ SOURCE=.\readline.cpp 
# End Source File

# Begin Source File



SOURCE=..\mysys\my_conio.c

# End Source File

# Begin Source File



SOURCE=.\sql_string.cpp

# End Source File

# End Target

VC++Files/client/mysql_ia64.dsp

+4 −0
Original line number Diff line number Diff line
@@ -130,6 +130,10 @@ SOURCE=.\readline.cpp 
# End Source File

# Begin Source File



SOURCE=..\mysys\my_conio.c

# End Source File

# Begin Source File



SOURCE=.\sql_string.cpp

# End Source File

# End Target

client/mysqldump.c

+2 −1
Original line number Diff line number Diff line
@@ -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)

{

  char *name= 0;

  ulong *lengths;

  MYSQL_RES  *tableRes;

  MYSQL_ROW  row;

  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)

    {

      row= mysql_fetch_row( tableRes );

      ulong *lengths= mysql_fetch_lengths(tableRes);

      lengths= mysql_fetch_lengths(tableRes);

      name= strmake_root(root, row[0], lengths[0]);

    }

    mysql_free_result(tableRes);