Commit 9ea63c27 authored by joerg@trift2.'s avatar joerg@trift2.
Browse files

Merge trift2.:/MySQL/M50/mysql-5.0 

into  trift2.:/MySQL/M50/push-5.0
parents 52d337ba 687d2131

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.0.58)

AM_INIT_AUTOMAKE(mysql, 5.0.60)

AM_CONFIG_HEADER([include/config.h:config.h.in])



PROTOCOL_VERSION=10
@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=58

NDB_VERSION_BUILD=60

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

mysql-test/r/limit.result

+9 −0
Original line number Diff line number Diff line
@@ -94,6 +94,9 @@ drop table t1; 
prepare s from "select 1 limit ?";

set @a='qwe';

execute s using @a;

1

set @a=-1;

execute s using @a;

ERROR HY000: Incorrect arguments to EXECUTE

prepare s from "select 1 limit 1, ?";

execute s using @a;
@@ -101,4 +104,10 @@ ERROR HY000: Incorrect arguments to EXECUTE 
prepare s from "select 1 limit ?, ?";

execute s using @a, @a;

ERROR HY000: Incorrect arguments to EXECUTE

set @a=14632475938453979136;

execute s using @a, @a;

1

set @a=-14632475938453979136;

execute s using @a, @a;

ERROR HY000: Incorrect arguments to EXECUTE

End of 5.0 tests

mysql-test/r/ps.result

+182 −0
Original line number Diff line number Diff line
@@ -1709,4 +1709,186 @@ a b 
9999999999999999	14632475938453979136

deallocate prepare stmt;

drop table t1;

drop view if exists v1;

drop table if exists t1;

create table t1 (a int, b int);

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

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

prepare stmt from "create view v1 as select * from t1";

execute stmt;

drop table t1;

create table t1 (a int, b int);

drop view v1;

execute stmt;

show create view v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `a`,`t1`.`b` AS `b` from `t1`

drop view v1;

prepare stmt from "create view v1 (c,d) as select a,b from t1";

execute stmt;

show create view v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `c`,`t1`.`b` AS `d` from `t1`

select * from v1;

c	d

drop view v1;

execute stmt;

deallocate prepare stmt;

show create view v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `c`,`t1`.`b` AS `d` from `t1`

select * from v1;

c	d

drop view v1;

prepare stmt from "create view v1 (c) as select b+1 from t1";

execute stmt;

show create view v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select (`t1`.`b` + 1) AS `c` from `t1`

select * from v1;

c

drop view v1;

execute stmt;

deallocate prepare stmt;

show create view v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select (`t1`.`b` + 1) AS `c` from `t1`

select * from v1;

c

drop view v1;

prepare stmt from "create view v1 (c,d,e,f) as select a,b,a in (select a+2 from t1), a = all (select a from t1) from t1";

execute stmt;

show create view v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `c`,`t1`.`b` AS `d`,`t1`.`a` in (select (`t1`.`a` + 2) AS `a+2` from `t1`) AS `e`,`t1`.`a` = all (select `t1`.`a` AS `a` from `t1`) AS `f` from `t1`

select * from v1;

c	d	e	f

drop view v1;

execute stmt;

deallocate prepare stmt;

show create view v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `c`,`t1`.`b` AS `d`,`t1`.`a` in (select (`t1`.`a` + 2) AS `a+2` from `t1`) AS `e`,`t1`.`a` = all (select `t1`.`a` AS `a` from `t1`) AS `f` from `t1`

select * from v1;

c	d	e	f

drop view v1;

prepare stmt from "create or replace view v1 as select 1";

execute stmt;

show create view v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 1 AS `1`

select * from v1;

1

1

execute stmt;

show create view v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 1 AS `1`

deallocate prepare stmt;

show create view v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 1 AS `1`

select * from v1;

1

1

drop view v1;

prepare stmt from "create view v1 as select 1, 1";

execute stmt;

