diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-11-13 14:07:58 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-11-13 14:07:58 +0100 |
| commit | bdd883ed9a68ff1e82528cc6b33316d98894cfd2 (patch) | |
| tree | 93081c72225d399ac93ae0d8bb301a13cfc9a50c /sql/sql_prepare.cc | |
| parent | 2cba9e0cdccfac6f93a54e2ba12eb9926cfaa0a1 (diff) | |
| parent | f3a78f392dad24391c19464731833e2bdf19bdef (diff) | |
| download | mariadb-git-bdd883ed9a68ff1e82528cc6b33316d98894cfd2.tar.gz | |
5.5. merge
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 07b90fd406c..b4a313e344a 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2276,7 +2276,7 @@ void mysqld_stmt_prepare(THD *thd, const char *packet, uint packet_length) DBUG_PRINT("prep_query", ("%s", packet)); /* First of all clear possible warnings from the previous command */ - mysql_reset_thd_for_next_command(thd, opt_userstat_running); + mysql_reset_thd_for_next_command(thd); if (! (stmt= new Prepared_statement(thd))) goto end; /* out of memory: error is set in Sql_alloc */ @@ -2667,7 +2667,7 @@ void mysqld_stmt_execute(THD *thd, char *packet_arg, uint packet_length) packet+= 9; /* stmt_id + 5 bytes of flags */ /* First of all clear possible warnings from the previous command */ - mysql_reset_thd_for_next_command(thd, opt_userstat_running); + mysql_reset_thd_for_next_command(thd); if (!(stmt= find_prepared_statement(thd, stmt_id))) { @@ -2766,7 +2766,7 @@ void mysqld_stmt_fetch(THD *thd, char *packet, uint packet_length) DBUG_ENTER("mysqld_stmt_fetch"); /* First of all clear possible warnings from the previous command */ - mysql_reset_thd_for_next_command(thd, opt_userstat_running); + mysql_reset_thd_for_next_command(thd); status_var_increment(thd->status_var.com_stmt_fetch); if (!(stmt= find_prepared_statement(thd, stmt_id))) @@ -2826,7 +2826,7 @@ void mysqld_stmt_reset(THD *thd, char *packet) DBUG_ENTER("mysqld_stmt_reset"); /* First of all clear possible warnings from the previous command */ - mysql_reset_thd_for_next_command(thd, opt_userstat_running); + mysql_reset_thd_for_next_command(thd); status_var_increment(thd->status_var.com_stmt_reset); if (!(stmt= find_prepared_statement(thd, stmt_id))) |