mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Merge of 4.1->5.0. This contained the fixes for GCC 4.0
This commit is contained in:
@@ -63,7 +63,9 @@
|
||||
-Brian
|
||||
*/
|
||||
|
||||
#ifdef __GNUC__
|
||||
#include <my_global.h>
|
||||
|
||||
#ifdef USE_PRAGMA_IMPLEMENTATION
|
||||
#pragma implementation // gcc: Class implementation
|
||||
#endif
|
||||
|
||||
@@ -150,10 +152,8 @@ static EXAMPLE_SHARE *get_share(const char *table_name, TABLE *table)
|
||||
|
||||
return share;
|
||||
|
||||
error2:
|
||||
thr_lock_delete(&share->lock);
|
||||
pthread_mutex_destroy(&share->mutex);
|
||||
error:
|
||||
pthread_mutex_destroy(&share->mutex);
|
||||
pthread_mutex_unlock(&example_mutex);
|
||||
my_free((gptr) share, MYF(0));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user