diff options
| author | unknown <monty@mysql.com> | 2004-10-26 19:30:57 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-10-26 19:30:57 +0300 |
| commit | e160646eb01eb8c5b382b1523114988679f9d357 (patch) | |
| tree | ceda3ef9437fa5cd2e14de6aebba351d121354c2 /sql/sql_class.cc | |
| parent | 8ee124176690ed611c8851e3dd50a823c498a08b (diff) | |
| parent | 853c2c788c8bd7120a95c2357de7dabb1b6fcf3b (diff) | |
| download | mariadb-git-e160646eb01eb8c5b382b1523114988679f9d357.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/field.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 9dcff60dfed..abe00027b07 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -841,7 +841,8 @@ bool select_send::send_eof() /* Unlock tables before sending packet to gain some speed */ if (thd->lock) { - mysql_unlock_tables(thd, thd->lock); thd->lock=0; + mysql_unlock_tables(thd, thd->lock); + thd->lock=0; } if (!thd->net.report_error) { |