diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-17 23:02:52 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-17 23:02:52 +0300 |
| commit | 6e5c7b80bd178ebd4cab0ca03549186de6f9fbc2 (patch) | |
| tree | 4a2290cb7f9ba65d264395cea1348ad6251496fb /storage | |
| parent | 0e3a80e0a851822112226e5e792320389aa0f2ae (diff) | |
| parent | 4e8d1c6bf30abfd45a993b058ff2a33d4671b73d (diff) | |
| download | mariadb-git-6e5c7b80bd178ebd4cab0ca03549186de6f9fbc2.tar.gz | |
Manual merge from mysql-next-mr.
Conflicts:
- mysys/charset.c
- mysys/my_thr_init.c
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/federated/ha_federated.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index a73a39440d7..eea42904bb0 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -3141,7 +3141,7 @@ int ha_federated::real_connect() to establish Federated connection to guard against a trivial Denial of Service scenerio. */ - safe_mutex_assert_not_owner(&LOCK_open); + mysql_mutex_assert_not_owner(&LOCK_open); DBUG_ASSERT(mysql == NULL); |