diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-11-23 00:50:54 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-11-23 00:50:54 +0100 |
| commit | c6d30805db3a1a2a098c3009fde8a42efd9fb9de (patch) | |
| tree | e55f68e5adf40e1a75e08bda91b712ab6a094643 /sql/sql_class.h | |
| parent | 2c032b990e4ec470fad2e9f61cf6267a68b7e937 (diff) | |
| parent | eea310e498f3b7ac95a4492d48f04e08d3009412 (diff) | |
| download | mariadb-git-c6d30805db3a1a2a098c3009fde8a42efd9fb9de.tar.gz | |
5.5 merge
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 13e72f11829..9f091ac2c2b 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2012, Oracle and/or its affiliates. + Copyright (c) 2000, 2013, Oracle and/or its affiliates. Copyright (c) 2009, 2013, Monty Program Ab This program is free software; you can redistribute it and/or modify @@ -444,6 +444,7 @@ enum killed_type #include "sql_lex.h" /* Must be here */ +extern LEX_STRING sql_statement_names[(uint) SQLCOM_END + 1]; class Delayed_insert; class select_result; class Time_zone; @@ -3065,6 +3066,11 @@ public: */ bool set_db(const char *new_db, size_t new_db_len) { + /* + Acquiring mutex LOCK_thd_data as we either free the memory allocated + for the database and reallocating the memory for the new db or memcpy + the new_db to the db. + */ 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) |