Commit abc6e665 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/hf/work/mysql-4.1.clean 

into mysql.com:/home/hf/work/mysql-5.0.mrg


mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/wait_timeout.test:
  Auto merged
parents 2cd08261 d7d88e59

mysql-test/t/init_connect.test

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
# Test of init_connect variable

#



# should work with embedded server after mysqltest is fixed

-- source include/not_embedded.inc

connect (con0,localhost,root,,);

connection con0;

select hex(@a);