diff options
| author | monty@hundin.mysql.fi <> | 2001-10-08 05:36:35 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-10-08 05:36:35 +0300 |
| commit | 938a8dc2ef15eb0878c9a71f2f60ae521084494a (patch) | |
| tree | 87a4027a65ad98a422987c566b6d394464e95623 /mysql-test/include | |
| parent | 0c81c7ea07b8f28746fef96409eafb6995c5d7c9 (diff) | |
| parent | 88aff4bf851e8f0d67cc7cd860d445e0fb234717 (diff) | |
| download | mariadb-git-938a8dc2ef15eb0878c9a71f2f60ae521084494a.tar.gz | |
merge
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/master-slave.inc | 8 | ||||
| -rw-r--r-- | mysql-test/include/not_embedded.inc | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/mysql-test/include/master-slave.inc b/mysql-test/include/master-slave.inc index 61077f898f6..c7c37fd01d3 100644 --- a/mysql-test/include/master-slave.inc +++ b/mysql-test/include/master-slave.inc @@ -1,7 +1,7 @@ -connect (master,localhost,root,,test,0,mysql-master.sock); -connect (master1,localhost,root,,test,0,mysql-master.sock); -connect (slave,localhost,root,,test,0,mysql-slave.sock); -connect (slave1,localhost,root,,test,0,mysql-slave.sock); +connect (master,localhost,root,,test,0,master.sock); +connect (master1,localhost,root,,test,0,master.sock); +connect (slave,localhost,root,,test,0,slave.sock); +connect (slave1,localhost,root,,test,0,slave.sock); connection slave; !slave stop; @r/slave-stopped.result show status like 'Slave_running'; diff --git a/mysql-test/include/not_embedded.inc b/mysql-test/include/not_embedded.inc new file mode 100644 index 00000000000..7d6fdbf9768 --- /dev/null +++ b/mysql-test/include/not_embedded.inc @@ -0,0 +1,3 @@ +-- require r/not_embedded.require +select version() like "%embedded%" as "have_embedded"; + |