From 0b861d92230e5718ddb82a2bd3be074e541bf552 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 23 Oct 2006 15:02:51 +0500 Subject: WL#3475 (Threads for the embedded server in mysqltest) Necessary code added to mysqltest.c. Disabled tests are available now. client/mysqltest.c: do_send_query function implemented, so now 'send' command will be run in separate thread for the embedded server. Mutex and condition added to the 'connection' struct for syncronisation purposes. Yes it'd be easier if we had pthread_join() command libmysql/libmysql.c: this isn't actually needed and causes problems in embedded server mysql-test/t/bdb-deadlock.test: test is available for the embedded server now mysql-test/t/flush.test: test is available for the embedded server now mysql-test/t/flush_block_commit.test: test is available for the embedded server now mysql-test/t/innodb-deadlock.test: test is available for the embedded server now mysql-test/t/innodb-lock.test: test is available for the embedded server now mysql-test/t/lock_multi.test: test is available for the embedded server now mysql-test/t/rename.test: test is available for the embedded server now mysql-test/t/show_check.test: test is available for the embedded server now mysql-test/t/status.test: test is available for the embedded server now --- libmysql/libmysql.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'libmysql') diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 91c0b6b8864..5577ecdb556 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -4395,13 +4395,6 @@ int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt) set_stmt_error(stmt, CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate); DBUG_RETURN(1); } - if (result->data) - { - free_root(&result->alloc, MYF(MY_KEEP_PREALLOC)); - result->data= NULL; - result->rows= 0; - stmt->data_cursor= NULL; - } if (stmt->update_max_length && !stmt->bind_result_done) { -- cgit v1.2.1 From d09bcbe64f8be77d319d535d6496ed6ce8438cf7 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 27 Nov 2006 21:15:25 +0100 Subject: ha_innodb.m4, Makefile.am, ha_ndbcluster.m4, Makefile.shared, ha_berkeley.m4: Reenabled build outside source tree config/ac-macros/ha_berkeley.m4: Reenabled build outside source tree config/ac-macros/ha_innodb.m4: Reenabled build outside source tree config/ac-macros/ha_ndbcluster.m4: Reenabled build outside source tree extra/yassl/src/Makefile.am: Reenabled build outside source tree extra/yassl/taocrypt/benchmark/Makefile.am: Reenabled build outside source tree extra/yassl/taocrypt/src/Makefile.am: Reenabled build outside source tree extra/yassl/taocrypt/test/Makefile.am: Reenabled build outside source tree extra/yassl/testsuite/Makefile.am: Reenabled build outside source tree libmysql/Makefile.shared: Reenabled build outside source tree ndb/src/mgmsrv/Makefile.am: Reenabled build outside source tree --- libmysql/Makefile.shared | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libmysql') diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index c2d98a81042..dc6d658fcdf 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -89,8 +89,8 @@ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs) if HAVE_YASSL -yassl_las = $(top_srcdir)/extra/yassl/src/libyassl.la \ - $(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la +yassl_las = $(top_builddir)/extra/yassl/src/libyassl.la \ + $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la endif # The automatic dependencies miss this -- cgit v1.2.1