diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2007-08-16 16:47:31 +0300 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2007-08-16 16:47:31 +0300 |
| commit | 9b6b53f0d0d747e47a707d7c579b9e2b66020ed3 (patch) | |
| tree | f9598e9e8fe756a0c983e7674d577a97dc2f85f9 /libmysqld/lib_sql.cc | |
| parent | f07738caac5497de8c896670e9ea53dc5c1e5fbe (diff) | |
| download | mariadb-git-9b6b53f0d0d747e47a707d7c579b9e2b66020ed3.tar.gz | |
Fixed errors found by pushbuild:
Fixed failing func_misc test for embedded server
Added casts to avoid compiler warnings
Removed Table_locks_immediate as it's depending on log file cacheing
Changed type of get_time() to avoid warnings
Removed testing if purger master logs succeded as this is not deterministic
Diffstat (limited to 'libmysqld/lib_sql.cc')
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 4a8387e9944..42d2752f6e1 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -567,7 +567,7 @@ void init_embedded_mysql(MYSQL *mysql, int client_flag) void *create_embedded_thd(int client_flag) { THD * thd= new THD; - thd->thread_id= thread_id++; + thd->thread_id= thd->variables.pseudo_thread_id= thread_id++; thd->thread_stack= (char*) &thd; if (thd->store_globals()) |