mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 07:05:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse source 
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.1-new2
This commit is contained in:
unknown 2005-12-07 15:10:26 -08:00
commit 750671be8d
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/ha_federated.cc
View file

@ -432,7 +432,7 @@ bool federated_db_init()
DBUG_ENTER("federated_db_init");
if (pthread_mutex_init(&federated_mutex, MY_MUTEX_INIT_FAST))
goto error;
if (hash_init(&federated_open_tables, system_charset_info, 32, 0, 0,
if (!hash_init(&federated_open_tables, system_charset_info, 32, 0, 0,
(hash_get_key) federated_get_key, 0, 0))
{
federated_init= TRUE;
@ -1343,7 +1343,7 @@ static FEDERATED_SHARE *get_share(const char *table_name, TABLE *table)
query.append(FEDERATED_BTICK);
query.append(FEDERATED_COMMA);
}
query.length(query.length()- FEDERATED_COMMA_LEN);
query.length(query.length()- (FEDERATED_COMMA_LEN - 1));
query.append(FEDERATED_FROM);
query.append(FEDERATED_BTICK);