diff options
| author | unknown <dlenev@mysql.com> | 2005-03-04 17:46:45 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-03-04 17:46:45 +0300 |
| commit | b1095fb0cd0b42158f6ca3d8f157df5d23bec423 (patch) | |
| tree | bff7a84c42deaf288f2aee7fdb2011a47b92ba6c /sql/sql_class.cc | |
| parent | d6949b3e9f8164e28bb24b7c1d948cdce12db005 (diff) | |
| parent | ac9f68b9fac716ebc09b9f31b4348b0db135519b (diff) | |
| download | mariadb-git-b1095fb0cd0b42158f6ca3d8f157df5d23bec423.tar.gz | |
Manual merge SP-locking improvements patch with current tree.
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_rcontext.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.h:
Auto merged
sql/sp_head.cc:
Manual merge.
sql/sql_class.cc:
Manual merge.
sql/sql_parse.cc:
Manual merge.
sql/sql_yacc.yy:
Manual merge.
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 527f349038c..bac3e42ed62 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -251,8 +251,9 @@ THD::THD() protocol_prep.init(this); tablespace_op=FALSE; - ulong tmp=sql_rnd_with_mutex(); - randominit(&rand, tmp + (ulong) &rand, tmp + (ulong) ::query_id); + ulong tmp=sql_rnd_with_mutex(); + randominit(&rand, tmp + (ulong) &rand, tmp + (ulong) ::query_id); + prelocked_mode= NON_PRELOCKED; } |