diff options
| author | unknown <davi@moksha.local> | 2007-09-29 16:06:46 -0300 |
|---|---|---|
| committer | unknown <davi@moksha.local> | 2007-09-29 16:06:46 -0300 |
| commit | 842fe93b0b5f25c1dd0edd9590279a8e5dd6bc1e (patch) | |
| tree | 31da9cdec276d37f69b6f30e948a21fbac3d6cae | |
| parent | ee7f61ab0519de85e89b6da1b9a891dfbc95b463 (diff) | |
| parent | 1241a9da2f07ce9d60cfc3ae5b13a664ad009236 (diff) | |
| download | mariadb-git-842fe93b0b5f25c1dd0edd9590279a8e5dd6bc1e.tar.gz | |
Merge moksha.local:/Users/davi/mysql/push/mysql-5.1-runtime
into moksha.local:/Users/davi/mysql/push/bugs/21136-regression
| -rw-r--r-- | sql/sql_insert.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index fedda29c249..b4f2d8c65f2 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -3653,7 +3653,8 @@ bool select_create::send_eof() if (m_plock) { mysql_unlock_tables(thd, *m_plock); - m_plock= 0; + *m_plock= NULL; + m_plock= NULL; } } return tmp; @@ -3691,7 +3692,8 @@ void select_create::abort() if (m_plock) { mysql_unlock_tables(thd, *m_plock); - m_plock= 0; + *m_plock= NULL; + m_plock= NULL; } if (table) |