diff options
| author | holyfoot/hf@mysql.com/deer.(none) <> | 2006-11-13 10:39:15 +0400 |
|---|---|---|
| committer | holyfoot/hf@mysql.com/deer.(none) <> | 2006-11-13 10:39:15 +0400 |
| commit | 6e0045ed203aae2ad7664641aa68f6be7a571c9c (patch) | |
| tree | d66cf03fbaef4b0ffc1468ba9813c047f2e80a7b /libmysqld | |
| parent | c7866bd569ccb0221c91ee206e4566876162f16f (diff) | |
| download | mariadb-git-6e0045ed203aae2ad7664641aa68f6be7a571c9c.tar.gz | |
embedded-mode tests fixed
Diffstat (limited to 'libmysqld')
| -rwxr-xr-x | libmysqld/examples/test-run | 2 | ||||
| -rw-r--r-- | libmysqld/lib_sql.cc | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libmysqld/examples/test-run b/libmysqld/examples/test-run index c7434488259..aea5b13eaba 100755 --- a/libmysqld/examples/test-run +++ b/libmysqld/examples/test-run @@ -10,7 +10,7 @@ top_builddir=../.. mysql_test_dir=$top_builddir/mysql-test examples=$top_builddir/libmysqld/examples -mysqltest=$examples/mysqltest +mysqltest=$examples/mysqltest_embedded datadir=$mysql_test_dir/var/master-data test_data_dir=test gdb=0 diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 64bc37fb40d..b8d890991df 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -517,6 +517,7 @@ void *create_embedded_thd(int client_flag) thd->set_time(); thd->init_for_queries(); thd->client_capabilities= client_flag; + thd->real_id= (pthread_t) thd; thd->db= NULL; thd->db_length= 0; @@ -815,6 +816,9 @@ void Protocol_simple::prepare_for_resend() DBUG_ENTER("send_data"); + if (!thd->mysql) // bootstrap file handling + DBUG_VOID_RETURN; + if (!data) { if (!(data= (MYSQL_DATA*) my_malloc(sizeof(MYSQL_DATA), |