diff options
| author | unknown <lars@mysql.com> | 2006-06-16 01:15:19 +0200 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2006-06-16 01:15:19 +0200 |
| commit | 9933c3bd3a21f8b7dfbe80068ae455be325d8d3f (patch) | |
| tree | 3d62694dfc5e3c919e109127dafeb40e4a665a75 /mysql-test/r/type_ranges.result | |
| parent | ed849efcc176b4d7b500ca69cf0ee7b1ec39f8ab (diff) | |
| parent | 684bda9a06a3967d83d25907a3077aa3849468ad (diff) | |
| download | mariadb-git-9933c3bd3a21f8b7dfbe80068ae455be325d8d3f.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
mysql-test/r/binlog_row_mix_innodb_myisam.result:
Auto merged
mysql-test/r/federated.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/extra/rpl_tests/rpl_ddl.test:
Auto merged
mysql-test/r/rpl_ddl.result:
Auto merged
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/rpl_ndb_charset.result:
Auto merged
mysql-test/r/type_ranges.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/r/trigger-grant.result:
Auto merged
mysql-test/t/archive.test:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/federated.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/innodb_mysql.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/trigger-grant.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/r/create.result:
Manual merge
mysql-test/r/innodb_mysql.result:
Manual merge
sql/handler.cc:
Manual merge
sql/share/errmsg.txt:
Manual merge
sql/sql_class.h:
Manual merge
sql/sql_delete.cc:
Manual merge
sql/sql_insert.cc:
Manual merge
sql/sql_table.cc:
Manual merge
Diffstat (limited to 'mysql-test/r/type_ranges.result')
| -rw-r--r-- | mysql-test/r/type_ranges.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/type_ranges.result b/mysql-test/r/type_ranges.result index ba401a22945..df3298bad1a 100644 --- a/mysql-test/r/type_ranges.result +++ b/mysql-test/r/type_ranges.result @@ -323,7 +323,7 @@ select * from t3; id_A id_B 1 1 2 NULL -delete from t3; +truncate table t3; insert into t3 select t1.id as id_A, t2.id as id_B from t1 left join t2 on (t1.id = t2.id); select * from t3; id_A id_B |