bzr commit into mysql-next-mr-wl1054 branch (Georgi.Kodinov:2970)

[Georgi Kodinov]

#At file:///home/kgeorge/mysql/work/wl1054-next-mr/ based on revid:georgi.kodinov@stripped

 2970 Georgi Kodinov	2010-07-26
      fixed test case results after a merge

    modified:
      mysql-test/r/mysql_upgrade.result
=== modified file 'mysql-test/r/mysql_upgrade.result'
--- a/mysql-test/r/mysql_upgrade.result	2010-07-26 09:08:37 +0000
+++ b/mysql-test/r/mysql_upgrade.result	2010-07-26 09:55:42 +0000
@@ -199,6 +199,7 @@ mysql.ndb_binlog_index                  
 mysql.plugin                                       OK
 mysql.proc                                         OK
 mysql.procs_priv                                   OK
+mysql.proxy_priv                                   OK
 mysql.servers                                      OK
 mysql.slow_log
 Error    : You can't use locks with log tables.


Attachment: [text/bzr-bundle] bzr/[e-mail]