Commit b078da18 authored by unknown's avatar unknown
Browse files

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
parents 64828533 db261af7

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ igor@hundin.mysql.fi 
igor@rurik.mysql.com

ingo@mysql.com

jan@hundin.mysql.fi

jani@a193-229-222-105.elisa-laajakaista.fi

jani@a193-229-222-2.elisa-laajakaista.fi

jani@a80-186-24-72.elisa-laajakaista.fi

jani@a80-186-41-201.elisa-laajakaista.fi

mysql-test/include/ps_query.inc

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ select '------ simple select tests ------' as test_sequence ; 


##### many column types, but no parameter

# heavy modified case derived from client_test.c: test_func_fields()

prepare stmt1 from ' select * from t9 ' ;

prepare stmt1 from ' select * from t9 order by c1 ' ;

--enable_metadata

execute stmt1;

--disable_metadata

mysql-test/r/ps_2myisam.result

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ c29= 'longblob', c30= 'longtext', c31='two', c32= 'tuesday'; 
commit ;

test_sequence

------ simple select tests ------

prepare stmt1 from ' select * from t9 ' ;

prepare stmt1 from ' select * from t9 order by c1 ' ;

execute stmt1;

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

def	test	t9	t9	c1	c1	1	4	1	N	49155	0	63

mysql-test/r/ps_3innodb.result

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ c29= 'longblob', c30= 'longtext', c31='two', c32= 'tuesday'; 
commit ;

test_sequence

------ simple select tests ------

prepare stmt1 from ' select * from t9 ' ;

prepare stmt1 from ' select * from t9 order by c1 ' ;

execute stmt1;

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

def	test	t9	t9	c1	c1	1	4	1	N	49155	0	63

mysql-test/r/ps_4heap.result

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ c29= 'longblob', c30= 'longtext', c31='two', c32= 'tuesday'; 
commit ;

test_sequence

------ simple select tests ------

prepare stmt1 from ' select * from t9 ' ;

prepare stmt1 from ' select * from t9 order by c1 ' ;

execute stmt1;

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

def	test	t9	t9	c1	c1	1	4	1	N	49155	0	63