From: kevin.lewis
Date: April 17 2012 11:45pm
Subject: bzr push into mysql-trunk branch (kevin.lewis:3882 to 3883)
List-Archive: http://lists.mysql.com/commits/143561
Message-Id: <20120417234523.F3AD02073722@dhcp-adc-twvpn-2-vpnpool-10-154-50-252.vpn.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3883 kevin.lewis@stripped	2012-04-17
      Fix another PB2 problem in main.partition_not_windows.test

    modified:
      sql/sql_partition.cc
 3882 kevin.lewis@stripped	2012-04-17 [merge]
      Merge

    added:
      mysql-test/r/mysql_embedded_client_test.result
      mysql-test/t/mysql_embedded_client_test.test
    modified:
      mysql-test/extra/rpl_tests/rpl_loaddata.test
      mysql-test/suite/engines/funcs/t/crash_manytables_number.test
      mysql-test/suite/engines/funcs/t/ld_all_number_string_calendar_types.test
      mysql-test/suite/engines/funcs/t/se_join_cross.test
      mysql-test/suite/engines/funcs/t/se_join_default.test
      mysql-test/suite/engines/funcs/t/se_join_inner.test
      mysql-test/suite/engines/funcs/t/se_join_left.test
      mysql-test/suite/engines/funcs/t/se_join_natural_left.test
      mysql-test/suite/engines/funcs/t/se_join_natural_left_outer.test
      mysql-test/suite/engines/funcs/t/se_join_natural_right.test
      mysql-test/suite/engines/funcs/t/se_join_natural_right_outer.test
      mysql-test/suite/engines/funcs/t/se_join_right.test
      mysql-test/suite/engines/funcs/t/se_join_right_outer.test
      mysql-test/suite/engines/funcs/t/se_join_straight.test
      mysql-test/suite/engines/funcs/t/se_string_limit.test
      mysql-test/suite/engines/iuds/t/update_delete_number.test
      mysql-test/suite/innodb/t/innodb_bug30423.test
      mysql-test/suite/innodb/t/innodb_bug53290.test
      mysql-test/suite/parts/t/partition_float_myisam.test
      mysql-test/suite/rpl/r/rpl_binlog_index.result
      mysql-test/suite/rpl/r/rpl_loaddata.result
      mysql-test/suite/rpl/r/rpl_parallel_start_stop.result
      mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result
      mysql-test/suite/rpl/t/rpl_binlog_index.test
      mysql-test/suite/rpl/t/rpl_innodb_bug28430.test
      mysql-test/suite/rpl/t/rpl_parallel_innodb.test
      mysql-test/suite/rpl/t/rpl_parallel_start_stop.test
      mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock.test
      mysql-test/suite/rpl/t/rpl_row_img_blobs.test
      mysql-test/suite/rpl/t/rpl_row_img_eng_full.test
      mysql-test/suite/rpl/t/rpl_row_img_idx_full.test
      mysql-test/suite/rpl/t/rpl_stop_slave.test
      mysql-test/suite/rpl/t/rpl_typeconv.test
      mysql-test/t/disabled.def
      mysql-test/t/index_merge_innodb.test
      mysql-test/t/innodb_explain_json_non_select_all.test
      mysql-test/t/innodb_explain_non_select_all.test
      mysql-test/t/innodb_explain_non_select_none.test
      mysql-test/t/mysql_client_test_embedded.test
      sql/handler.cc
      sql/item.cc
      sql/item.h
      sql/item_create.cc
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/item_subselect.cc
      sql/item_xmlfunc.cc
      sql/log_event.cc
      sql/sp_head.cc
      sql/sql_base.cc
      sql/sql_class.cc
      sql/sql_optimizer.cc
      sql/sql_parse.cc
      sql/sql_show.cc
      sql/sql_string.h
      sql/sql_table.cc
      sql/sql_yacc.yy
      storage/innobase/buf/buf0flu.cc
=== modified file 'sql/sql_partition.cc'
--- a/sql/sql_partition.cc	revid:kevin.lewis@stripped
+++ b/sql/sql_partition.cc	revid:kevin.lewis@stripped
@@ -2105,18 +2105,19 @@ static int add_keyword_path(File fptr, c
 #endif
 
   /*
-  If the partition file name with its "#P#" or "#SP#" identifiers
+  If the partition file name with its "#P#" identifier
   is found after the last slash, truncate that filename.
   */
-  char* pound= strrchr(temp_path, '#');
   char* last_slash= strrchr(temp_path, '/');
-  if (pound && last_slash && pound > last_slash + 2 &&
-      (pound[-1] == 'P' || pound[-1] == 'p') &&
-      (pound[-2] == '#' ||
-      (pound[-3] == '#' && (pound[-2] == 'S' || pound[-2] == 's'))))
+  if (last_slash)
   {
-    last_slash[0] = '\0';	/* truncate the file name */
+    char* pound= strchr(last_slash, '#');
+    if (pound && (pound[1] == 'P' || pound[1] == 'p') && pound[2] == '#')
+    {
+      last_slash[0] = '\0';	/* truncate the file name */
+    }
   }
+
   if (should_use_quotes)
     err+= add_quoted_string(fptr, temp_path);
   else

No bundle (reason: useless for push emails).