diff options
| author | unknown <evgen@moonbone.local> | 2006-07-13 18:16:16 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-07-13 18:16:16 +0400 |
| commit | 805c33a5e161864c5eee91f02335eb59000c77b2 (patch) | |
| tree | 7f6569df935d07558c6602029f0648e288a95f84 /sql/sql_class.cc | |
| parent | a7dddd3b67e70292c0813e80ad255f1dc2f3a867 (diff) | |
| parent | f783a15aada23772e9aae11f9732dd6e9ed095de (diff) | |
| download | mariadb-git-805c33a5e161864c5eee91f02335eb59000c77b2.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
mysql-test/r/rpl_insert_id.result:
Auto merged
mysql-test/t/rpl_insert_id.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 5c8bd797e7c..87a515641de 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -269,6 +269,7 @@ THD::THD() tablespace_op=FALSE; ulong tmp=sql_rnd_with_mutex(); randominit(&rand, tmp + (ulong) &rand, tmp + (ulong) ::query_id); + substitute_null_with_insert_id = FALSE; thr_lock_info_init(&lock_info); /* safety: will be reset after start */ thr_lock_owner_init(&main_lock_id, &lock_info); } |