diff options
| author | unknown <igor@rurik.mysql.com> | 2006-06-06 09:59:45 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-06-06 09:59:45 -0700 |
| commit | b03ba905e7de3d32fd0bbf46d8806a33d3871821 (patch) | |
| tree | 9310350073023544f0de02973e0facd4ef20c151 | |
| parent | 531dc05543fdf22f339de65196741264f5089d06 (diff) | |
| download | mariadb-git-b03ba905e7de3d32fd0bbf46d8806a33d3871821.tar.gz | |
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.
| -rw-r--r-- | VC++Files/client/mysql.dsp | 4 | ||||
| -rw-r--r-- | VC++Files/client/mysql_ia64.dsp | 4 | ||||
| -rw-r--r-- | client/mysqldump.c | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/VC++Files/client/mysql.dsp b/VC++Files/client/mysql.dsp index 8298e62d8ad..c19e7b7d7fe 100644 --- a/VC++Files/client/mysql.dsp +++ b/VC++Files/client/mysql.dsp @@ -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 diff --git a/VC++Files/client/mysql_ia64.dsp b/VC++Files/client/mysql_ia64.dsp index 3fe2e2a2328..8de283d1e0b 100644 --- a/VC++Files/client/mysql_ia64.dsp +++ b/VC++Files/client/mysql_ia64.dsp @@ -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 diff --git a/client/mysqldump.c b/client/mysqldump.c index e8f96016153..3445a23eb5e 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -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); |