Commit 27eeeab8 authored Sep 09, 2005 by unknown

after merge fix

parent a3209971

mysql-test/r/ps_1general.result

+1 −2

Original line number	Diff line number	Diff line
		@@ -491,8 +491,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 8 3 1 Y 32928 0 63

		def key_len 253 4096 1 Y 128 31 63
		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
		@@ -1156,7 +1156,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 8 3 0 Y 32928 0 63
		def key_len 253 4096 0 Y 128 31 63
		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
		@@ -1156,7 +1156,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 8 3 0 Y 32928 0 63
		def key_len 253 4096 0 Y 128 31 63
		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
		@@ -1157,7 +1157,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 8 3 0 Y 32928 0 63
		def key_len 253 4096 0 Y 128 31 63
		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
		@@ -1199,7 +1199,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 8 3 0 Y 32928 0 63
		def key_len 253 4096 0 Y 128 31 63
		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
		@@ -4211,7 +4211,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 8 3 0 Y 32928 0 63
		def key_len 253 4096 0 Y 128 31 63
		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