summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-01-10 15:40:21 +0100
committerSergei Golubchik <sergii@pisem.net>2013-01-10 15:40:21 +0100
commit4f67a14700c0266c58b05be0dbd8fc10f88464a6 (patch)
tree568cd8f2997888d5c1035ad8e9b5e823197dcf62 /sql/mysqld.cc
parentb0ee31c89480519490537b89dca1e8cc65e2b73b (diff)
parentbd87fed1dc0caa0720e5a60f0fca1b714c58ac75 (diff)
downloadmariadb-git-4f67a14700c0266c58b05be0dbd8fc10f88464a6.tar.gz
5.2->5.3 merge
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 0ebc03c0a4f..b2bc323d559 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5093,7 +5093,7 @@ void create_thread_to_handle_connection(THD *thd)
if (cached_thread_count > wake_thread)
{
/* Get thread from cache */
- thread_cache.append(thd);
+ thread_cache.push_back(thd);
wake_thread++;
pthread_cond_signal(&COND_thread_cache);
}