Commit 0f723330 authored by unknown's avatar unknown
Browse files

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

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/unireg.cc:
  Auto merged
BitKeeper/deleted/.del-partition_innodb.result:
  Auto merged
BitKeeper/deleted/.del-partition_innodb.test:
  Auto merged
parents 57dc819a e8697194

libmysqld/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ ADD_LIBRARY(mysqldemb emb_qcache.cc libmysqld.c lib_sql.cc 
            ../client/get_password.c ../libmysql/errmsg.c

            ../libmysql/libmysql.c ../sql/password.c ../sql-common/client.c

            ../sql-common/my_time.c ../sql-common/my_user.c

            ../sql-common/pack.c ../sql/derror.cc ../sql/event_executor.cc

            ../sql-common/pack.c ../sql/derror.cc ../sql/event_scheduler.cc

            ../sql/event_timed.cc ../sql/events.cc ../sql/discover.cc

            ../sql/field_conv.cc ../sql/field.cc ../sql/filesort.cc

            ../sql/gstream.cc ../sql/ha_heap.cc ../sql/ha_myisam.cc

mysql-test/r/func_time.result

+6 −6
Original line number Diff line number Diff line
@@ -361,12 +361,6 @@ extract(SECOND FROM "1999-01-02 10:11:12") 
select extract(MONTH FROM "2001-02-00");

extract(MONTH FROM "2001-02-00")

2

SELECT DATE_SUB(str_to_date('9999-12-31 00:01:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE);

DATE_SUB(str_to_date('9999-12-31 00:01:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE)

9999-12-31 00:00:00

SELECT DATE_ADD(str_to_date('9999-12-30 23:59:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE);

DATE_ADD(str_to_date('9999-12-30 23:59:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE)

9999-12-31 00:00:00

SELECT EXTRACT(QUARTER FROM '2004-01-15') AS quarter;

quarter

1
@@ -403,6 +397,12 @@ quarter 
SELECT EXTRACT(QUARTER FROM '2004-12-15') AS quarter;

quarter

4

SELECT DATE_SUB(str_to_date('9999-12-31 00:01:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE);

DATE_SUB(str_to_date('9999-12-31 00:01:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE)

9999-12-31 00:00:00

SELECT DATE_ADD(str_to_date('9999-12-30 23:59:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE);

DATE_ADD(str_to_date('9999-12-30 23:59:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE)

9999-12-31 00:00:00

SELECT "1900-01-01 00:00:00" + INTERVAL 2147483648 SECOND;

"1900-01-01 00:00:00" + INTERVAL 2147483648 SECOND

1968-01-20 03:14:08

mysql-test/r/information_schema.result

+46 −8
Original line number Diff line number Diff line
@@ -310,26 +310,26 @@ show create function sub1; 
ERROR 42000: FUNCTION sub1 does not exist

select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES;

ROUTINE_NAME	ROUTINE_DEFINITION

sel2	

sub1	

sel2	NULL

sub1	NULL

grant all privileges on test.* to mysqltest_1@localhost;

select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES;

ROUTINE_NAME	ROUTINE_DEFINITION

sel2	

sub1	

sel2	NULL

sub1	NULL

create function sub2(i int) returns int

return i+1;

select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES;

ROUTINE_NAME	ROUTINE_DEFINITION

sel2	

sub1	

sel2	NULL

sub1	NULL

sub2	return i+1

show create procedure sel2;

Procedure	sql_mode	Create Procedure

sel2		

sel2		NULL

show create function sub1;

Function	sql_mode	Create Function

sub1		

sub1		NULL

show create function sub2;

Function	sql_mode	Create Function

sub2		CREATE DEFINER=`mysqltest_1`@`localhost` FUNCTION `sub2`(i int) RETURNS int(11)
@@ -1182,6 +1182,43 @@ concat(@a, table_name) @a table_name 
.t1	.	t1

.t2	.	t2

drop table t1,t2;

DROP PROCEDURE IF EXISTS p1;

DROP FUNCTION IF EXISTS f1;

CREATE PROCEDURE p1() SET @a= 1;

CREATE FUNCTION f1() RETURNS INT RETURN @a + 1;

CREATE USER mysql_bug20230@localhost;

GRANT EXECUTE ON PROCEDURE p1 TO mysql_bug20230@localhost;

GRANT EXECUTE ON FUNCTION f1 TO mysql_bug20230@localhost;

SELECT ROUTINE_NAME, ROUTINE_DEFINITION FROM INFORMATION_SCHEMA.ROUTINES;

ROUTINE_NAME	ROUTINE_DEFINITION

f1	RETURN @a + 1

p1	SET @a= 1

SHOW CREATE PROCEDURE p1;

Procedure	sql_mode	Create Procedure

p1		CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`()

SET @a= 1

SHOW CREATE FUNCTION f1;

Function	sql_mode	Create Function

f1		CREATE DEFINER=`root`@`localhost` FUNCTION `f1`() RETURNS int(11)

RETURN @a + 1

SELECT ROUTINE_NAME, ROUTINE_DEFINITION FROM INFORMATION_SCHEMA.ROUTINES;

ROUTINE_NAME	ROUTINE_DEFINITION

f1	NULL

p1	NULL

SHOW CREATE PROCEDURE p1;

Procedure	sql_mode	Create Procedure

p1		NULL

SHOW CREATE FUNCTION f1;

Function	sql_mode	Create Function

f1		NULL

CALL p1();

SELECT f1();

f1()

2

DROP FUNCTION f1;

DROP PROCEDURE p1;

DROP USER mysql_bug20230@localhost;

End of 5.0 tests.

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

ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS

MyISAM	ENABLED	Default engine as of MySQL 3.23 with great performance	NO	NO	NO
@@ -1190,3 +1227,4 @@ select user,db from information_schema.processlist; 
user	db

user3148	test

drop user user3148@localhost;

End of 5.1 tests.

mysql-test/r/partition.result

+39 −0
Original line number Diff line number Diff line
@@ -1078,4 +1078,43 @@ a 
2

1

drop table t1;

create table t1 (a int) engine myisam

partition by range (a)

subpartition by hash (a)

(partition p0 VALUES LESS THAN (1) DATA DIRECTORY = 'hello/master-data/tmpdata' INDEX DIRECTORY = 'hello/master-data/tmpinx'

(SUBPARTITION subpart00, SUBPARTITION subpart01));

hello/master-data/test/t1#P#p0#SP#subpart00.MYD

hello/master-data/test/t1#P#p0#SP#subpart00.MYI

hello/master-data/test/t1#P#p0#SP#subpart01.MYD

hello/master-data/test/t1#P#p0#SP#subpart01.MYI

hello/master-data/test/t1.frm

hello/master-data/test/t1.par

hello/master-data/tmpdata/t1#P#p0#SP#subpart00.MYD

hello/master-data/tmpdata/t1#P#p0#SP#subpart01.MYD

hello/master-data/tmpinx/t1#P#p0#SP#subpart00.MYI

hello/master-data/tmpinx/t1#P#p0#SP#subpart01.MYI

ALTER TABLE t1 REORGANIZE PARTITION p0 INTO

(partition p1 VALUES LESS THAN (1) DATA DIRECTORY = 'hello/master-data/tmpdata' INDEX DIRECTORY = 'hello/master-data/tmpinx'

(SUBPARTITION subpart10, SUBPARTITION subpart11),

partition p2 VALUES LESS THAN (2) DATA DIRECTORY = 'hello/master-data/tmpdata' INDEX DIRECTORY = 'hello/master-data/tmpinx'

(SUBPARTITION subpart20, SUBPARTITION subpart21));

hello/master-data/test/t1#P#p1#SP#subpart10.MYD

hello/master-data/test/t1#P#p1#SP#subpart10.MYI

hello/master-data/test/t1#P#p1#SP#subpart11.MYD

hello/master-data/test/t1#P#p1#SP#subpart11.MYI

hello/master-data/test/t1#P#p2#SP#subpart20.MYD

hello/master-data/test/t1#P#p2#SP#subpart20.MYI

hello/master-data/test/t1#P#p2#SP#subpart21.MYD

hello/master-data/test/t1#P#p2#SP#subpart21.MYI

hello/master-data/test/t1.frm

hello/master-data/test/t1.par

hello/master-data/tmpdata/t1#P#p1#SP#subpart10.MYD

hello/master-data/tmpdata/t1#P#p1#SP#subpart11.MYD

hello/master-data/tmpdata/t1#P#p2#SP#subpart20.MYD

hello/master-data/tmpdata/t1#P#p2#SP#subpart21.MYD

hello/master-data/tmpinx/t1#P#p1#SP#subpart10.MYI

hello/master-data/tmpinx/t1#P#p1#SP#subpart11.MYI

hello/master-data/tmpinx/t1#P#p2#SP#subpart20.MYI

hello/master-data/tmpinx/t1#P#p2#SP#subpart21.MYI

drop table t1;

End of 5.1 tests

mysql-test/r/partition_mgm.result

+12 −0
Original line number Diff line number Diff line
@@ -24,3 +24,15 @@ hello/master-data/test/t1#P#p0.MYD 
hello/master-data/test/t1#P#p0.MYI

hello/master-data/test/t1.frm

hello/master-data/test/t1.par

drop table t1;

create table t1 (a int)

partition by list (a)

subpartition by hash (a)

(partition p11 values in (1,2),

partition p12 values in (3,4));

alter table t1 REORGANIZE partition p11, p12 INTO

(partition p1 values in (1,2,3,4));

alter table t1 REORGANIZE partition p1 INTO

(partition p11 values in (1,2),

partition p12 values in (3,4));

drop table t1;