diff options
| -rw-r--r-- | VC++Files/client/mysqlclient.dsp | 4 | ||||
| -rw-r--r-- | VC++Files/libmysql/libmysql.dsp | 4 | ||||
| -rwxr-xr-x | VC++Files/myisam_ftdump/myisam_ftdump.dsp | 4 | ||||
| -rw-r--r-- | VC++Files/sql/mysqld.dsp | 4 | ||||
| -rw-r--r-- | VC++Files/strings/strings.dsp | 4 | ||||
| -rw-r--r-- | tests/client_test.c | 14 |
6 files changed, 23 insertions, 11 deletions
diff --git a/VC++Files/client/mysqlclient.dsp b/VC++Files/client/mysqlclient.dsp index b93eab53f23..7931a654722 100644 --- a/VC++Files/client/mysqlclient.dsp +++ b/VC++Files/client/mysqlclient.dsp @@ -160,6 +160,10 @@ SOURCE="..\strings\ctype-tis620.c" # End Source File # Begin Source File +SOURCE="..\strings\ctype-uca.c" +# End Source File +# Begin Source File + SOURCE="..\strings\ctype-ucs2.c" # End Source File # Begin Source File diff --git a/VC++Files/libmysql/libmysql.dsp b/VC++Files/libmysql/libmysql.dsp index 8b36016f8c1..6a91414a45c 100644 --- a/VC++Files/libmysql/libmysql.dsp +++ b/VC++Files/libmysql/libmysql.dsp @@ -179,6 +179,10 @@ SOURCE="..\strings\ctype-tis620.c" # End Source File # Begin Source File +SOURCE="..\strings\ctype-uca.c" +# End Source File +# Begin Source File + SOURCE="..\strings\ctype-ucs2.c" # End Source File # Begin Source File diff --git a/VC++Files/myisam_ftdump/myisam_ftdump.dsp b/VC++Files/myisam_ftdump/myisam_ftdump.dsp index 71701f3c656..12a629091e0 100755 --- a/VC++Files/myisam_ftdump/myisam_ftdump.dsp +++ b/VC++Files/myisam_ftdump/myisam_ftdump.dsp @@ -50,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj /nologo /subsystem:console /machine:I386 /out:"../client_release/myisam_ftdump.exe" +# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj ..\lib_release\zlib.lib /nologo /subsystem:console /machine:I386 /out:"../client_release/myisam_ftdump.exe" !ELSEIF "$(CFG)" == "myisam_ftdump - Win32 Debug" @@ -75,7 +75,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib wsock32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setargv.obj /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"../client_debug/myisam_ftdump.exe" /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib wsock32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setargv.obj ..\lib_debug\zlib.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"../client_debug/myisam_ftdump.exe" /pdbtype:sept !ENDIF diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp index af75cfa84aa..73c08a8fca0 100644 --- a/VC++Files/sql/mysqld.dsp +++ b/VC++Files/sql/mysqld.dsp @@ -218,6 +218,10 @@ SOURCE=.\derror.cpp # End Source File # Begin Source File +SOURCE=.\discover.cpp +# End Source File +# Begin Source File + SOURCE=..\libmysql\errmsg.c # End Source File # Begin Source File diff --git a/VC++Files/strings/strings.dsp b/VC++Files/strings/strings.dsp index 5755d5d4c99..31d548ed59f 100644 --- a/VC++Files/strings/strings.dsp +++ b/VC++Files/strings/strings.dsp @@ -151,6 +151,10 @@ SOURCE=".\ctype-sjis.c" SOURCE=".\ctype-tis620.c" # End Source File # Begin Source File + +SOURCE=".\ctype-uca.c" +# End Source File +# Begin Source File SOURCE=".\ctype-ucs2.c" # End Source File diff --git a/tests/client_test.c b/tests/client_test.c index 30caa5f1505..facb3de70f0 100644 --- a/tests/client_test.c +++ b/tests/client_test.c @@ -8189,10 +8189,6 @@ static void test_ts() /* Test for bug #1500. - XXX: despite that this bug is fixed, it spots mysqld code which is not - working correctly yet: to fix all things properly we need to implement - Item::cleanup() method for all items (as described in bugs #1663 and - #1749). So don't be surprised in case valgrind barks on it. */ static void test_bug1500() @@ -8238,7 +8234,6 @@ static void test_bug1500() assert(1 == my_process_stmt_result(stmt)); - /* FIXME If we comment out next string server will crash :( */ mysql_stmt_close(stmt); rc= mysql_query(mysql,"DROP TABLE test_bg1500"); @@ -9351,16 +9346,17 @@ static void test_bug3035() int64_val= int64_max; uint64_val= uint64_max; - mysql_stmt_execute(stmt); + rc= mysql_stmt_execute(stmt); check_execute(stmt, rc); - stmt_text= "SELECT i8, ui8, i16, ui16, i32, ui32, i64, ui64, ui64, cast(ui64 as signed),ui64, cast(ui64 as signed)" + stmt_text= "SELECT i8, ui8, i16, ui16, i32, ui32, i64, ui64, ui64, " + "cast(ui64 as signed),ui64, cast(ui64 as signed)" "FROM t1 ORDER BY id ASC"; - mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); check_execute(stmt, rc); - mysql_stmt_execute(stmt); + rc= mysql_stmt_execute(stmt); check_execute(stmt, rc); bind_array[8].buffer_type= MYSQL_TYPE_DOUBLE; |