1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge remote-tracking branch 'mysql/5.5' into 5.5

This commit is contained in:
Sergei Golubchik
2015-04-27 21:04:06 +02:00
28 changed files with 496 additions and 90 deletions

View File

@ -1,6 +1,6 @@
/*
Copyright (c) 2000, 2013, Oracle and/or its affiliates.
Copyright (c) 2009, 2013, Monty Program Ab
Copyright (c) 2000, 2015, Oracle and/or its affiliates.
Copyright (c) 2009, 2014, MariaDB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -700,8 +700,6 @@ void add_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var);
void add_diff_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var,
STATUS_VAR *dec_var);
void mark_transaction_to_rollback(THD *thd, bool all);
#ifdef MYSQL_SERVER
void free_tmp_table(THD *thd, TABLE *entry);
@ -3121,6 +3119,7 @@ public:
mysql_mutex_unlock(&LOCK_status);
}
void mark_transaction_to_rollback(bool all);
private:
/** The current internal error handler for this thread, or NULL. */
@ -4163,8 +4162,6 @@ public:
*/
#define CF_SKIP_QUESTIONS (1U << 1)
void mark_transaction_to_rollback(THD *thd, bool all);
/* Inline functions */
inline bool add_item_to_list(THD *thd, Item *item)