diff options
Diffstat (limited to 'sql/examples')
-rw-r--r-- | sql/examples/ha_example.cc | 2 | ||||
-rw-r--r-- | sql/examples/ha_example.h | 2 | ||||
-rw-r--r-- | sql/examples/ha_tina.cc | 11 | ||||
-rw-r--r-- | sql/examples/ha_tina.h | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/sql/examples/ha_example.cc b/sql/examples/ha_example.cc index 68aed7c6483..db7a811df78 100644 --- a/sql/examples/ha_example.cc +++ b/sql/examples/ha_example.cc @@ -219,7 +219,7 @@ static handler* example_create_handler(TABLE *table) } -ha_example::ha_example(TABLE *table_arg) +ha_example::ha_example(TABLE_SHARE *table_arg) :handler(&example_hton, table_arg) {} diff --git a/sql/examples/ha_example.h b/sql/examples/ha_example.h index d2ec83a5837..139a50a3281 100644 --- a/sql/examples/ha_example.h +++ b/sql/examples/ha_example.h @@ -45,7 +45,7 @@ class ha_example: public handler EXAMPLE_SHARE *share; /* Shared lock info */ public: - ha_example(TABLE *table_arg); + ha_example(TABLE_SHARE *table_arg); ~ha_example() { } diff --git a/sql/examples/ha_tina.cc b/sql/examples/ha_tina.cc index 6bb883f91e0..1312577e126 100644 --- a/sql/examples/ha_tina.cc +++ b/sql/examples/ha_tina.cc @@ -55,7 +55,7 @@ TODO: pthread_mutex_t tina_mutex; static HASH tina_open_tables; static int tina_init= 0; -static handler* tina_create_handler(TABLE *table); +static handler *tina_create_handler(TABLE_SHARE *table); handlerton tina_hton= { "CSV", @@ -285,17 +285,17 @@ byte * find_eoln(byte *data, off_t begin, off_t end) } -static handler* tina_create_handler(TABLE *table) +static handler *tina_create_handler(TABLE_SHARE *table) { return new ha_tina(table); } -ha_tina::ha_tina(TABLE *table_arg) +ha_tina::ha_tina(TABLE_SHARE *table_arg) :handler(&tina_hton, table_arg), /* - These definitions are found in hanler.h - These are not probably completely right. + These definitions are found in handler.h + They are not probably completely right. */ current_position(0), next_position(0), chain_alloced(0), chain_size(DEFAULT_CHAIN_LENGTH) @@ -308,6 +308,7 @@ ha_tina::ha_tina(TABLE *table_arg) /* Encode a buffer into the quoted format. */ + int ha_tina::encode_quote(byte *buf) { char attribute_buffer[1024]; diff --git a/sql/examples/ha_tina.h b/sql/examples/ha_tina.h index 2de6d8c8257..eecdeeb5826 100644 --- a/sql/examples/ha_tina.h +++ b/sql/examples/ha_tina.h @@ -55,7 +55,7 @@ class ha_tina: public handler uint32 chain_size; public: - ha_tina(TABLE *table_arg); + ha_tina(TABLE_SHARE *table_arg); ~ha_tina() { if (chain_alloced) |