diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-11-18 16:01:58 +0100 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-11-18 16:01:58 +0100 |
| commit | a2275f0c8fd03d386cb418f5729468c95b0c3b92 (patch) | |
| tree | 7cc348d24f298fedc96ce3eef04478cb467d360f /sql/sql_prepare.cc | |
| parent | f481c14e3ed3e0b16dc87071cbd56452c23faf15 (diff) | |
| parent | a6d21fc09b46a84d292ce9ab66dc6641b43a7511 (diff) | |
| download | mariadb-git-a2275f0c8fd03d386cb418f5729468c95b0c3b92.tar.gz | |
Merge from mysql-5.5-runtime to mysql-5.5-bugteam
No conflicts
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 664d08f27a9..4a1d1ae7fe3 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -3179,7 +3179,6 @@ bool Prepared_statement::prepare(const char *packet, uint packet_len) bool error; Statement stmt_backup; Query_arena *old_stmt_arena; - MDL_ticket *mdl_savepoint= NULL; DBUG_ENTER("Prepared_statement::prepare"); /* If this is an SQLCOM_PREPARE, we also increase Com_prepare_sql. @@ -3251,7 +3250,7 @@ bool Prepared_statement::prepare(const char *packet, uint packet_len) Marker used to release metadata locks acquired while the prepared statement is being checked. */ - mdl_savepoint= thd->mdl_context.mdl_savepoint(); + MDL_savepoint mdl_savepoint= thd->mdl_context.mdl_savepoint(); /* The only case where we should have items in the thd->free_list is |