bzr push into mysql-trunk branch (jon.hauglid:4867 to 4868)

[Jon Olav Hauglid]

 4868 Jon Olav Hauglid	2012-10-31 [merge]
      Merge from mysql-5.6 to mysql-trunk
      No conflicts

    modified:
      tests/mysql_client_test.c
 4867 Tanjot Uppal	2012-10-31
      Modified have_memcached_plugin.inc for updating the skip message
      ******
      Modified have_memcached_plugin.inc for updating the skip message

    modified:
      mysql-test/include/have_memcached_plugin.inc
=== modified file 'tests/mysql_client_test.c'
--- a/tests/mysql_client_test.c	2012-10-09 12:52:55 +0000
+++ b/tests/mysql_client_test.c	2012-10-31 10:03:20 +0000
@@ -6266,7 +6266,7 @@ static void test_temporal_param()
 
   /* Initialize DATETIME value */
   tm.neg= 0;
-  tm.time_type= MYSQL_TYPE_DATETIME;
+  tm.time_type= MYSQL_TIMESTAMP_DATETIME;
   tm.year= 2001;
   tm.month= 10;
   tm.day= 20;
@@ -6312,7 +6312,7 @@ static void test_temporal_param()
 
   /* Initialize TIME value */
   tm.neg= 0;
-  tm.time_type= MYSQL_TYPE_TIME;
+  tm.time_type= MYSQL_TIMESTAMP_TIME;
   tm.year= tm.month= tm.day= 0;
   tm.hour= 10;
   tm.minute= 10;

No bundle (reason: useless for push emails).