diff options
| author | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2011-08-15 18:33:03 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2011-08-15 18:33:03 +0400 |
| commit | 4a6602223c79e25c7e07f70301de4f1b7975ec82 (patch) | |
| tree | 3daeaa52d1b51623dd7c0abf087c66ab78c2c529 /mysql-test/t/mysql_plugin.test | |
| parent | 457cbab0d6e3b952a3a94b0dd04a38bb4644c4cd (diff) | |
| download | mariadb-git-4a6602223c79e25c7e07f70301de4f1b7975ec82.tar.gz | |
Cherry-picking follow-up patch for WL 5710
from mysql-5.5 to mysql-5.5.16-release.
Original revision:
# revision-id: bjorn.munch@oracle.com-20110812104938-peswzao46f4lvm9p
# parent: dmitry.lenev@oracle.com-20110811155849-feyt3h7tj48padiu
# committer: Bjorn Munch <bjorn.munch@oracle.com>
# branch nick: main-55
# timestamp: Fri 2011-08-12 12:49:38 +0200
# message:
# Small followup fix to WL 5710:
# Test mysql_plugin failed if version string ended in -mN
Diffstat (limited to 'mysql-test/t/mysql_plugin.test')
| -rw-r--r-- | mysql-test/t/mysql_plugin.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/mysql_plugin.test b/mysql-test/t/mysql_plugin.test index 9e71db1a451..b07ce40e43a 100644 --- a/mysql-test/t/mysql_plugin.test +++ b/mysql-test/t/mysql_plugin.test @@ -288,11 +288,11 @@ let $MYSQL_PLUGIN_CMD= $MYSQL_PLUGIN -n --datadir=$MYSQL_DATADIR --basedir=$MYSQ --echo # Show the help. --echo # replace_result $MYSQL_PLUGIN mysql_plugin; ---replace_regex /Ver [0-9.]+ Distrib [0-9.]+/Ver V.V.VV Distrib XX.XX.XX/ +--replace_regex /Ver [0-9.]+ Distrib [0-9.]+/Ver V.V.VV Distrib XX.XX.XX/ /XX-m[0-9]+/XX/ --exec $MYSQL_PLUGIN --help replace_result $MYSQL_PLUGIN mysql_plugin; ---replace_regex /Ver [0-9.]+ Distrib [0-9.]+/Ver V.V.VV Distrib XX.XX.XX/ +--replace_regex /Ver [0-9.]+ Distrib [0-9.]+/Ver V.V.VV Distrib XX.XX.XX/ /XX-m[0-9]+/XX/ --exec $MYSQL_PLUGIN --version # |