diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-04-26 21:10:13 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-04-26 21:10:13 +0300 |
| commit | 3e90ec6a582ec6a39209c00329ed93a7cc639ded (patch) | |
| tree | b6c7972aefbe2a8d4c3651b65e740684673ec52b /mysql-test/r/join.result | |
| parent | 62af18cb8729894625d005e260838f68b7c57175 (diff) | |
| parent | 418467e32ad8617c1546870f1b24493601ca4d47 (diff) | |
| download | mariadb-git-3e90ec6a582ec6a39209c00329ed93a7cc639ded.tar.gz | |
Merge with 3.23:
Set innobase_flush_log_at_trx_commit to 1 by default
Fix problem with timestamp on 64 bit systems
Reserve alarms for up to 10 slave threads
BitKeeper/etc/logging_ok:
auto-union
mysql-test/t/rpl_alter.test:
Auto merged
mysys/charset.c:
Auto merged
sql/log_event.cc:
Auto merged
mysql-test/r/join.result:
Merge with 3.23
mysql-test/t/join.test:
Merge with 3.23
sql/ha_innodb.cc:
Merge with 3.23; Set innobase_flush_log_at_trx_commit to 1 by default
sql/log_event.h:
Merge with 3.23; Fix problem with timestamp on 64 bit systems
sql/mini_client.cc:
Use local version
sql/mysqld.cc:
Reserve alarms for up to 10 slave threads
sql/slave.cc:
Use local version
sql/sql_list.h:
Use local version
Diffstat (limited to 'mysql-test/r/join.result')
| -rw-r--r-- | mysql-test/r/join.result | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result index 3211dcf76a9..1b5766e3ab4 100644 --- a/mysql-test/r/join.result +++ b/mysql-test/r/join.result @@ -273,6 +273,9 @@ cust 20 SELECT emp.rate_code, lr.base_rate FROM t1 AS emp LEFT JOIN t2 AS lr USING (siteid, rate_code) WHERE lr.siteid = 'rivercats' AND emp.emp_id = 'psmith'; rate_code base_rate cust 20 +ID Value1 ID Value2 +ID Value1 ID Value2 +ID Value1 ID Value2 drop table t1,t2; create table t1 (i int); create table t2 (i int); |