diff options
author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-01-02 17:50:55 +0400 |
---|---|---|
committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-01-02 17:50:55 +0400 |
commit | 6de3acece297e93c05281395232522fe8a60257b (patch) | |
tree | 3662de642828825633db46ccebd552718618a3ef /mysql-test/t/mysqladmin.test | |
parent | 84d0cda44c8fd13b3b88f7b90ec8fb755caef361 (diff) | |
parent | 4a12418583b0527ea4f91c96de6e6991fdc45a15 (diff) | |
download | mariadb-git-6de3acece297e93c05281395232522fe8a60257b.tar.gz |
Merge mysql.com:/d2/hf/common/my41-common
into mysql.com:/d2/hf/common/my50-common
mysql-test/t/mysqladmin.test:
Auto merged
sql/item_func.cc:
Auto merged
libmysqld/lib_sql.cc:
merging
mysql-test/t/distinct.test:
merging
sql/sql_prepare.cc:
SCCS merged
Diffstat (limited to 'mysql-test/t/mysqladmin.test')
-rw-r--r-- | mysql-test/t/mysqladmin.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/mysqladmin.test b/mysql-test/t/mysqladmin.test index 850abc1ee69..3fa03fa910e 100644 --- a/mysql-test/t/mysqladmin.test +++ b/mysql-test/t/mysqladmin.test @@ -1,3 +1,5 @@ +# Embedded server doesn't support external clients +--source include/not_embedded.inc # # Test "mysqladmin ping" # |