summaryrefslogtreecommitdiff
path: root/mysql-test/t/connect.test
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-10-04 16:35:40 +0200
committerunknown <msvensson@neptunus.(none)>2006-10-04 16:35:40 +0200
commite8fae25e6b60c1ef6ac9be1295478747d1f15115 (patch)
treed42c002f3686f2fc1095af1e54a37675a20bc8b2 /mysql-test/t/connect.test
parent8672a81bc631194934c7f1bef6bba783971f6c01 (diff)
parent5a39b93ec0faa9fe783bb526a80a93f9e8480a12 (diff)
downloadmariadb-git-e8fae25e6b60c1ef6ac9be1295478747d1f15115.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
into neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools BitKeeper/deleted/.del-mtr_stress.pl: Auto merged BitKeeper/deleted/.del-ps_6bdb.result: Auto merged BitKeeper/deleted/.del-rpl000018.result: Auto merged BitKeeper/deleted/.del-rpl000018.test: Auto merged BitKeeper/deleted/.del-rpl_chain_temp_table.result: Auto merged BitKeeper/deleted/.del-rpl_chain_temp_table.test: Auto merged BitKeeper/deleted/.del-rpl_failsafe.result: Auto merged BitKeeper/deleted/.del-rpl_failsafe.test: Auto merged BitKeeper/deleted/.del-rpl_heap.result: Auto merged BitKeeper/deleted/.del-rpl_heap.test: Auto merged mysql-test/include/have_ndb.inc: Auto merged mysql-test/include/master-slave.inc: Auto merged mysql-test/lib/mtr_misc.pl: Auto merged mysql-test/lib/mtr_report.pl: Auto merged mysql-test/r/binlog_stm_mix_innodb_myisam.result: Auto merged mysql-test/r/connect.result: Auto merged mysql-test/r/csv.result: Auto merged mysql-test/r/drop.result: Auto merged mysql-test/r/flush_block_commit.result: Auto merged mysql-test/r/func_misc.result: Auto merged mysql-test/r/grant2.result: Auto merged mysql-test/r/handler_myisam.result: Auto merged mysql-test/r/multi_update.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_7ndb.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/query_cache_notembedded.result: Auto merged mysql-test/r/rpl_err_ignoredtable.result: Auto merged mysql-test/r/rpl_master_pos_wait.result: Auto merged mysql-test/r/rpl_stm_000001.result: Auto merged mysql-test/r/sp-threads.result: Auto merged mysql-test/r/sp_notembedded.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/r/synchronization.result: Auto merged mysql-test/r/type_blob.result: Auto merged mysql-test/t/connect.test: Auto merged mysql-test/t/csv.test: Auto merged mysql-test/t/mysql_client_test.test: Auto merged mysql-test/t/ps.test: Auto merged mysql-test/t/ps_1general.test: Auto merged mysql-test/t/ps_grant.test: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/rpl_trunc_temp.test: Auto merged mysql-test/t/sp-error.test: Auto merged mysql-test/t/sp_notembedded.test: Auto merged mysql-test/t/subselect.test: Auto merged mysql-test/t/view_grant.test: Auto merged mysql-test/extra/rpl_tests/rpl_flsh_tbls.test: SCCS merged
Diffstat (limited to 'mysql-test/t/connect.test')
-rw-r--r--mysql-test/t/connect.test1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/connect.test b/mysql-test/t/connect.test
index 5ee3d64e56f..2e66c24d877 100644
--- a/mysql-test/t/connect.test
+++ b/mysql-test/t/connect.test
@@ -59,6 +59,7 @@ flush privileges;
connect (con10,localhost,test,gambling2,);
connect (con5,localhost,test,gambling2,mysql);
+connection con5;
set password="";
--error 1372
set password='gambling3';