Commit a778fb51 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1


sql/item.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents a9ba149a 970e20b7

mysql-test/r/func_default.result

+5 −0
Original line number Diff line number Diff line
@@ -16,3 +16,8 @@ explain select * from t1 where str <> default(str); 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	system	NULL	NULL	NULL	NULL	1	

drop table t1;

CREATE TABLE t1 (id int(11), s varchar(20));

INSERT INTO t1 VALUES (1, 'one'), (2, 'two'), (3, 'three');

SELECT s, 32 AS mi FROM t1 GROUP BY s HAVING DEFAULT(mi) IS NULL;

ERROR HY000: Field 'mi' doesn't have a default value

DROP TABLE t1;

mysql-test/r/group_min_max.result

+18 −0
Original line number Diff line number Diff line
@@ -1954,6 +1954,24 @@ id select_type table type possible_keys key key_len ref rows Extra 
explain select sum(ord(a1)) from t1 where (a1 > 'a') group by a1,a2,b;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	idx_t1_0,idx_t1_1,idx_t1_2	idx_t1_1	163	NULL	128	Using where; Using index

explain select a1 from t1 where a2 = 'b' group by a1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	NULL	idx_t1_1	130	NULL	5	Using where; Using index for group-by

select a1 from t1 where a2 = 'b' group by a1;

a1

a

b

c

d

explain select distinct a1 from t1 where a2 = 'b';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	NULL	idx_t1_1	130	NULL	5	Using where; Using index for group-by

select distinct a1 from t1 where a2 = 'b';

a1

a

b

c

d

drop table t1;

drop table t2;

drop table t3;

mysql-test/r/lock_multi.result

+7 −0
Original line number Diff line number Diff line
@@ -36,3 +36,10 @@ lock table t1 write, t2 write; 
drop table t2;

ERROR 42S02: Table 'test.t2' doesn't exist

drop table t1;

create table t1(a int);

lock tables t1 write;

show columns from t1;

Field	Type	Null	Key	Default	Extra

a	int(11)	YES		NULL	

unlock tables;

drop table t1;

mysql-test/r/mysql.result

+6 −0
Original line number Diff line number Diff line
@@ -48,3 +48,9 @@ Test 'go' command g 
a

1

drop table t1;

create table t1(a int);

lock tables t1 write;

database()

test

unlock tables;

drop table t1;

mysql-test/r/mysqldump.result

+50 −1
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa;

drop database if exists mysqldump_test_db;

drop view if exists v1;

drop database if exists db1;

drop view if exists v1, v2;

CREATE TABLE t1(a int);

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

<?xml version="1.0"?>
@@ -1422,3 +1423,51 @@ UNLOCK TABLES; 
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;



DROP TABLE t1;

create database db1;

use db1;

CREATE TABLE t2 (

a varchar(30) default NULL,

KEY a (a(5))

);

INSERT INTO t2 VALUES ('alfred');

INSERT INTO t2 VALUES ('angie');

INSERT INTO t2 VALUES ('bingo');

INSERT INTO t2 VALUES ('waffle');

INSERT INTO t2 VALUES ('lemon');

create view v2 as select * from t2 where a like 'a%' with check option;



/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;

/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;

/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;

/*!40101 SET NAMES utf8 */;

/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;

/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;

/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;

/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

DROP TABLE IF EXISTS `t2`;

CREATE TABLE `t2` (

  `a` varchar(30) default NULL,

  KEY `a` (`a`(5))

) ENGINE=MyISAM DEFAULT CHARSET=latin1;





/*!40000 ALTER TABLE `t2` DISABLE KEYS */;

LOCK TABLES `t2` WRITE;

INSERT INTO `t2` VALUES ('alfred'),('angie'),('bingo'),('waffle'),('lemon');

UNLOCK TABLES;

/*!40000 ALTER TABLE `t2` ENABLE KEYS */;

DROP TABLE IF EXISTS `v2`;

DROP VIEW IF EXISTS `v2`;

CREATE ALGORITHM=UNDEFINED VIEW `db1`.`v2` AS select `db1`.`t2`.`a` AS `a` from `db1`.`t2` where (`db1`.`t2`.`a` like _latin1'a%') WITH CASCADED CHECK OPTION;



/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;

/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;

/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;



drop table t2;

drop view v2;

drop database db1;