From 1da60b9f45fae2b7de8a4a044f3ba0e13f6d6b72 Mon Sep 17 00:00:00 2001 From: "patg@pc248.lfp.kcls.org" <> Date: Thu, 20 Jan 2005 18:36:40 -0800 Subject: -Added quote_data and needs_quotes (moved from federated handler. -New tests and results logging_ok: Logging to logging@openlogging.org accepted ha_federated.h: removed quote_data and type_quote (now in the Field class) ha_federated.cc: moved quote_data and type_quote to field class field.h: new methods quote_data and needs_quotes declared field.cc: new field class methods quote_data and needs_quotes (per Monty's request) federated.test: more tests, joins, index tests have_federated_db.require: new name of federated system var federated.result: new test results for federated handler have_federated_db.inc: changed name of variable in test due to change in vars sql_analyse.cc: over-ridden append_escaped to take (String *, char *, uint) per requirements of 'create_where_from_key' method in federated handler. mysql_priv.h: define over-ridden append_escaped to take arguments from 'create_where_from_key' method in federated handler ha_federated.cc: implemented "create_where_from_key" to deal properly with two-byte prefix and multi keys. Initial testing shows it works, but I still need to move quoting to field class and also look at changes per Segei's suggestions. --- sql/ha_federated.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'sql/ha_federated.h') diff --git a/sql/ha_federated.h b/sql/ha_federated.h index ce35ce96828..b44ad937650 100755 --- a/sql/ha_federated.h +++ b/sql/ha_federated.h @@ -71,10 +71,7 @@ private: return 0 on success return errorcode otherwise */ - //FIX uint convert_row_to_internal_format(byte *buf, MYSQL_ROW row); - uint type_quote(int type); - void quote_data(String *string1, Field *field); bool ha_federated::create_where_from_key(String *to, KEY *key_info, const byte *key, uint key_length); public: @@ -105,7 +102,7 @@ public: { return (HA_TABLE_SCAN_ON_INDEX | HA_NOT_EXACT_COUNT | HA_PRIMARY_KEY_IN_READ_INDEX | HA_FILE_BASED | HA_AUTO_PART_KEY | - HA_TABLE_SCAN_ON_INDEX); + HA_TABLE_SCAN_ON_INDEX | HA_CAN_INDEX_BLOBS); } /* This is a bitmap of flags that says how the storage engine -- cgit v1.2.1