summaryrefslogtreecommitdiff
path: root/sql/ha_federated.cc
diff options
context:
space:
mode:
authorunknown <patg@govinda.patg.net>2006-07-07 11:17:50 -0700
committerunknown <patg@govinda.patg.net>2006-07-07 11:17:50 -0700
commit8f107a26107046db68b92b440e5f6ad537711d11 (patch)
tree1a0822f99f38a77f55b34680614f1c6a9ffa4b71 /sql/ha_federated.cc
parent650e65047a85dde24d96a28e281285951b866554 (diff)
downloadmariadb-git-8f107a26107046db68b92b440e5f6ad537711d11.tar.gz
BUG #19773
Small post-patch fixes mysql-test/r/federated.result: BUG #19773 Test result fixes mysql-test/t/federated.test: BUG #19774 Removed failing line to test. sql/ha_federated.cc: BUG #19773 method declartion and definition not the same.
Diffstat (limited to 'sql/ha_federated.cc')
-rw-r--r--sql/ha_federated.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc
index 06f87bef48e..61e2ab066f5 100644
--- a/sql/ha_federated.cc
+++ b/sql/ha_federated.cc
@@ -416,7 +416,7 @@ int federated_db_init()
if (pthread_mutex_init(&federated_mutex, MY_MUTEX_INIT_FAST))
goto error;
- if (hash_init(&federated_open_tables, &my_charset_bin, 32, 0, 0,
+ if (!hash_init(&federated_open_tables, &my_charset_bin, 32, 0, 0,
(hash_get_key) federated_get_key, 0, 0))
{
federated_init= TRUE;
@@ -2114,7 +2114,7 @@ error:
/* Initialized at each key walk (called multiple times unlike rnd_init()) */
-int ha_federated::index_init(uint keynr)
+int ha_federated::index_init(uint keynr, bool sorted)
{
DBUG_ENTER("ha_federated::index_init");
DBUG_PRINT("info", ("table: '%s' key: %u", table->s->table_name, keynr));
@@ -2523,14 +2523,13 @@ void ha_federated::info(uint flag)
stats.check_time= (ha_rows) my_strtoll10(row[13], (char**) 0,
&error);
}
- if (flag & HA_STATUS_CONST)
- stats.block_size= 4096;
-
/*
size of IO operations (This is based on a good guess, no high science
involved)
*/
- block_size= 4096;
+ if (flag & HA_STATUS_CONST)
+ stats.block_size= 4096;
+
}
if (result)