1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Auto-merge from mysql-5.5-merge.

This commit is contained in:
Alexander Nozdrin
2010-08-30 18:07:40 +04:00
417 changed files with 23645 additions and 6252 deletions

View File

@@ -1501,7 +1501,7 @@ public:
// track down slow pthread_create
ulonglong prior_thr_create_utime, thr_create_utime;
ulonglong start_utime, utime_after_lock;
thr_lock_type update_lock_default;
Delayed_insert *di;