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

Post merge fix

parent 04c219ae

mysql-test/r/ps.result

+4 −2
Original line number Diff line number Diff line
@@ -502,7 +502,8 @@ deallocate prepare stmt; 
create table t1 (a varchar(20));

insert into t1 values ('foo');

prepare stmt FROM 'SELECT char_length (a) FROM t1';

ERROR 42000: FUNCTION test.char_length does not exist

prepare stmt2 FROM 'SELECT not_a_function (a) FROM t1';

ERROR 42000: FUNCTION test.not_a_function does not exist

drop table t1;

prepare stmt from "SELECT SQL_CALC_FOUND_ROWS 'foo' UNION SELECT 'bar' LIMIT 0";

execute stmt;
@@ -1056,7 +1057,8 @@ End of 4.1 tests. 
create table t1 (a varchar(20));

insert into t1 values ('foo');

prepare stmt FROM 'SELECT char_length (a) FROM t1';

ERROR 42000: FUNCTION test.char_length does not exist

prepare stmt2 FROM 'SELECT not_a_function (a) FROM t1';

ERROR 42000: FUNCTION test.not_a_function does not exist

drop table t1;

create table t1 (a char(3) not null, b char(3) not null,

c char(3) not null, primary key  (a, b, c));

mysql-test/t/ps.test

+4 −2
Original line number Diff line number Diff line
@@ -523,8 +523,9 @@ deallocate prepare stmt; 
#

create table t1 (a varchar(20)); 

insert into t1 values ('foo'); 

--error 1305

prepare stmt FROM 'SELECT char_length (a) FROM t1'; 

-- error ER_SP_DOES_NOT_EXIST

prepare stmt2 FROM 'SELECT not_a_function (a) FROM t1'; 

drop table t1;



#
@@ -1126,8 +1127,9 @@ DROP TABLE t1; 
#

create table t1 (a varchar(20)); 

insert into t1 values ('foo'); 

--error 1305

prepare stmt FROM 'SELECT char_length (a) FROM t1'; 

-- error ER_SP_DOES_NOT_EXIST

prepare stmt2 FROM 'SELECT not_a_function (a) FROM t1'; 

drop table t1;



#