Commit d3018677 authored by unknown's avatar unknown
Browse files

Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0 

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt


mysql-test/r/merge.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
parents ea39ca34 672b61c5

include/my_base.h

+6 −1
Original line number Diff line number Diff line
@@ -224,12 +224,17 @@ enum ha_base_keytype { 
/* poor old NISAM has 8-bit flags :-( */

#define HA_SORT_ALLOWS_SAME	 128	/* Intern bit when sorting records */

#endif

#if MYSQL_VERSION_ID < 0x50200

/*

  Key has a part that can have end space.  If this is an unique key

  we have to handle it differently from other unique keys as we can find

  many matching rows for one key (because end space are not compared)

*/

#define HA_END_SPACE_KEY	4096

#define HA_END_SPACE_KEY      0 /* was: 4096 */

#else

#error HA_END_SPACE_KEY is obsolete, please remove it

#endif





	/* These flags can be added to key-seg-flag */

myisam/mi_range.c

+15 −0
Original line number Diff line number Diff line
@@ -71,6 +71,21 @@ ha_rows mi_records_in_range(MI_INFO *info, int inx, key_range *min_key, 
    uchar * key_buff;

    uint start_key_len;



    /*

      The problem is that the optimizer doesn't support

      RTree keys properly at the moment.

      Hope this will be fixed some day.

      But now NULL in the min_key means that we

      didn't make the task for the RTree key

      and expect BTree functionality from it.

      As it's not able to handle such request

      we return the error.

    */

    if (!min_key)

    {

      res= HA_POS_ERROR;

      break;

    }

    key_buff= info->lastkey+info->s->base.max_key_length;

    start_key_len= _mi_pack_key(info,inx, key_buff,

                                (uchar*) min_key->key, min_key->length,

mysql-test/r/func_gconcat.result

+0 −5
Original line number Diff line number Diff line
@@ -74,11 +74,6 @@ grp group_concat(c order by 1) 
1	a

2	b,c

3	C,D,d,d,D,E

select grp,group_concat(c order by "c") from t1 group by grp;

grp	group_concat(c order by "c")

1	a

2	b,c

3	C,D,d,d,D,E

select grp,group_concat(distinct c order by c) from t1 group by grp;

grp	group_concat(distinct c order by c)

1	a

mysql-test/r/func_str.result

+2 −2
Original line number Diff line number Diff line
@@ -1143,9 +1143,9 @@ EXPLAIN EXTENDED 
SELECT * FROM t1 INNER JOIN t2 ON code=id 

WHERE id='a12' AND (LENGTH(code)=5 OR code < 'a00');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	const	PRIMARY	PRIMARY	12	const	1	Using index

1	SIMPLE	t1	ref	code	code	13	const	3	Using where; Using index

1	SIMPLE	t2	ref	PRIMARY	PRIMARY	12	const	1	Using where; Using index

Warnings:

Note	1003	select `test`.`t1`.`code` AS `code`,`test`.`t2`.`id` AS `id` from `test`.`t1` join `test`.`t2` where ((`test`.`t1`.`code` = _latin1'a12') and (`test`.`t2`.`id` = _latin1'a12') and (length(`test`.`t1`.`code`) = 5))

Note	1003	select `test`.`t1`.`code` AS `code`,`test`.`t2`.`id` AS `id` from `test`.`t1` join `test`.`t2` where ((`test`.`t1`.`code` = _latin1'a12') and (length(`test`.`t1`.`code`) = 5))

DROP TABLE t1,t2;

End of 5.0 tests

mysql-test/r/gis-rtree.result

+11 −0
Original line number Diff line number Diff line
@@ -862,3 +862,14 @@ CHECK TABLE t1 EXTENDED; 
Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

DROP TABLE t1;

CREATE TABLE t1 (foo GEOMETRY NOT NULL, SPATIAL INDEX(foo) );

INSERT INTO t1 (foo) VALUES (PointFromWKB(POINT(1,1)));

INSERT INTO t1 (foo) VALUES (PointFromWKB(POINT(1,0)));

INSERT INTO t1 (foo) VALUES (PointFromWKB(POINT(0,1)));

INSERT INTO t1 (foo) VALUES (PointFromWKB(POINT(0,0)));

SELECT 1 FROM t1 WHERE foo != PointFromWKB(POINT(0,0));

1

1

1

1

DROP TABLE t1;