diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-03-10 12:48:43 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-03-10 12:48:43 +0200 |
| commit | 012ffb5d505cc563ae980bd8cbee9b668f517cac (patch) | |
| tree | 8651694def257832c6e225eead2eec4c5a7c9aeb /mysql-test/r/join.result | |
| parent | 66e8db8241bfcad048d08fa1a24532fae8ee5f0a (diff) | |
| parent | 73c2d4ad498890c2ba2cfa9a2c20fae4d37b1859 (diff) | |
| download | mariadb-git-012ffb5d505cc563ae980bd8cbee9b668f517cac.tar.gz | |
Merge with 3.23 to get fixes for --user and BACKUP TABLE
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-delete.result:
Delete: mysql-test/r/delete.result
BitKeeper/deleted/.del-stamp-h.in~4a5d6676232516c5:
Auto merged
client/mysqlbinlog.cc:
Auto merged
include/my_sys.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/t/delete.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/t/type_datetime.test:
Auto merged
mysys/my_copy.c:
Auto merged
sql/field.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/sql_rename.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/mysql-test-run.sh:
merge with 3.23.56
mysql-test/r/backup.result:
merge (needs to be updated)
mysql-test/r/join.result:
merge (needs to be updated)
mysql-test/r/type_datetime.result:
merge (needs to be updated)
mysql-test/t/backup.test:
merge with 3.23
scripts/mysqld_safe.sh:
Only use first --user option
sql/ha_myisam.cc:
Don't let BACKUP TABLE overwrite old files
sql/log_event.h:
merge
sql/mysql_priv.h:
merge
sql/mysqld.cc:
Use first --user option
sql/slave.cc:
use local version
sql/sql_repl.h:
use local version
Diffstat (limited to 'mysql-test/r/join.result')
| -rw-r--r-- | mysql-test/r/join.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result index ddea0ac1a57..d8c45ca09ce 100644 --- a/mysql-test/r/join.result +++ b/mysql-test/r/join.result @@ -251,3 +251,7 @@ t1_id t2_id type cost_unit min_value max_value t3_id item_id id name 22 1 Percent Cost 100 -1 6 291 1 s1 23 1 Percent Cost 100 -1 21 291 1 s1 drop table t1,t2; +rate_code base_rate +cust 20 +rate_code base_rate +cust 20 |