Commit 04c219ae authored by unknown's avatar unknown
Browse files

Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-21114_b


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents 2dac6ffd 384407aa

mysql-test/include/parser_bug21114.inc

0 → 100755
+59 −0
Original line number Diff line number Diff line 
#

# Bug#21114 (Foreign key creation fails to table with name format)

#

# Trying to trick the parser into thinking $FCT(...) is a function call,

# which is not in the CREATE TABLE and FOREIGN KEY ... REFERENCES syntax

#

# Usage :

#

# let $engine_type=InnoDb;

# let $verbose=1;

# let $FCT= <value_1>;

# -- source parser_stress_func.inc

# let $FCT= <value_2>;

# -- source parser_stress_func.inc

# let $verbose=0;

# let $FCT= <value_3>;

# -- source parser_stress_func.inc

# let $FCT= <value_4>;

# -- source parser_stress_func.inc



-- disable_warnings

eval drop table if exists $FCT;

drop table if exists bug21114_child;

-- enable_warnings



--disable_query_log

--disable_result_log



eval CREATE TABLE $FCT(

  col1 int not null,

  col2 int not null,

  col3 varchar(10),

  CONSTRAINT pk PRIMARY KEY (col1, col2)

) ENGINE $engine_type;



eval CREATE TABLE bug21114_child(

  pk int not null,

  fk_col1 int not null,

  fk_col2 int not null,

  fk_col3 int not null,

  fk_col4 int not null,

  CONSTRAINT fk_fct FOREIGN KEY (fk_col1, fk_col2)

    REFERENCES $FCT(col1, col2),

  CONSTRAINT fk_fct_space FOREIGN KEY (fk_col3, fk_col4)

    REFERENCES $FCT (col1, col2)

) ENGINE $engine_type;



--enable_query_log

--enable_result_log



if ($verbose)

{

  eval SHOW CREATE TABLE $FCT;

  SHOW CREATE TABLE bug21114_child;

}



DROP TABLE bug21114_child;

eval DROP TABLE $FCT;

mysql-test/r/func_math.result

+12 −0
Original line number Diff line number Diff line
@@ -102,6 +102,18 @@ Note 1003 select pi() AS `pi()`,format(sin((pi() / 2)),6) AS `format(sin(pi()/2) 
select degrees(pi()),radians(360);

degrees(pi())	radians(360)

180	6.2831853071796

select format(atan(-2, 2), 6);

format(atan(-2, 2), 6)

-0.785398

select format(atan(pi(), 0), 6);

format(atan(pi(), 0), 6)

1.570796

select format(atan2(-2, 2), 6);

format(atan2(-2, 2), 6)

-0.785398

select format(atan2(pi(), 0), 6);

format(atan2(pi(), 0), 6)

1.570796

SELECT ACOS(1.0);

ACOS(1.0)

0

mysql-test/r/parser.result

0 → 100644
+388 −0

File added.

Preview size limit exceeded, changes collapsed.

mysql-test/r/parser_bug21114_innodb.result

0 → 100644
+867 −0

File added.

Preview size limit exceeded, changes collapsed.

mysql-test/r/view.result

+4 −4
Original line number Diff line number Diff line
@@ -791,13 +791,13 @@ test.`f``1` () 
5

drop view v1;

drop function `f``1`;

create function x () returns int return 5;

create view v1 as select x ();

create function a() returns int return 5;

create view v1 as select a();

select * from v1;

x ()

a()

5

drop view v1;

drop function x;

drop function a;

create table t2 (col1 char collate latin1_german2_ci);

create view v2 as select col1 collate latin1_german1_ci from t2;

show create view v2;