diff options
| author | unknown <konstantin@mysql.com> | 2006-02-08 13:11:44 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-02-08 13:11:44 +0300 |
| commit | 2e07d010cdfe6fa14d62ab5ef8c4dd06a3ea8803 (patch) | |
| tree | d52a6a2982aebb6ef2627a7d45c870911ee5e677 /mysql-test/t/federated.test | |
| parent | b38ec6f44adadef5e8838da24614edc60d08758b (diff) | |
| parent | 1bbd24a6ee6578321f6632d9765ffe072c3b1751 (diff) | |
| download | mariadb-git-2e07d010cdfe6fa14d62ab5ef8c4dd06a3ea8803.tar.gz | |
Merge mysql.com:/home/kostja/mysql/tmp_merge
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/t/federated.test:
Auto merged
mysql-test/t/trigger-grant.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysql-test/t/federated.test')
| -rw-r--r-- | mysql-test/t/federated.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/federated.test b/mysql-test/t/federated.test index 627244daa6c..a6587aa6a13 100644 --- a/mysql-test/t/federated.test +++ b/mysql-test/t/federated.test @@ -1237,6 +1237,7 @@ CREATE TABLE federated.t1 ( connection master; DROP TABLE IF EXISTS federated.t1; +--replace_result $SLAVE_MYPORT SLAVE_PORT eval CREATE TABLE federated.t1 ( `id` int(20) NOT NULL auto_increment, PRIMARY KEY (`id`) |