Commit 21df932d authored by unknown's avatar unknown
Browse files

Merge olga.mysql.com:/home/igor/mysql-5.0-opt 

into  olga.mysql.com:/home/igor/mysql-5.1-opt


BitKeeper/etc/gone:
  auto-union
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/insert_select.test:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysys/my_getopt.c:
  Auto merged
sql/field.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/include/mix1.inc:
  Manual merge
mysql-test/r/information_schema.result:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/t/information_schema.test:
  Manual merge
mysql-test/t/view.test:
  Manual merge
mysys/my_pthread.c:
  Manual merge
sql/mysql_priv.h:
  Manual merge
sql/opt_range.cc:
  Manual merge
sql/sql_insert.cc:
  Manual merge
sql/sql_update.cc:
  Manual merge
parents 9292b577 4c2bc81a

BitKeeper/etc/gone

+6 −0
Original line number Diff line number Diff line
@@ -458,6 +458,12 @@ ccarkner@nslinuxw10.bedford.progress.com|mysql-test/t/isolation.test|20010327145 
fs

holyfoot/hf@mysql.com/deer.(none)|mysql-test/r/bdb_notembedded.result|20061113160642|60022|276fa5181da9a588

holyfoot/hf@mysql.com/deer.(none)|mysql-test/t/bdb_notembedded.test|20061113160642|06094|6ef2ea4713496614

jani@a88-113-38-195.elisa-laajakaista.fi|BUILD/SETUP.sh.rej|20070122013357|30052|b0650da46e7c4e54

jani@a88-113-38-195.elisa-laajakaista.fi|configure.in.rej|20070122013357|43533|4b7ec608b9c90e83

jani@a88-113-38-195.elisa-laajakaista.fi|include/my_global.h.rej|20070122013357|29911|dc7f1642f6061af

jani@a88-113-38-195.elisa-laajakaista.fi|include/my_pthread.h.rej|20070122013357|18348|a6b632d992e5df16

jani@a88-113-38-195.elisa-laajakaista.fi|mysys/thr_alarm.c.rej|20070122013357|21935|c169568388079966

jani@a88-113-38-195.elisa-laajakaista.fi|sql/mysqld.cc.rej|20070122013357|09337|84aad00c2111bc3

jani@hynda.mysql.fi|client/mysqlcheck|20010419221207|26716|363e3278166d84ec

jcole@tetra.bedford.progress.com|BitKeeper/etc/logging_ok|20001004201211|30554

jimw@mysql.com|mysql-test/t/ndb_alter_table.disabled|20050311230559|27526|411e026940e7a0aa

mysql-test/include/mix1.inc

+29 −0
Original line number Diff line number Diff line
@@ -387,6 +387,35 @@ EXPLAIN SELECT b, SUM(c) FROM t1 GROUP BY b; 
EXPLAIN SELECT SQL_BIG_RESULT b, SUM(c) FROM t1 GROUP BY b;

DROP TABLE t1;



#

# Bug#26159: crash for a loose scan of a table that has been emptied 

#



CREATE TABLE t1 (

  id int NOT NULL,

  name varchar(20) NOT NULL,

  dept varchar(20) NOT NULL,

  age tinyint(3) unsigned NOT NULL,

  PRIMARY KEY (id),

  INDEX (name,dept)

) ENGINE=InnoDB;

INSERT INTO t1(id, dept, age, name) VALUES

  (3987, 'cs1', 10, 'rs1'), (3988, 'cs2', 20, 'rs1'), (3995, 'cs3', 10, 'rs2'),

  (3996, 'cs4', 20, 'rs2'), (4003, 'cs5', 10, 'rs3'), (4004, 'cs6', 20, 'rs3'),

  (4011, 'cs7', 10, 'rs4'), (4012, 'cs8', 20, 'rs4'), (4019, 'cs9', 10, 'rs5'),

  (4020, 'cs10', 20, 'rs5'),(4027, 'cs11', 10, 'rs6'),(4028, 'cs12', 20, 'rs6');



EXPLAIN SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';

SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';

DELETE FROM t1;

EXPLAIN SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';

SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';



DROP TABLE t1;



--source include/innodb_rollback_on_timeout.inc



--echo End of 5.0 tests

#

# Test of behaviour with CREATE ... SELECT

#

mysql-test/r/information_schema.result

+38 −2
Original line number Diff line number Diff line
@@ -1335,8 +1335,7 @@ from information_schema.tables 
order by object_schema;

explain select * from v1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	0	const row not found

2	DERIVED	tables	ALL	NULL	NULL	NULL	NULL	0	Using filesort

1	SIMPLE	tables	ALL	NULL	NULL	NULL	NULL	2	Using filesort

explain select * from (select table_name from information_schema.tables) as a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	0	const row not found
@@ -1352,6 +1351,43 @@ table_name 
t1

t2

drop table t1,t2;

select 1 as f1 from information_schema.tables  where "CHARACTER_SETS"=

(select cast(table_name as char)  from information_schema.tables

order by table_name limit 1) limit 1;

f1

1

select t.table_name, group_concat(t.table_schema, '.', t.table_name),

count(*) as num1

from information_schema.tables t

inner join information_schema.columns c1

