diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-11-24 16:37:41 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-11-24 16:37:41 +0200 |
| commit | 18ca5c4dbc890684316df6c29e5b34c018849126 (patch) | |
| tree | ca03b2abab93a9d6172ede495fa358909c306f94 /mysql-test/r/null_key.result | |
| parent | 72da2e4c9463aeb80083fd53cc0e6f5091b5f4f7 (diff) | |
| parent | bb948c635507db07365554d0e33bc09522c77557 (diff) | |
| download | mariadb-git-18ca5c4dbc890684316df6c29e5b34c018849126.tar.gz | |
merge with 3.23 to get bugfixes for <=> NULL and --bind-address
Build-tools/Do-compile:
Auto merged
mysql-test/r/func_test.result:
Auto merged
mysql-test/t/func_test.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/null_key.test:
Auto merged
mysql-test/mysql-test-run.sh:
Ignore changes from 3.23
mysql-test/r/func_time.result:
Update results
mysql-test/r/null_key.result:
Update results
scripts/mysqld_safe.sh:
Don't apply NICE handling change from 3.23
sql/mysqld.cc:
merge
sql/opt_range.cc:
merge
support-files/mysql.server.sh:
Don't apply changes from 3.23
Diffstat (limited to 'mysql-test/r/null_key.result')
| -rw-r--r-- | mysql-test/r/null_key.result | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/mysql-test/r/null_key.result b/mysql-test/r/null_key.result index ce397e11c1a..b737f9254b0 100644 --- a/mysql-test/r/null_key.result +++ b/mysql-test/r/null_key.result @@ -228,3 +228,20 @@ alter table t1 add key id (id); select * from t1, t2 where t1.id = t2.id; id id drop table t1,t2; +id id2 +NULL 0 +1 1 +id id2 +NULL 0 +id id2 +NULL 0 +1 1 +id id2 +NULL 0 +1 1 +id id2 +1 1 +id id2 +1 1 +id id2 +1 1 |