From: Mattias Jonsson
Date: July 9 2010 12:54pm
Subject: bzr commit into mysql-5.1-bugteam branch (mattias.jonsson:3475)
List-Archive: http://lists.mysql.com/commits/113252
Message-Id: <201007091256.o69BBAAa024974@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1487902613809704835=="

--===============1487902613809704835==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/mattiasj/mysql-bzr/topush-51-bugteam/ based on revid:mattias.jonsson@stripped

 3475 Mattias Jonsson	2010-07-09 [merge]
      merge with latest 51-bt

    modified:
      mysql-test/suite/funcs_1/r/is_basics_mixed.result
=== modified file 'mysql-test/suite/funcs_1/r/is_basics_mixed.result'
--- a/mysql-test/suite/funcs_1/r/is_basics_mixed.result	2008-03-07 19:18:14 +0000
+++ b/mysql-test/suite/funcs_1/r/is_basics_mixed.result	2010-07-09 12:17:47 +0000
@@ -328,7 +328,7 @@ ERROR 42000: Access denied for user 'roo
 SELECT table_schema,table_name FROM information_schema.tables
 WHERE table_schema = 'information_schema' AND table_name = 'tables';
 table_schema	table_name
-information_schema	tables
+information_schema	TABLES
 SELECT * FROM information_schema.table_privileges
 WHERE table_schema = 'information_schema';
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE


--===============1487902613809704835==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/mattias.jonsson@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mattias.jonsson@stripped\
#   izcussebt4mmfv3m
# target_branch: file:///Users/mattiasj/mysql-bzr/topush-51-bugteam/
# testament_sha1: 4a3479d5ee71c3254a6485b0389307cdf7214b6b
# timestamp: 2010-07-09 14:54:21 +0200
# source_branch: file:///Users/mattiasj/mysql-bzr/b49161-51-bugteam/
# base_revision_id: mattias.jonsson@stripped\
#   5z2j2l51m7lq10c8
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdevAe4AAm1fgAAwWGP/93Ke
jAC////wUAVNey7ttDZU7alNB2uElCmNJonkngKntJmgp+hNR6anlNPSM1BJQmE00aaJPJT1NqaH
qGgABkNASRE0nqnqYepGmDUYmhoANDQ0A5gAAAAAAAAAASSEZAQ0xKb0xJkmmyk8powIep+qN1Fh
sZ1/v+OxbXXHUFk7pQYxKnFY4stfE3EQOyc4auUbBmPfaG+EZIajDtF3IXuO5vn6Zsm3Xu/SW7D9
tWyixjdhLRknNNPAG2tFtUfyVwAi36n0JxIqNiB5MfBeE3CkwkvgNLXCiGgVqSQagPEe761jPXBz
vh5zAzDNhGtWWAIdOyEPfWDgxSUpXCupPXVBEQREKnWmgImVQkiSG5tOqKreZAzF5WMixmaF3oaw
kCKqsMAw7p5S8gOBE5H3NlB9ZmML0dykvm+XUbSxW4h9uq3Z5Z6G6YW8Mse3XFhS9NafGa+aowEb
UYhD6KxymaNCLyucY2rWyjzgFhDM/wvCuM9+UYSxLnvgbZxiNpY5nXFJF81OuZTQobkHIsqOa+Wo
SOxXYzoeayoGj0Rdz5Gd9BGGvPji2MVQ8bDgrzKzIxmR804aUFLjggwxmTTLJc6cU99mYLmtqdVe
t1riY7KJ9M+bMLPXKyyejk1RULT1VmMLb1IhmymuGpK1UFyZWIIixdGZvfMnYvEOfoyGNKExZEkR
vuGsIcDrT+KC9uFQbJtFerYSVCISxIa2o+s3ShxwhdBWOBmCJ5z2k0ygqUqasLnr3rd0KjVwc7Im
Mpq7iwkh0R4XQIKcchiUh0VCgUpxh9Psml6FNdbWLZ1ZSbOTBEQD143YzKxjAYfzu75g75jbpxfD
+/UMcpK1JyqZ5wQKfLs0wiboHZ3nprOfL8JBvzMLyTcTCs+ca2uOu5BE7WAcVQgptDBUMu7AWLzW
3SrfYUyNniylsBT0WN5Ge7s5DBETHHprIQg/OVhgKai+63Y9y2Qt276D16bfbfXw8DMtQdPF4yQc
hI8CeC8grJ6XLhQTla4UBhYZyRAiFgce0qLbvDovAFSNV0p4s6Qd7XKGTP7WwnfLWKnxvKrEXxtF
vPO0bQM70mLBxhBSE3S5iv1PlsKKGj81X2POvbHDmNow1W9xwSFc3BaiZHuZCIZ4lnHmcx5AYagP
yyTgeZnO4xv0eWeKL3Wg112NT8y9r+PtwbsYmja2nKoPWpW7wOx2GSRAF6IPIkeq6nj01BhMgobE
wD4lKYRlI0Z1rkDnYlS2GAMTmS6GaeGWQthOC99C8gVpPkLZ0rK7i6ZNUQR8eKqVfMC5N72ixCNW
ID1MYUJlSQAny5VJAxbTibyP0V7z+qzAe3zBFp49lXAhiLNeZm7XUkVQV4XiyWfYLSRFQjCDG5Ma
4IHBaTPRRJViw1jkzz8CALYgqQSQQZDCtQeJ5X1cePc9BG7Q3dAF5WoYBlcd+wElb+wgYW8FuF9H
iwtBalgOQZaDMiCmI4wPWGKvTU68TTl8bgoQH/MlEriB1W552HKUQTU7U8UlfC4yUSfkMKKDTRMq
N5TInHhbW2AxPMqEnSXsw0kHp1aXrWVhmgciAmOSqcclDqbK9KBo8geYJ/aRT2NNPIXakp8kwg43
egsVC6pJ1BYpSZEytBqzyNlqCWWKwJqxiDJ7z0U84WKwu0Z7pg5IxqKpJbJUJicxYmlb6IGB13hk
KXTopIhWkR1UyR/xdyRThQkNevAe4A==


--===============1487902613809704835==--