diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
| commit | 76f0b94bb0b2994d639353530c5b251d0f1a204b (patch) | |
| tree | 9ed50628aac34f89a37637bab2fc4915b86b5eb4 /sql/sp.cc | |
| parent | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff) | |
| parent | 5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff) | |
| download | mariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz | |
merge with 5.3
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index 982dc3dc91b..6071a60a64f 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -1141,7 +1141,7 @@ sp_create_routine(THD *thd, int type, sp_head *sp) (sp->m_explicit_name ? sp->m_db.length : 0), sp->m_name.str, sp->m_name.length, sp->m_params.str, sp->m_params.length, - retstr.c_ptr(), retstr.length(), + retstr.ptr(), retstr.length(), sp->m_body.str, sp->m_body.length, sp->m_chistics, &(thd->lex->definer->user), &(thd->lex->definer->host), @@ -1154,7 +1154,7 @@ sp_create_routine(THD *thd, int type, sp_head *sp) thd->variables.sql_mode= saved_mode; /* Such a statement can always go directly to binlog, no trans cache */ if (thd->binlog_query(THD::STMT_QUERY_TYPE, - log_query.c_ptr(), log_query.length(), + log_query.ptr(), log_query.length(), FALSE, FALSE, FALSE, 0)) ret= SP_INTERNAL_ERROR; thd->variables.sql_mode= 0; |