diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-10-08 12:01:58 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-10-08 12:01:58 +0300 |
| commit | a8d0df3ac791f44d0d23934fd508871a1f11c3da (patch) | |
| tree | 5f3cf2f56cc441edc81b2cf5fc056128ab764b41 /mysql-test/r/distinct.result | |
| parent | 9357319dcd40d098adc1c1965f41b02af0e22b8c (diff) | |
| download | mariadb-git-a8d0df3ac791f44d0d23934fd508871a1f11c3da.tar.gz | |
Fixes after merge
mysql-test/std_data/trunc_binlog.000001:
Rename: mysql-test/std_data/trunc_binlog.001 -> mysql-test/std_data/trunc_binlog.000001
client/mysqltest.c:
Fixed merge problem
mysql-test/mysql-test-run.sh:
Fixed merge problem
mysql-test/r/distinct.result:
Fix after merge
mysql-test/r/drop_temp_table.result:
Fix after merge
mysql-test/r/join_outer.result:
Fix after merge
mysql-test/r/mysqldump.result:
Fix after merge
mysql-test/r/null_key.result:
Fix after merge
mysql-test/r/order_by.result:
Fix after merge
mysql-test/r/rpl_alter.result:
Fix after merge
mysql-test/r/rpl_loaddata.result:
Fix after merge
mysql-test/r/rpl_loaddata_rule_m.result:
Fix after merge
mysql-test/r/rpl_trunc_binlog.result:
Fix after merge
mysql-test/r/select_safe.result:
Fix after merge
mysql-test/t/insert.test:
Fix after merge
mysql-test/t/mysqlbinlog.test:
Fix after merge
mysql-test/t/rpl000009.test:
Fix after merge
mysql-test/t/rpl_alter.test:
Fix after merge
mysql-test/t/rpl_loaddata_rule_m.test:
Fix after merge
mysql-test/t/rpl_trunc_binlog.test:
Fix after merge
sql-common/client.c:
Fix after merge
sql/item_subselect.cc:
Fix after merge
sql/repl_failsafe.cc:
Fix after merge
sql/slave.cc:
Fix after merge
sql/sql_insert.cc:
Fix after merge
Diffstat (limited to 'mysql-test/r/distinct.result')
| -rw-r--r-- | mysql-test/r/distinct.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/distinct.result b/mysql-test/r/distinct.result index 5e713f59100..d9beed25edf 100644 --- a/mysql-test/r/distinct.result +++ b/mysql-test/r/distinct.result @@ -303,9 +303,9 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t2 index id id 8 NULL 1 Using index; Distinct 1 SIMPLE t3 index id id 8 NULL 1 Using index; Distinct 1 SIMPLE j_lj_t2 index id id 4 NULL 2 Using where; Using index; Distinct -1 SIMPLE t2_lj index id id 8 NULL 1 Using where; Using index; Distinct +1 SIMPLE t2_lj ref id id 4 test.j_lj_t2.id 1 Using where; Using index; Distinct 1 SIMPLE j_lj_t3 index id id 4 NULL 2 Using where; Using index; Distinct -1 SIMPLE t3_lj index id id 8 NULL 1 Using where; Using index; Distinct +1 SIMPLE t3_lj ref id id 4 test.j_lj_t3.id 1 Using where; Using index; Distinct SELECT DISTINCT t1.id from |