bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3313)

[Magnus Blåudd]

#At file:///data0/magnus/mysql/5.5-cluster/ based on revid:magnus.blaudd@strippedy

 3313 Magnus Blåudd	2011-04-26
      rpl_ndb
       - --default-character-set and --default-collation not supported anymore
         in 5.5, use the new names for same options i.e --character-set-server
         and --collation-server

    modified:
      mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_binlog_update.cnf
=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt	2010-10-27 11:32:32 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt	2011-04-26 08:58:21 +0000
@@ -1 +1 @@
---default-collation=ucs2_unicode_ci --default-character-set=ucs2,latin1
+--collation-server=ucs2_unicode_ci --character-set-server=ucs2,latin1

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_binlog_update.cnf'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_binlog_update.cnf	2010-01-05 08:55:32 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_binlog_update.cnf	2011-04-26 08:58:21 +0000
@@ -23,7 +23,7 @@ mysqld=,,
 [mysqld]
 open-files-limit=           1024
 local-infile
-default-character-set=      latin1
+character-set-server=      latin1
 connect-timeout=            60
 log-bin-trust-function-creators=1
 key_buffer_size=            1M

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