From 17785f6344a91fc30f6f12cfe411f1250908a4b6 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 3 Jun 2004 19:36:36 +0200 Subject: Post-merge fixes. Not finished, will not be pushed until additional fixes have been made. client/mysqlbinlog.cc: Post-merge fixes. mysql-test/r/func_time.result: Post-merge fixes. sql/opt_range.cc: Post-merge fixes. sql/sql_select.cc: Post-merge fixes. --- mysql-test/r/func_time.result | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysql-test/r/func_time.result') diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index e73f300bb50..c0c2a29772b 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -656,4 +656,4 @@ timestampdiff(SQL_TSI_FRAC_SECOND, '2001-02-01 12:59:59.120000', '2001-05-01 12: id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL No tables used Warnings: -Note 1003 select high_priority timestamp_diff(WEEK,_latin1'2001-02-01',_latin1'2001-05-01') AS `a1`,timestamp_diff(SECOND_FRAC,_latin1'2001-02-01 12:59:59.120000',_latin1'2001-05-01 12:58:58.119999') AS `a2` +Note 1003 select timestamp_diff(WEEK,_latin1'2001-02-01',_latin1'2001-05-01') AS `a1`,timestamp_diff(SECOND_FRAC,_latin1'2001-02-01 12:59:59.120000',_latin1'2001-05-01 12:58:58.119999') AS `a2` -- cgit v1.2.1