database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge bk@192.168.21.1:mysql-4.1-opt

Browse Source 
into  mysql.com:/home/hf/work/embt/my41-embt


libmysqld/lib_sql.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
This commit is contained in:
unknown
2006-12-08 15:15:33 +04:00
parent 63fce3a24e f660dfa64f
commit ca98fb63ad
5 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libmysqld/lib_sql.cc
View File

@@ -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),