diff options
| -rw-r--r-- | sql/ha_berkeley.h | 4 | ||||
| -rw-r--r-- | sql/ha_ndbcluster.cc | 3 | ||||
| -rw-r--r-- | sql/mysqld.cc | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/sql/ha_berkeley.h b/sql/ha_berkeley.h index 99e13286554..16e4db59c10 100644 --- a/sql/ha_berkeley.h +++ b/sql/ha_berkeley.h @@ -94,8 +94,8 @@ class ha_berkeley: public handler uint max_supported_keys() const { return MAX_KEY-1; } uint extra_rec_buf_length() { return BDB_HIDDEN_PRIMARY_KEY_LENGTH; } ha_rows estimate_rows_upper_bound(); - uint max_supported_key_length() const { return 4294967295L; } - uint max_supported_key_part_length() const { return 4294967295L; } + uint max_supported_key_length() const { return UINT_MAX32; } + uint max_supported_key_part_length() const { return UINT_MAX32; } const key_map *keys_to_use_for_scanning() { return &key_map_full; } bool has_transactions() { return 1;} diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 71bd3acd2a6..80c34f1117f 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -3861,7 +3861,8 @@ int ha_ndbcluster::create(const char *name, uint pack_length, length, i, pk_length= 0; const void *data, *pack_data; char name2[FN_HEADLEN]; - bool create_from_engine= (info->table_options & HA_OPTION_CREATE_FROM_ENGINE); + bool create_from_engine= test(info->table_options & + HA_OPTION_CREATE_FROM_ENGINE); DBUG_ENTER("ha_ndbcluster::create"); DBUG_PRINT("enter", ("name: %s", name)); diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 143ed74e012..d31084a6839 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1194,6 +1194,7 @@ static void clean_up_mutexes() (void) rwlock_destroy(&LOCK_sys_init_slave); (void) pthread_mutex_destroy(&LOCK_global_system_variables); (void) pthread_mutex_destroy(&LOCK_global_read_lock); + (void) pthread_mutex_destroy(&LOCK_uuid_generator); (void) pthread_cond_destroy(&COND_thread_count); (void) pthread_cond_destroy(&COND_refresh); (void) pthread_cond_destroy(&COND_thread_cache); |