diff options
| author | unknown <knielsen@mysql.com> | 2006-05-02 09:19:54 +0200 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-05-02 09:19:54 +0200 |
| commit | 33417297c5e11ff82aae7bc2d8b5a75968725905 (patch) | |
| tree | 344e142a1552ff36726a9f213f672836202a643a /tests | |
| parent | a82956545761a68c87d235ba4b0bea9729cebab7 (diff) | |
| download | mariadb-git-33417297c5e11ff82aae7bc2d8b5a75968725905.tar.gz | |
Fix a bunch of non-Linux compile failures.
VC++Files/mysql.sln:
mysql_client_test depends on mysys.
VC++Files/mysys/mysys.vcproj:
Add new file missing in previous push.
mysys/my_memmem.c:
Fix illegal pointer arithmetics on void *.
tests/Makefile.am:
-L must go before -l
tests/mysql_client_test.c:
No declarations after statement in C code.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/mysql_client_test.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index ec732462ca5..ebe97393045 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -42,7 +42,7 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ LIBS = @CLIENT_LIBS@ LDADD = @CLIENT_EXTRA_LDFLAGS@ \ $(top_builddir)/libmysql/libmysqlclient.la -mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) -lmysys -L../mysys +mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) -L../mysys -lmysys mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix) insert_test_SOURCES= insert_test.c $(yassl_dummy_link_fix) select_test_SOURCES= select_test.c $(yassl_dummy_link_fix) diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 4bd636a7ae3..b0971980168 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -14828,7 +14828,6 @@ static void test_bug15613() static void test_bug17667() { int rc; - myheader("test_bug17667"); struct buffer_and_length { const char *buffer; const uint length; @@ -14845,6 +14844,8 @@ static void test_bug17667() struct buffer_and_length *statement_cursor; FILE *log_file; + myheader("test_bug17667"); + for (statement_cursor= statements; statement_cursor->buffer != NULL; statement_cursor++) { rc= mysql_real_query(mysql, statement_cursor->buffer, |