Commit 23804665 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/dlenev/src/mysql-4.1-psfix
parents e9a3612a 6fcb8b69

mysql-test/r/ps_1general.result

+0 −2
Original line number Diff line number Diff line
@@ -333,8 +333,6 @@ execute stmt1 ; 
ERROR 42S02: Unknown table 't5'

prepare stmt1 from ' SELECT @@version ' ;

execute stmt1 ;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					@@VERSION	254	102	34	N	1	31	8

@@VERSION

<version>

prepare stmt_do from ' do @var:=  (1 in (select a from t1)) ' ;

mysql-test/t/ps_1general.test

+9 −2
Original line number Diff line number Diff line
@@ -344,12 +344,19 @@ execute stmt1 ; 


## SELECT @@version

# cases derived from client_test.c: test_select_version()

--enable_metadata

#

# TODO: Metadata check is temporary disabled here, because metadata of 

# this statement also depends on @@version contents and you can't apply

# replace_column and replace_result to it. It will be enabled again when 

# support of replace_column and replace_result on metadata will be

# implemented.

#

#--enable_metadata

prepare stmt1 from ' SELECT @@version ' ;

# egalize the version

--replace_column 1 <version>

execute stmt1 ;

--disable_metadata

#--disable_metadata



## do @var:= and set @var=

# cases derived from client_test.c: test_do_set()