Commit 83c8e2c9 authored by unknown's avatar unknown
Browse files

merging 


sql/handler.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
parents 0a9c02f1 f01b0ac2

mysql-test/r/innodb.result

+2 −0
Original line number Diff line number Diff line
@@ -3278,3 +3278,5 @@ SELECT p0.a FROM t2 p0 WHERE BINARY p0.b = 'customer_over'; 
a

1

drop table t2, t1;

create table t1 (g geometry not null, spatial gk(g)) engine=innodb;

ERROR HY000: The used table type doesn't support SPATIAL indexes

mysql-test/t/innodb.test

+12 −0
Original line number Diff line number Diff line
@@ -2190,3 +2190,15 @@ SELECT DISTINCT p0.a FROM t2 p0 WHERE BINARY p0.b = 'customer_over'; 
SELECT p0.a FROM t2 p0 WHERE BINARY p0.b = 'customer_over';



drop table t2, t1;

create table t2(a date, key(a)) engine=innodb; 

insert into t1 values('2005-10-01');

insert into t2 values('2005-10-01');

select * from t1, t2

  where t2.a between t1.a - interval 2 day and t1.a + interval 2 day;

drop table t1, t2;



#

# Bug #15680 (SPATIAL key in innodb)

#

--error ER_TABLE_CANT_HANDLE_SPKEYS

create table t1 (g geometry not null, spatial gk(g)) engine=innodb;

sql/ha_myisam.cc

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ ha_myisam::ha_myisam(TABLE *table_arg) 
  int_table_flags(HA_NULL_IN_KEY | HA_CAN_FULLTEXT | HA_CAN_SQL_HANDLER |

                  HA_DUPP_POS | HA_CAN_INDEX_BLOBS | HA_AUTO_PART_KEY |

                  HA_FILE_BASED | HA_CAN_GEOMETRY | HA_READ_RND_SAME |

                  HA_CAN_INSERT_DELAYED | HA_CAN_BIT_FIELD),

                  HA_CAN_INSERT_DELAYED | HA_CAN_BIT_FIELD | HA_CAN_RTREEKEYS),

  can_enable_indexes(1)

{}

sql/handler.h

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ 
*/

#define HA_CAN_INSERT_DELAYED  (1 << 14)

#define HA_PRIMARY_KEY_IN_READ_INDEX (1 << 15)

#define HA_CAN_RTREEKEYS       (1 << 17)

#define HA_NOT_DELETE_WITH_CACHE (1 << 18)

#define HA_NO_PREFIX_CHAR_KEYS (1 << 20)

#define HA_CAN_FULLTEXT        (1 << 21)

sql/share/errmsg.txt

+2 −0
Original line number Diff line number Diff line
@@ -5617,3 +5617,5 @@ ER_VIEW_RECURSIVE 
        eng "`%-.64s`.`%-.64s` contains view recursion"

ER_NON_GROUPING_FIELD_USED 42000

	eng "non-grouping field '%-.64s' is used in %-.64s clause"

ER_TABLE_CANT_HANDLE_SPKEYS

        eng "The used table type doesn't support SPATIAL indexes"