summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-03-15 20:00:20 +0300
committerAlexander Nozdrin <alik@sun.com>2010-03-15 20:00:20 +0300
commitc161a4876bd8d94cc5b3f6d2636240a859e66b23 (patch)
tree576ebd1039ae11c5cb4d38d49d1bc69f73877cfd /mysql-test
parentcdb480d6ddb7ede87998404a380390796ddce374 (diff)
downloadmariadb-git-c161a4876bd8d94cc5b3f6d2636240a859e66b23.tar.gz
A patch for Bug#52071 (rpl_ndb.rpl_ndb_ctype_ucs2_def fails).
Use new command line options instead of deprecated and removed ones.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt
index 84d2a52b639..711ec42bd8a 100644
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt
@@ -1 +1 @@
---default-collation=ucs2_unicode_ci --default-character-set=ucs2,latin1
+--collation-server=ucs2_unicode_ci --character-set-server=ucs2,latin1