database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into  mysql.com:/home/my/mysql-5.0
This commit is contained in:
monty@mysql.com
2005-11-04 10:03:31 +02:00
parent 5764170898 89fdc4f49e
commit 2d39028ef2
5 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/r/mysqldump.result
View File

@ -2236,6 +2236,7 @@ DROP FUNCTION bug9056_func1;
DROP FUNCTION bug9056_func2; DROP FUNCTION bug9056_func2;
DROP PROCEDURE bug9056_proc1; DROP PROCEDURE bug9056_proc1;
DROP PROCEDURE bug9056_proc2; DROP PROCEDURE bug9056_proc2;
DROP PROCEDURE `a'b`;
drop table t1; drop table t1;
drop table if exists t1; drop table if exists t1;
create table t1 (`d` timestamp, unique (`d`)); create table t1 (`d` timestamp, unique (`d`));

1
mysql-test/t/mysqldump.test
View File

@ -917,6 +917,7 @@ DROP FUNCTION bug9056_func1;
DROP FUNCTION bug9056_func2; DROP FUNCTION bug9056_func2;
DROP PROCEDURE bug9056_proc1; DROP PROCEDURE bug9056_proc1;
DROP PROCEDURE bug9056_proc2; DROP PROCEDURE bug9056_proc2;
DROP PROCEDURE `a'b`;
drop table t1; drop table t1;
# #

4
sql/ha_berkeley.h
View File

@ -94,8 +94,8 @@ class ha_berkeley: public handler
uint max_supported_keys() const { return MAX_KEY-1; } uint max_supported_keys() const { return MAX_KEY-1; }
uint extra_rec_buf_length() { return BDB_HIDDEN_PRIMARY_KEY_LENGTH; } uint extra_rec_buf_length() { return BDB_HIDDEN_PRIMARY_KEY_LENGTH; }
ha_rows estimate_rows_upper_bound(); ha_rows estimate_rows_upper_bound();
uint max_supported_key_length() const { return 4294967295L; } uint max_supported_key_length() const { return UINT_MAX32; }
uint max_supported_key_part_length() const { return 4294967295L; } uint max_supported_key_part_length() const { return UINT_MAX32; }
const key_map *keys_to_use_for_scanning() { return &key_map_full; } const key_map *keys_to_use_for_scanning() { return &key_map_full; }
bool has_transactions() { return 1;} bool has_transactions() { return 1;}

3
sql/ha_ndbcluster.cc
View File

@ -3861,7 +3861,8 @@ int ha_ndbcluster::create(const char *name,
uint pack_length, length, i, pk_length= 0; uint pack_length, length, i, pk_length= 0;
const void *data, *pack_data; const void *data, *pack_data;
char name2[FN_HEADLEN]; 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_ENTER("ha_ndbcluster::create");
DBUG_PRINT("enter", ("name: %s", name)); DBUG_PRINT("enter", ("name: %s", name));

1
sql/mysqld.cc
View File

@ -1194,6 +1194,7 @@ static void clean_up_mutexes()
(void) rwlock_destroy(&LOCK_sys_init_slave); (void) rwlock_destroy(&LOCK_sys_init_slave);
(void) pthread_mutex_destroy(&LOCK_global_system_variables); (void) pthread_mutex_destroy(&LOCK_global_system_variables);
(void) pthread_mutex_destroy(&LOCK_global_read_lock); (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_thread_count);
(void) pthread_cond_destroy(&COND_refresh); (void) pthread_cond_destroy(&COND_refresh);
(void) pthread_cond_destroy(&COND_thread_cache); (void) pthread_cond_destroy(&COND_thread_cache);