diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2006-12-31 12:39:20 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2006-12-31 12:39:20 +0400 |
| commit | 84d0cda44c8fd13b3b88f7b90ec8fb755caef361 (patch) | |
| tree | bd5218816ba9b52d92e7f30d5d6e4c12b6153b87 /libmysqld | |
| parent | 27ecbeecdc0a064d0ff5ea88abe01e786fcc5b99 (diff) | |
| parent | 44e0239396a0337fcdb455589f591dd42f2acd43 (diff) | |
| download | mariadb-git-84d0cda44c8fd13b3b88f7b90ec8fb755caef361.tar.gz | |
Merge mysql.com:/d2/hf/clean/my50-clean
into mysql.com:/d2/hf/common/my50-common
mysql-test/mysql-test-run.pl:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
Diffstat (limited to 'libmysqld')
| -rwxr-xr-x | libmysqld/examples/test-run | 2 | ||||
| -rw-r--r-- | libmysqld/lib_sql.cc | 6 |
2 files changed, 7 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 97bcb9d87ca..1006ee61923 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -585,6 +585,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; @@ -770,6 +771,8 @@ MYSQL_DATA *THD::alloc_new_dataset() static void write_eof_packet(THD *thd) { + if (!thd->mysql) // bootstrap file handling + return; /* The following test should never be true, but it's better to do it because if 'is_fatal_error' is set the server is not going to execute @@ -1029,6 +1032,9 @@ void Protocol_simple::prepare_for_resend() MYSQL_DATA *data= thd->cur_data; DBUG_ENTER("send_data"); + if (!thd->mysql) // bootstrap file handling + DBUG_VOID_RETURN; + data->rows++; if (!(cur= (MYSQL_ROWS *)alloc_root(alloc, sizeof(MYSQL_ROWS)+(field_count + 1) * sizeof(char *)))) { |