Commit 0cf71401 authored Aug 15, 2008 by Chad MILLER

Merge from 5.0-bugteam.

parents 0991cca1 29410248

mysql-test/r/ps_1general.result

+2 −2

Original line number	Diff line number	Diff line
		@@ -445,7 +445,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 1365 0 Y 0 31 8
		def key_len 253 4096 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
		@@ -461,7 +461,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 1365 1 Y 0 31 8
		def key_len 253 4096 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 1365 0 Y 0 31 8
		def key_len 253 4096 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 1365 0 Y 0 31 8
		def key_len 253 4096 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 1365 0 Y 0 31 8
		def key_len 253 4096 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 1365 0 Y 0 31 8
		def key_len 253 4096 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 1365 0 Y 0 31 8
		def key_len 253 4096 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