diff options
| author | unknown <serg@serg.mylan> | 2003-07-04 12:07:06 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-07-04 12:07:06 +0200 |
| commit | e3ebfdebc1e911a48a274a5d37531b3dccae67e5 (patch) | |
| tree | cc2cab4310c04cc9e4a0788dc01cb626f5cdf8eb | |
| parent | 4a7a50a819ba7a6357e1ccbd2f093bcd898ff9c0 (diff) | |
| download | mariadb-git-e3ebfdebc1e911a48a274a5d37531b3dccae67e5.tar.gz | |
enabling HA_READ_PREFIX_LAST_OR_PREV
mysql-test/t/subselect.test:
fixed test case for no InnoDB
| -rw-r--r-- | mysql-test/t/subselect.test | 2 | ||||
| -rw-r--r-- | sql/opt_range.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test index 17738ae0c16..bec2303ad0c 100644 --- a/mysql-test/t/subselect.test +++ b/mysql-test/t/subselect.test @@ -781,6 +781,7 @@ drop table if exists t1; # # key field overflow test # +--disable_warnings CREATE TABLE t1 ( FOLDERID VARCHAR(32)BINARY NOT NULL @@ -798,6 +799,7 @@ FOLDERID VARCHAR(32)BINARY NOT NULL , PRIMARY KEY ( FOLDERID ) ) TYPE=InnoDB; +--enable_warnings CREATE INDEX FFOLDERID_IDX ON t1 (FOLDERID); CREATE INDEX CMFLDRPARNT_IDX ON t1 (PARENTID); INSERT INTO t1 VALUES("0c9aab05b15048c59bc35c8461507deb", "System", "System", "2003-06-05 16:30:00", "The system content repository folder.", "3", "2003-06-05 16:30:00", "System", "0", NULL, "9c9aab05b15048c59bc35c8461507deb", "1"); diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 6c1c49e23fc..7eb66c4e30f 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -2637,7 +2637,7 @@ int QUICK_SELECT_DESC::get_next() else { DBUG_ASSERT(range->flag & NEAR_MAX || range_reads_after_key(range)); -#ifdef NOT_IMPLEMENTED_YET +#ifndef NOT_IMPLEMENTED_YET result=file->index_read(record, (byte*) range->max_key, range->max_length, ((range->flag & NEAR_MAX) ? |