on t.table_schema = c1.table_schema AND t.table_name = c1.table_name

where t.table_schema = 'information_schema' and

c1.ordinal_position =

(select isnull(c2.column_type) -

isnull(group_concat(c2.table_schema, '.', c2.table_name)) +

count(*) as num

from information_schema.columns c2 where

c2.table_schema='information_schema' and

(c2.column_type = 'varchar(7)' or c2.column_type = 'varchar(20)')

group by c2.column_type order by num limit 1)

group by t.table_name order by num1, t.table_name;

table_name	group_concat(t.table_schema, '.', t.table_name)	num1

CHARACTER_SETS	information_schema.CHARACTER_SETS	1

COLLATIONS	information_schema.COLLATIONS	1

COLLATION_CHARACTER_SET_APPLICABILITY	information_schema.COLLATION_CHARACTER_SET_APPLICABILITY	1

COLUMNS	information_schema.COLUMNS	1

COLUMN_PRIVILEGES	information_schema.COLUMN_PRIVILEGES	1

KEY_COLUMN_USAGE	information_schema.KEY_COLUMN_USAGE	1

ROUTINES	information_schema.ROUTINES	1

SCHEMATA	information_schema.SCHEMATA	1

SCHEMA_PRIVILEGES	information_schema.SCHEMA_PRIVILEGES	1

STATISTICS	information_schema.STATISTICS	1

TABLES	information_schema.TABLES	1

TABLE_CONSTRAINTS	information_schema.TABLE_CONSTRAINTS	1

TABLE_PRIVILEGES	information_schema.TABLE_PRIVILEGES	1

TRIGGERS	information_schema.TRIGGERS	1

USER_PRIVILEGES	information_schema.USER_PRIVILEGES	1

VIEWS	information_schema.VIEWS	1

End of 5.0 tests.

select * from information_schema.engines WHERE ENGINE="MyISAM";

ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS

mysql-test/r/innodb_mysql.result

+64 −0
Original line number Diff line number Diff line
@@ -324,6 +324,70 @@ EXPLAIN SELECT SQL_BIG_RESULT b, SUM(c) FROM t1 GROUP BY b; 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	128	Using filesort

DROP TABLE t1;

CREATE TABLE t1 (

id int NOT NULL,

name varchar(20) NOT NULL,

dept varchar(20) NOT NULL,

age tinyint(3) unsigned NOT NULL,

PRIMARY KEY (id),

INDEX (name,dept)

) ENGINE=InnoDB;

INSERT INTO t1(id, dept, age, name) VALUES

(3987, 'cs1', 10, 'rs1'), (3988, 'cs2', 20, 'rs1'), (3995, 'cs3', 10, 'rs2'),

(3996, 'cs4', 20, 'rs2'), (4003, 'cs5', 10, 'rs3'), (4004, 'cs6', 20, 'rs3'),

(4011, 'cs7', 10, 'rs4'), (4012, 'cs8', 20, 'rs4'), (4019, 'cs9', 10, 'rs5'),

(4020, 'cs10', 20, 'rs5'),(4027, 'cs11', 10, 'rs6'),(4028, 'cs12', 20, 'rs6');

EXPLAIN SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	name	name	44	NULL	2	Using where; Using index for group-by

SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';

name	dept

rs5	cs10

rs5	cs9

DELETE FROM t1;

EXPLAIN SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	name	name	44	NULL	2	Using where; Using index for group-by

SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';

name	dept

DROP TABLE t1;

show variables like 'innodb_rollback_on_timeout';

Variable_name	Value

innodb_rollback_on_timeout	OFF

create table t1 (a int unsigned not null primary key) engine = innodb;

insert into t1 values (1);

commit;

begin work;

insert into t1 values (2);

select * from t1;

a

1

2

begin work;

insert into t1 values (5);

select * from t1;

a

1

5

insert into t1 values (2);

ERROR HY000: Lock wait timeout exceeded; try restarting transaction

select * from t1;

a

1

5

commit;

select * from t1;

a

1

2

commit;

select * from t1;

a

1

2

5

drop table t1;

End of 5.0 tests

CREATE TABLE t1 (a int, b int);

insert into t1 values (1,1),(1,2);

CREATE TABLE t2 (primary key (a)) select * from t1;

mysql-test/r/insert_select.result

+26 −0
Original line number Diff line number Diff line
@@ -705,3 +705,29 @@ use bug21774_1; 
INSERT INTO bug21774_2.t1 SELECT t1.* FROM t1;

DROP DATABASE bug21774_1;

DROP DATABASE bug21774_2;

USE test;

create table t1(f1 int primary key, f2 int);

insert into t1 values (1,1);

affected rows: 1

insert into t1 values (1,1) on duplicate key update f2=1;

affected rows: 0

insert into t1 values (1,1) on duplicate key update f2=2;

affected rows: 2

select * from t1;

f1	f2

1	2

drop table t1;

create table t1(f1 int primary key auto_increment, f2 int unique);

insert into t1(f2) values(1);

select @@identity;

@@identity

1

insert ignore t1(f2) values(1);

select @@identity;

@@identity

0

insert ignore t1(f2) select 1;

select @@identity;

@@identity

0

drop table t1;