diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-10-16 16:34:29 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-10-16 16:34:29 +0300 |
| commit | 6f38e3083f0d867af8d1499fba92c7eaae295726 (patch) | |
| tree | 7e8b3a279aef52d26da9843f1c45ff38112391f2 /mysql-test/r/null_key.result | |
| parent | 266e42b24cf1837cde602811dccf63e0395bbe5c (diff) | |
| parent | 7013d8ef0ae0a21fadfcc0a159ee1d83fdad8a9d (diff) | |
| download | mariadb-git-6f38e3083f0d867af8d1499fba92c7eaae295726.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
BitKeeper/etc/logging_ok:
auto-union
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/null_key.result')
| -rw-r--r-- | mysql-test/r/null_key.result | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/null_key.result b/mysql-test/r/null_key.result index a28830a696d..91cd9dbbc7c 100644 --- a/mysql-test/r/null_key.result +++ b/mysql-test/r/null_key.result @@ -188,4 +188,10 @@ id uniq_id 4 2 7 3 8 4 +order_id product_id product_type +order_id product_id product_type +3d7ce39b5d4b3e3d22aaafe9b633de51 1206029 3 +3d7ce39b5d4b3e3d22aaafe9b633de51 5880836 3 +id id +id id DROP table t1,t2; |