diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-12-08 15:15:33 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-12-08 15:15:33 +0400 |
| commit | ca98fb63ad79340e256514c330a1ad01e7865119 (patch) | |
| tree | 4c885ed89bde1edf7833be8862569515cbba1f7d /libmysqld | |
| parent | 63fce3a24e33407d58a17ec2946caa08e6c1b537 (diff) | |
| parent | f660dfa64f29341bd4a40e1748370173707208e7 (diff) | |
| download | mariadb-git-ca98fb63ad79340e256514c330a1ad01e7865119.tar.gz | |
Merge bk@192.168.21.1:mysql-4.1-opt
into mysql.com:/home/hf/work/embt/my41-embt
libmysqld/lib_sql.cc:
Auto merged
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), |