diff options
| author | unknown <holyfoot/hf@deer.(none)> | 2006-11-13 20:16:46 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@deer.(none)> | 2006-11-13 20:16:46 +0400 |
| commit | 298aff126768cc6fe81714b5bf8b3ae23f153444 (patch) | |
| tree | d70dc487b4e33a39736452f6305733ffb37e2321 /mysql-test/t/join.test | |
| parent | bbc5d13891e09447d399112dfa9fa1b9da929b64 (diff) | |
| parent | ea1f7e4b5697c3275c301011beaa394548f273ae (diff) | |
| download | mariadb-git-298aff126768cc6fe81714b5bf8b3ae23f153444.tar.gz | |
Merge mysql.com:/home/hf/work/embt/my50-embt
into mysql.com:/home/hf/work/embt/my51-embt
libmysqld/lib_sql.cc:
Auto merged
BitKeeper/deleted/.del-bdb.result:
Auto merged
BitKeeper/deleted/.del-bdb.test:
Auto merged
mysql-test/r/insert_select.result:
Auto merged
mysql-test/r/join.result:
Auto merged
mysql-test/t/backup.test:
Auto merged
mysql-test/t/delayed.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/t/status.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
mysql-test/mysql-test-run.pl:
merging
mysql-test/r/flush_block_commit.result:
SCCS merged
mysql-test/r/insert.result:
merging
mysql-test/t/innodb.test:
merging
mysql-test/t/insert.test:
merging
sql/share/errmsg.txt:
merging
Diffstat (limited to 'mysql-test/t/join.test')
| -rw-r--r-- | mysql-test/t/join.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/join.test b/mysql-test/t/join.test index d0005f3b8f7..9a72a7acd8f 100644 --- a/mysql-test/t/join.test +++ b/mysql-test/t/join.test @@ -520,6 +520,7 @@ select * from v1a join v1b on t1.b = t2.b; # # Bug #17523 natural join and information_schema # +# We mask out the Privileges column because it differs with embedded server --replace_column 31 # select * from information_schema.statistics join information_schema.columns using(table_name,column_name) where table_name='user'; |