diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_myisammrg.cc | 48 | ||||
| -rw-r--r-- | sql/ha_myisammrg.h | 18 | ||||
| -rw-r--r--[-rwxr-xr-x] | sql/item_uniq.cc | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | sql/item_uniq.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | sql/share/Makefile.am | 0 |
5 files changed, 47 insertions, 19 deletions
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc index f43dd901e1f..4e6a1f19583 100644 --- a/sql/ha_myisammrg.cc +++ b/sql/ha_myisammrg.cc @@ -1,15 +1,15 @@ /* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -86,33 +86,57 @@ int ha_myisammrg::delete_row(const byte * buf) int ha_myisammrg::index_read(byte * buf, const byte * key, uint key_len, enum ha_rkey_function find_flag) { - return (my_errno=HA_ERR_WRONG_COMMAND); +// return (my_errno=HA_ERR_WRONG_COMMAND); + statistic_increment(ha_read_key_count,&LOCK_status); + int error=myrg_rkey(file,buf,active_index, key, key_len, find_flag); + table->status=error ? STATUS_NOT_FOUND: 0; + return error; } int ha_myisammrg::index_read_idx(byte * buf, uint index, const byte * key, uint key_len, enum ha_rkey_function find_flag) { - return (my_errno=HA_ERR_WRONG_COMMAND); +// return (my_errno=HA_ERR_WRONG_COMMAND); + statistic_increment(ha_read_key_count,&LOCK_status); + int error=myrg_rkey(file,buf,index, key, key_len, find_flag); + table->status=error ? STATUS_NOT_FOUND: 0; + return error; } int ha_myisammrg::index_next(byte * buf) { - return (my_errno=HA_ERR_WRONG_COMMAND); +// return (my_errno=HA_ERR_WRONG_COMMAND); + statistic_increment(ha_read_next_count,&LOCK_status); + int error=myrg_rnext(file,buf,active_index); + table->status=error ? STATUS_NOT_FOUND: 0; + return error; } int ha_myisammrg::index_prev(byte * buf) { - return (my_errno=HA_ERR_WRONG_COMMAND); +// return (my_errno=HA_ERR_WRONG_COMMAND); + statistic_increment(ha_read_prev_count,&LOCK_status); + int error=myrg_rprev(file,buf, active_index); + table->status=error ? STATUS_NOT_FOUND: 0; + return error; } - + int ha_myisammrg::index_first(byte * buf) { - return (my_errno=HA_ERR_WRONG_COMMAND); +// return (my_errno=HA_ERR_WRONG_COMMAND); + statistic_increment(ha_read_first_count,&LOCK_status); + int error=myrg_rfirst(file, buf, active_index); + table->status=error ? STATUS_NOT_FOUND: 0; + return error; } int ha_myisammrg::index_last(byte * buf) { - return (my_errno=HA_ERR_WRONG_COMMAND); +// return (my_errno=HA_ERR_WRONG_COMMAND); + statistic_increment(ha_read_last_count,&LOCK_status); + int error=myrg_rlast(file, buf, active_index); + table->status=error ? STATUS_NOT_FOUND: 0; + return error; } int ha_myisammrg::rnd_init(bool scan) @@ -151,7 +175,7 @@ void ha_myisammrg::info(uint flag) deleted = (ha_rows) info.deleted; data_file_length=info.data_file_length; errkey = info.errkey; - table->keys_in_use=0; // No keys yet + table->keys_in_use=(((key_map) 1) << table->keys)- (key_map) 1; table->db_options_in_use = info.options; mean_rec_length=info.reclength; block_size=0; @@ -177,7 +201,7 @@ int ha_myisammrg::reset(void) int ha_myisammrg::external_lock(THD *thd, int lock_type) { return myrg_lock_database(file,lock_type); -} +} uint ha_myisammrg::lock_count(void) const { diff --git a/sql/ha_myisammrg.h b/sql/ha_myisammrg.h index cb1feb52989..864b2f1760c 100644 --- a/sql/ha_myisammrg.h +++ b/sql/ha_myisammrg.h @@ -1,15 +1,15 @@ /* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -32,11 +32,15 @@ class ha_myisammrg: public handler ~ha_myisammrg() {} const char *table_type() const { return "MRG_MyISAM"; } const char **bas_ext() const; - ulong option_flag() const { return HA_READ_RND_SAME+HA_KEYPOS_TO_RNDPOS+HA_REC_NOT_IN_SEQ;} + ulong option_flag() const { return HA_REC_NOT_IN_SEQ+HA_READ_NEXT+ + HA_READ_PREV+HA_READ_RND_SAME+HA_HAVE_KEY_READ_ONLY+ + HA_KEYPOS_TO_RNDPOS+HA_READ_ORDER+ + HA_LASTKEY_ORDER+HA_READ_NOT_EXACT_KEY+ + HA_LONGLONG_KEYS+HA_NULL_KEY+HA_BLOB_KEY; } uint max_record_length() const { return HA_MAX_REC_LENGTH; } - uint max_keys() const { return 0; } - uint max_key_parts() const { return 0; } - uint max_key_length() const { return 0; } + uint max_keys() const { return 1; } + uint max_key_parts() const { return MAX_REF_PARTS; } + uint max_key_length() const { return MAX_KEY_LENGTH; } int open(const char *name, int mode, int test_if_locked); int close(void); diff --git a/sql/item_uniq.cc b/sql/item_uniq.cc index 80ed6433fd8..80ed6433fd8 100755..100644 --- a/sql/item_uniq.cc +++ b/sql/item_uniq.cc diff --git a/sql/item_uniq.h b/sql/item_uniq.h index ff11222e2ee..ff11222e2ee 100755..100644 --- a/sql/item_uniq.h +++ b/sql/item_uniq.h diff --git a/sql/share/Makefile.am b/sql/share/Makefile.am index 9b0f0a2991f..9b0f0a2991f 100755..100644 --- a/sql/share/Makefile.am +++ b/sql/share/Makefile.am |