database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32

Browse Source
This commit is contained in:
Seppo Jaakola
2013-08-21 16:34:31 +03:00
parent 551ad1cf6f c7973615e7
commit 4222b2520b
1714 changed files with 7969 additions and 3336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sql/sql_class.h
View File

@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
#ifndef SQL_CLASS_INCLUDED
@ -1622,6 +1622,7 @@ public:
Protects THD data accessed from other threads:
- thd->query and thd->query_length (used by SHOW ENGINE
INNODB STATUS and SHOW PROCESSLIST
- thd->db and thd->db_length (used in SHOW PROCESSLIST)
- thd->mysys_var (used by KILL statement and shutdown).
Is locked when THD is deleted.
*/
@ -2898,6 +2899,7 @@ public:
*/
bool set_db(const char *new_db, size_t new_db_len)
{
mysql_mutex_lock(&LOCK_thd_data);
/* Do not reallocate memory if current chunk is big enough. */
if (db && new_db && db_length >= new_db_len)
memcpy(db, new_db, new_db_len+1);
@ -2910,6 +2912,7 @@ public:
db= NULL;
}
db_length= db ? new_db_len : 0;
mysql_mutex_unlock(&LOCK_thd_data);
return new_db && !db;
}
@ -2926,8 +2929,13 @@ public:
*/
void reset_db(char *new_db, size_t new_db_len)
{
db= new_db;
db_length= new_db_len;
if (new_db != db || new_db_len != db_length)
{
mysql_mutex_lock(&LOCK_thd_data);
db= new_db;
db_length= new_db_len;
mysql_mutex_unlock(&LOCK_thd_data);
}
}
/*
Copy the current database to the argument. Use the current arena to
@ -4207,6 +4215,11 @@ inline bool add_order_to_list(THD *thd, Item *item, bool asc)
return thd->lex->current_select->add_order_to_list(thd, item, asc);
}
inline bool add_gorder_to_list(THD *thd, Item *item, bool asc)
{
return thd->lex->current_select->add_gorder_to_list(thd, item, asc);
}
inline bool add_group_to_list(THD *thd, Item *item, bool asc)
{
return thd->lex->current_select->add_group_to_list(thd, item, asc);