summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <heikki@hundin.mysql.fi>2002-09-25 20:35:12 +0300
committerunknown <heikki@hundin.mysql.fi>2002-09-25 20:35:12 +0300
commit2384ead5aaa5344134ba1b5cad865f88d9d0f7da (patch)
tree096797edcaa627d23128c3ee6acd11c6a4396e91 /sql
parent3cb32b8c137e3a3cdf9a0d4d6bde506d33edb7ab (diff)
downloadmariadb-git-2384ead5aaa5344134ba1b5cad865f88d9d0f7da.tar.gz
ha_innodb.h, ha_innodb.cc:
Remove the flag HA_NOT_READ_PREFIX_LAST because ORDER BY orders wrong then; also remove the diagnostic print to avoid cluttering the error log sql/ha_innodb.cc: Remove the flag HA_NOT_READ_PREFIX_LAST because ORDER BY orders wrong then; also remove the diagnostic print to avoid cluttering the error log sql/ha_innodb.h: Remove the flag HA_NOT_READ_PREFIX_LAST because ORDER BY orders wrong then; also remove the diagnostic print to avoid cluttering the error log
Diffstat (limited to 'sql')
-rw-r--r--sql/ha_innodb.cc4
-rw-r--r--sql/ha_innodb.h5
2 files changed, 6 insertions, 3 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index c622a92f797..670ea914b21 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -2180,9 +2180,9 @@ convert_search_mode_to_innobase(
case HA_READ_BEFORE_KEY: return(PAGE_CUR_L);
case HA_READ_PREFIX: return(PAGE_CUR_GE);
case HA_READ_PREFIX_LAST:
- ut_print_timestamp(stderr);
+ /* ut_print_timestamp(stderr);
fprintf(stderr,
- " InnoDB: Warning: Using HA_READ_PREFIX_LAST\n");
+ " InnoDB: Warning: Using HA_READ_PREFIX_LAST\n"); */
return(PAGE_CUR_LE);
/* InnoDB does not yet support ..PREFIX_LAST!
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h
index 84cf6343bda..fad585433d7 100644
--- a/sql/ha_innodb.h
+++ b/sql/ha_innodb.h
@@ -81,8 +81,11 @@ class ha_innobase: public handler
HA_NO_WRITE_DELAYED |
HA_PRIMARY_KEY_IN_READ_INDEX |
HA_DROP_BEFORE_CREATE |
+ /* We should also list HA_NOT_READ_PREFIX_LAST
+ here but it currently seems to break ORDER BY;
+ until release 4.0.5 some LIKE 'abc%' ... DESC
+ queries will not work correctly */
HA_NO_PREFIX_CHAR_KEYS |
- HA_NOT_READ_PREFIX_LAST |
HA_TABLE_SCAN_ON_INDEX),
last_dup_key((uint) -1),
start_of_scan(0)