bk commit into 5.0 tree (kaa:1.2608) BUG#33834

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.0 repository of kaa.  When kaa does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-27 18:12:08+03:00, kaa@kaamos.(none) +1 -0
  Fixed test suite failures with --ps-protocol introduced in PB by
  the patch for bug #33834.

  mysql-test/t/func_time.test@stripped, 2008-02-27 18:12:07+03:00, kaa@kaamos.(none) +7 -1
    Fixed test suite failures with --ps-protocol introduced in PB by
    the patch for bug #33834.

diff -Nrup a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test
--- a/mysql-test/t/func_time.test	2008-02-25 13:25:55 +03:00
+++ b/mysql-test/t/func_time.test	2008-02-27 18:12:07 +03:00
@@ -336,7 +336,7 @@ select date_add(date,INTERVAL "1" QUARTE
 select timestampadd(MINUTE, 1, date) from t1;
 select timestampadd(WEEK, 1, date) from t1;
 select timestampadd(SQL_TSI_SECOND, 1, date) from t1;
-# Prepared statements doesn't support FRAC_SECOND yet
+# mysqltest.c discards an expected 'deprecated' warning on prepare stage
 --disable_ps_protocol
 select timestampadd(SQL_TSI_FRAC_SECOND, 1, date) from t1;
 --enable_ps_protocol
@@ -351,7 +351,10 @@ select timestampdiff(SQL_TSI_HOUR, '2001
 select timestampdiff(SQL_TSI_DAY, '2001-02-01', '2001-05-01') as a;
 select timestampdiff(SQL_TSI_MINUTE, '2001-02-01 12:59:59', '2001-05-01 12:58:59') as a;
 select timestampdiff(SQL_TSI_SECOND, '2001-02-01 12:59:59', '2001-05-01 12:58:58') as a;
+# mysqltest.c discards an expected 'deprecated' warning on prepare stage
+--disable_ps_protocol
 select timestampdiff(SQL_TSI_FRAC_SECOND, '2001-02-01 12:59:59.120000', '2001-05-01 12:58:58.119999') as a;
+--enable_ps_protocol
 
 select timestampdiff(SQL_TSI_DAY, '1986-02-01', '1986-03-01') as a1,
        timestampdiff(SQL_TSI_DAY, '1900-02-01', '1900-03-01') as a2,
@@ -810,8 +813,11 @@ select LAST_DAY('2007-12-06 08:59:19.05'
 # Show that he use of FRAC_SECOND, for anything other than
 # TIMESTAMPADD / TIMESTAMPDIFF, is a server error.
 
+# mysqltest.c discards an expected 'deprecated' warning on prepare stage
+--disable_ps_protocol
 SELECT TIMESTAMPADD(FRAC_SECOND, 1, '2008-02-18');
 SELECT TIMESTAMPDIFF(FRAC_SECOND, '2008-02-17', '2008-02-18');
+--enable_ps_protocol
 
 --error ER_PARSE_ERROR
 SELECT DATE_ADD('2008-02-18', INTERVAL 1 FRAC_SECOND);