show create view v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 1 AS `1`,1 AS `My_exp_1`

select * from v1;

1	My_exp_1

1	1

drop view v1;

execute stmt;

deallocate prepare stmt;

show create view v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 1 AS `1`,1 AS `My_exp_1`

select * from v1;

1	My_exp_1

1	1

drop view v1;

prepare stmt from "create view v1 (x) as select a from t1 where a > 1";

execute stmt;

show create view v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `x` from `t1` where (`t1`.`a` > 1)

select * from v1;

x

drop view v1;

execute stmt;

deallocate prepare stmt;

show create view v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `x` from `t1` where (`t1`.`a` > 1)

select * from v1;

x

drop view v1;

prepare stmt from "create view v1 as select * from `t1` `b`";

execute stmt;

show create view v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `b`.`a` AS `a`,`b`.`b` AS `b` from `t1` `b`

select * from v1;

a	b

drop view v1;

execute stmt;

deallocate prepare stmt;

show create view v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `b`.`a` AS `a`,`b`.`b` AS `b` from `t1` `b`

select * from v1;

a	b

drop view v1;

prepare stmt from "create view v1 (a,b,c) as select * from t1";

execute stmt;

ERROR HY000: View's SELECT and view's field list have different column counts

execute stmt;

ERROR HY000: View's SELECT and view's field list have different column counts

deallocate prepare stmt;

drop table t1;

create temporary table t1 (a int, b int);

prepare stmt from "create view v1 as select * from t1";

execute stmt;

ERROR HY000: View's SELECT refers to a temporary table 't1'

execute stmt;

ERROR HY000: View's SELECT refers to a temporary table 't1'

deallocate prepare stmt;

drop table t1;

prepare stmt from "create view v1 as select * from t1";

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

prepare stmt from "create view v1 as select * from `t1` `b`";

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

prepare stmt from "select ?";

set @arg= 123456789.987654321;

select @arg;

@arg

123456789.987654321

execute stmt using @arg;

?

123456789.987654321

set @arg= "string";

select @arg;

@arg

string

execute stmt using @arg;

?

string

set @arg= 123456;

select @arg;

@arg

123456

execute stmt using @arg;

?

123456

set @arg= cast(-12345.54321 as decimal(20, 10));

select @arg;

@arg

-12345.5432100000

execute stmt using @arg;

?

-12345.5432100000

deallocate prepare stmt;

End of 5.0 tests.

mysql-test/r/rpl_user_variables.result

+16 −0
Original line number Diff line number Diff line
@@ -290,6 +290,22 @@ select * from t1; 
a	b

2	1

drop table t1;

create table t1(a int);

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

prepare s1 from 'insert into t1 select a from t1 limit ?';

set @x='1.1';

execute s1 using @x;

select * from t1;

a

1

2

1

select * from t1;

a

1

2

1

drop table t1;

End of 5.0 tests.

DROP FUNCTION IF EXISTS f1;

DROP FUNCTION IF EXISTS f2;

mysql-test/r/view.result

+20 −1
Original line number Diff line number Diff line
@@ -3618,4 +3618,23 @@ ERROR HY000: Field of view 'test.v1' underlying table doesn't have a default val 
set @@sql_mode=@old_mode;

drop view v1;

drop table t1;

End of 5.0 tests.
 
# -----------------------------------------------------------------

# -- Bug#34337: Server crash when Altering a view using a table name.

# -----------------------------------------------------------------



DROP TABLE IF EXISTS t1;



CREATE TABLE t1(c1 INT);



SELECT * FROM t1;

c1

ALTER ALGORITHM=TEMPTABLE SQL SECURITY INVOKER VIEW t1 (c2) AS SELECT (1);

ERROR HY000: 'test.t1' is not VIEW



DROP TABLE t1;



# -- End of test case for Bug#34337.



# -----------------------------------------------------------------

# -- End of 5.0 tests.

# -----------------------------------------------------------------