List:Commits« Previous MessageNext Message »
From:Magne Mahre Date:October 6 2011 12:16pm
Subject:bzr push into mysql-trunk branch (magne.mahre:3485 to 3486)
View as plain text  
 3486 Magne Mahre	2011-10-06 [merge]
      Merge from mysql-5.5

    modified:
      tests/mysql_client_test.c
 3485 Tor Didriksen	2011-10-06
      Code cleanup.
      Reading register_item_tree_chage/rollback_item_tree_changes was
      quite confusing, until I realized that append() was actually push_front()....
     @ unittest/gunit/sql_list-t.cc
        New unit test.

    modified:
      libmysqld/lib_sql.cc
      sql/event_scheduler.cc
      sql/mysqld.cc
      sql/rpl_slave.cc
      sql/sql_class.cc
      sql/sql_insert.cc
      sql/sql_list.h
      sql/sql_show.cc
      unittest/gunit/sql_list-t.cc
=== modified file 'tests/mysql_client_test.c'
--- a/tests/mysql_client_test.c	2011-09-20 14:24:18 +0000
+++ b/tests/mysql_client_test.c	2011-10-06 12:15:21 +0000
@@ -13448,7 +13448,10 @@ static void test_truncation()
              ")";
   rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text));
   myquery(rc);
-  stmt_text= "insert into t1 VALUES ("
+
+  {
+    const char insert_text[]= 
+             "insert into t1 VALUES ("
              "-10, "                            /* i8 */
              "200, "                            /* ui8 */
              "32000, "                          /* i16 */
@@ -13464,8 +13467,9 @@ static void test_truncation()
              "'12345.67 	      ', "      /* tx_1 */
              "'12345.67abc'"                    /* ch_2 */
              ")";
-  rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text));
-  myquery(rc);
+    rc= mysql_real_query(mysql, insert_text, strlen(insert_text));
+    myquery(rc);
+  }
 
   stmt_text= "select i8 c1, i8 c2, ui8 c3, i16_1 c4, ui16 c5, "
              "       i16 c6, ui16 c7, i32 c8, i32_1 c9, i32_1 c10, "

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (magne.mahre:3485 to 3486) Magne Mahre7 Oct