Commit 21070e43 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 

into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents 57eef6e4 6a698c3b

include/heap.h

+1 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ extern int heap_indexes_are_disabled(HP_INFO *info); 
extern void heap_update_auto_increment(HP_INFO *info, const byte *record);

ha_rows hp_rb_records_in_range(HP_INFO *info, int inx, key_range *min_key,

                               key_range *max_key);

int hp_panic(enum ha_panic_function flag);

int heap_rkey(HP_INFO *info, byte *record, int inx, const byte *key, 

              uint key_len, enum ha_rkey_function find_flag);

extern gptr heap_find(HP_INFO *info,int inx,const byte *key);

include/mysql/plugin.h

+0 −1
Original line number Diff line number Diff line
@@ -301,7 +301,6 @@ struct st_mysql_ftparser 
struct st_mysql_storage_engine

{

  int interface_version;

  struct handlerton *handlerton;

};



#endif

mysql-test/r/ctype_ucs.result

+21 −0
Original line number Diff line number Diff line
@@ -755,6 +755,27 @@ select export_set(5, name, upper(name), ",", 5) from bug20536; 
export_set(5, name, upper(name), ",", 5)

test1,TEST1,test1,TEST1,TEST1

'test\_2','TEST\_2','test\_2','TEST\_2','TEST\_2'

CREATE TABLE t1 (

status enum('active','passive') collate latin1_general_ci 

NOT NULL default 'passive'

);

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `status` enum('active','passive') CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL DEFAULT 'passive'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

ALTER TABLE t1 ADD a int NOT NULL AFTER status;

CREATE TABLE t2 (

status enum('active','passive') collate ucs2_turkish_ci 

NOT NULL default 'passive'

);

SHOW CREATE TABLE t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `status` enum('active','passive') CHARACTER SET ucs2 COLLATE ucs2_turkish_ci NOT NULL DEFAULT 'passive'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

ALTER TABLE t2 ADD a int NOT NULL AFTER status;

DROP TABLE t1,t2;

select password(name) from bug20536;

password(name)

????????????????????

mysql-test/r/func_gconcat.result

+9 −0
Original line number Diff line number Diff line
@@ -660,3 +660,12 @@ CHAR_LENGTH( GROUP_CONCAT(b) ) 
240001

SET GROUP_CONCAT_MAX_LEN = 1024;

DROP TABLE t1;

CREATE TABLE t1 (a int, b int);

INSERT INTO t1 VALUES (2,1), (1,2), (2,2), (1,3);

SELECT GROUP_CONCAT(a), x 

FROM (SELECT a, GROUP_CONCAT(b) x FROM t1 GROUP BY a) AS s

GROUP BY x;

GROUP_CONCAT(a)	x

2	1,2

1	2,3

DROP TABLE t1;

mysql-test/r/func_group.result

+2 −2
Original line number Diff line number Diff line
@@ -851,8 +851,8 @@ CREATE TABLE t1 (a INT, b INT); 
INSERT INTO t1 VALUES (1,1),(1,2),(2,3);

SELECT (SELECT COUNT(DISTINCT t1.b)) FROM t1 GROUP BY t1.a;

(SELECT COUNT(DISTINCT t1.b))

0

2

1

SELECT (SELECT COUNT(DISTINCT 12)) FROM t1 GROUP BY t1.a;

(SELECT COUNT(DISTINCT 12))

1
@@ -1004,7 +1004,7 @@ SELECT SQL_NO_CACHE 
WHERE ttt.a = ccc.b AND ttt.a = t.a GROUP BY ttt.a) AS minid   

FROM t1 t, t2 c WHERE t.a = c.b;

minid

NULL

1

DROP TABLE t1,t2;

create table t1 select variance(0);

show create table t1;