diff options
| author | unknown <pem@mysql.com> | 2003-12-16 16:12:28 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2003-12-16 16:12:28 +0100 |
| commit | b8fa1718502174c9d4599fd02c9ca0ffa74db1ef (patch) | |
| tree | 6c17d3cffec1fb7d5a50cf0dd8236f04c18f0291 /mysql-test/r/fulltext_left_join.result | |
| parent | 241bb226993b5ea11e73903858b5ba0fdc6e6647 (diff) | |
| parent | 24794dbc6d5d0a1481b413c43e72c9bb731794c7 (diff) | |
| download | mariadb-git-b8fa1718502174c9d4599fd02c9ca0ffa74db1ef.tar.gz | |
Merge 4.1 to 5.0.
mysql-test/r/distinct.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/multi_update.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/null.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/status.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/distinct.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/multi_update.test:
Auto merged
mysql-test/t/null.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/fulltext_left_join.result')
| -rw-r--r-- | mysql-test/r/fulltext_left_join.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/fulltext_left_join.result b/mysql-test/r/fulltext_left_join.result index d215ea0cea8..bf3fe73690a 100644 --- a/mysql-test/r/fulltext_left_join.result +++ b/mysql-test/r/fulltext_left_join.result @@ -31,9 +31,9 @@ match(t1.texte,t1.sujet,t1.motsclefs) against('droit' IN BOOLEAN MODE) 1 0 drop table t1, t2; -create table t1 (venue_id int(11) default null, venue_text varchar(255) default null, dt datetime default null) type=myisam; +create table t1 (venue_id int(11) default null, venue_text varchar(255) default null, dt datetime default null) engine=myisam; insert into t1 (venue_id, venue_text, dt) values (1, 'a1', '2003-05-23 19:30:00'),(null, 'a2', '2003-05-23 19:30:00'); -create table t2 (name varchar(255) not null default '', entity_id int(11) not null auto_increment, primary key (entity_id), fulltext key name (name)) type=myisam; +create table t2 (name varchar(255) not null default '', entity_id int(11) not null auto_increment, primary key (entity_id), fulltext key name (name)) engine=myisam; insert into t2 (name, entity_id) values ('aberdeen town hall', 1), ('glasgow royal concert hall', 2), ('queen\'s hall, edinburgh', 3); select * from t1 left join t2 on venue_id = entity_id where match(name) against('aberdeen' in boolean mode) and dt = '2003-05-23 19:30:00'; venue_id venue_text dt name entity_id |