diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2012-09-25 13:20:00 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2012-09-25 13:20:00 +0200 |
| commit | 928168a486d85790e6a2525bcb15d0b645be50e3 (patch) | |
| tree | e88e83cfe54307756d719a81c297d2d92751c4fa /sql/mysqld.cc | |
| parent | 85cb3b398c218209787152e409c3f4e5020cf6c9 (diff) | |
| parent | 139c8ed5915385a914fce8d87764a3cf3d334e7e (diff) | |
| download | mariadb-git-928168a486d85790e6a2525bcb15d0b645be50e3.tar.gz | |
Merge from mysql-5.1 to mysql-5.5
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index cfc74804f4e..67856852983 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4974,7 +4974,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++; mysql_cond_signal(&COND_thread_cache); } |