Commit 674d1027 authored Jul 02, 2007 by kostja@bodhi.(none)

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

into  bodhi.(none):/opt/local/work/mysql-5.0-runtime

parents 38deea24 2d8decab

mysql-test/r/ps_1general.result

+4 −2

Original line number	Diff line number	Diff line
		@@ -396,6 +396,8 @@ prepare stmt1 from ' execute stmt2 ' ;
		ERROR HY000: This command is not supported in the prepared statement protocol yet
		prepare stmt1 from ' deallocate prepare never_prepared ' ;
		ERROR HY000: This command is not supported in the prepared statement protocol yet
		prepare stmt1 from 'alter view v1 as select 2';
		ERROR HY000: This command is not supported in the prepared statement protocol yet
		prepare stmt4 from ' use test ' ;
		ERROR HY000: This command is not supported in the prepared statement protocol yet
		prepare stmt3 from ' create database mysqltest ';
		@@ -466,7 +468,7 @@ def table 253 64 2 Y 0 31 8
		def type 253 10 3 Y 0 31 8
		def possible_keys 253 4096 0 Y 0 31 8
		def key 253 64 0 Y 0 31 8
		def key_len 253 4096 0 Y 128 31 63
		def key_len 253 1365 0 Y 0 31 8
		def ref 253 1024 0 Y 0 31 8
		def rows 8 10 1 Y 32928 0 63
		def Extra 253 255 14 N 1 31 8
		@@ -482,7 +484,7 @@ def table 253 64 2 Y 0 31 8
		def type 253 10 5 Y 0 31 8
		def possible_keys 253 4096 7 Y 0 31 8
		def key 253 64 7 Y 0 31 8
		def key_len 253 4096 1 Y 128 31 63
		def key_len 253 1365 1 Y 0 31 8
		def ref 253 1024 0 Y 0 31 8
		def rows 8 10 1 Y 32928 0 63
		def Extra 253 255 27 N 1 31 8

mysql-test/r/ps_2myisam.result

+1 −1

Original line number	Diff line number	Diff line
		@@ -1158,7 +1158,7 @@ def table 253 64 2 Y 0 31 8
		def type 253 10 3 Y 0 31 8
		def possible_keys 253 4096 0 Y 0 31 8
		def key 253 64 0 Y 0 31 8
		def key_len 253 4096 0 Y 128 31 63
		def key_len 253 1365 0 Y 0 31 8
		def ref 253 1024 0 Y 0 31 8
		def rows 8 10 1 Y 32928 0 63
		def Extra 253 255 0 N 1 31 8

mysql-test/r/ps_3innodb.result

+1 −1

Original line number	Diff line number	Diff line
		@@ -1158,7 +1158,7 @@ def table 253 64 2 Y 0 31 8
		def type 253 10 3 Y 0 31 8
		def possible_keys 253 4096 0 Y 0 31 8
		def key 253 64 0 Y 0 31 8
		def key_len 253 4096 0 Y 128 31 63
		def key_len 253 1365 0 Y 0 31 8
		def ref 253 1024 0 Y 0 31 8
		def rows 8 10 1 Y 32928 0 63
		def Extra 253 255 0 N 1 31 8

mysql-test/r/ps_4heap.result

+1 −1

Original line number	Diff line number	Diff line
		@@ -1159,7 +1159,7 @@ def table 253 64 2 Y 0 31 8
		def type 253 10 3 Y 0 31 8
		def possible_keys 253 4096 0 Y 0 31 8
		def key 253 64 0 Y 0 31 8
		def key_len 253 4096 0 Y 128 31 63
		def key_len 253 1365 0 Y 0 31 8
		def ref 253 1024 0 Y 0 31 8
		def rows 8 10 1 Y 32928 0 63
		def Extra 253 255 0 N 1 31 8

mysql-test/r/ps_5merge.result

+2 −2

Original line number	Diff line number	Diff line
		@@ -1201,7 +1201,7 @@ def table 253 64 2 Y 0 31 8
		def type 253 10 3 Y 0 31 8
		def possible_keys 253 4096 0 Y 0 31 8
		def key 253 64 0 Y 0 31 8
		def key_len 253 4096 0 Y 128 31 63
		def key_len 253 1365 0 Y 0 31 8
		def ref 253 1024 0 Y 0 31 8
		def rows 8 10 1 Y 32928 0 63
		def Extra 253 255 0 N 1 31 8
		@@ -4222,7 +4222,7 @@ def table 253 64 2 Y 0 31 8
		def type 253 10 3 Y 0 31 8
		def possible_keys 253 4096 0 Y 0 31 8
		def key 253 64 0 Y 0 31 8
		def key_len 253 4096 0 Y 128 31 63
		def key_len 253 1365 0 Y 0 31 8
		def ref 253 1024 0 Y 0 31 8
		def rows 8 10 1 Y 32928 0 63
		def Extra 253 255 0 N 1 31 8