diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2006-12-31 12:37:42 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2006-12-31 12:37:42 +0400 |
| commit | 62576974dec88d0c663e7e8a93065e05e9ca484a (patch) | |
| tree | f29ba6a7ce3abf7a761ab6b37addc856324d4d2e /libmysqld | |
| parent | fc9642b46dcd928a2116f04adf1bb24fb179f6cb (diff) | |
| parent | ca98fb63ad79340e256514c330a1ad01e7865119 (diff) | |
| download | mariadb-git-62576974dec88d0c663e7e8a93065e05e9ca484a.tar.gz | |
Merge mysql.com:/d2/hf/clean/my41-clean
into mysql.com:/d2/hf/common/my41-common
sql/item_func.cc:
Auto merged
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 804c4e001d2..7f9e2cced9e 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -521,6 +521,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; @@ -819,6 +820,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), |