List:Commits« Previous MessageNext Message »
From:gluh Date:January 11 2006 11:04am
Subject:bk commit into 5.1 tree (gluh:1.2028)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of gluh. When gluh 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
  1.2028 06/01/11 15:04:18 gluh@stripped +4 -0
    Additional fix for wl#2506

  sql/sql_show.cc
    1.299 06/01/11 15:04:12 gluh@stripped +6 -1
     Compilation with disabled partitioning is fixed

  mysql-test/t/ctype_ucs.test
    1.37 06/01/11 15:04:12 gluh@stripped +2 -0
      fixed test case

  mysql-test/r/binlog_stm_ctype_cp932.result
    1.8 06/01/11 15:04:12 gluh@stripped +1 -0
      fixed test result

  mysql-test/extra/binlog_tests/ctype_cp932.test
    1.10 06/01/11 15:04:12 gluh@stripped +1 -0
      fixed test case

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gluh
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/gluh/MySQL/Merge/5.1-new

--- 1.298/sql/sql_show.cc	Tue Jan 10 19:42:20 2006
+++ 1.299/sql/sql_show.cc	Wed Jan 11 15:04:12 2006
@@ -3582,18 +3582,22 @@ static int get_schema_partitions_record(
   TIME time;
   TABLE *show_table= tables->table;
   handler *file= show_table->file;
+#ifdef WITH_PARTITION_STORAGE_ENGINE
   partition_info *part_info= show_table->part_info;
+#endif
   DBUG_ENTER("get_schema_partitions_record");
 
   if (res)
   {
+#ifdef WITH_PARTITION_STORAGE_ENGINE
     if (part_info)
       push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
                    thd->net.last_errno, thd->net.last_error);
+#endif
     thd->clear_error();
     DBUG_RETURN(0);
   }
-
+#ifdef WITH_PARTITION_STORAGE_ENGINE
   if (part_info)
   {
     partition_element *part_elem;
@@ -3750,6 +3754,7 @@ static int get_schema_partitions_record(
     DBUG_RETURN(0);
   }
   else
+#endif
   {
     store_schema_partitions_record(thd, table, 0, file, 0);
     if(schema_table_store_record(thd, table))

--- 1.36/mysql-test/t/ctype_ucs.test	Wed Dec 28 18:20:17 2005
+++ 1.37/mysql-test/t/ctype_ucs.test	Wed Jan 11 15:04:12 2006
@@ -424,7 +424,9 @@ drop table t1;
 #
 # Bug #14583 Bug on query using a LIKE on indexed field with ucs2_bin collation
 #
+--disable_warnings
 create table t1(f1 varchar(5) CHARACTER SET ucs2 COLLATE ucs2_bin NOT NULL) engine=InnoDB;
+--enable_warnings
 insert into t1 values('a');
 create index t1f1 on t1(f1);
 select f1 from t1 where f1 like 'a%';

--- 1.7/mysql-test/r/binlog_stm_ctype_cp932.result	Thu Dec 22 08:10:53 2005
+++ 1.8/mysql-test/r/binlog_stm_ctype_cp932.result	Wed Jan 11 15:04:12 2006
@@ -11366,3 +11366,4 @@ col1
 a
 a
 a
+drop table t1;

--- 1.9/mysql-test/extra/binlog_tests/ctype_cp932.test	Thu Dec 22 08:10:56 2005
+++ 1.10/mysql-test/extra/binlog_tests/ctype_cp932.test	Wed Jan 11 15:04:12 2006
@@ -434,3 +434,4 @@ insert into t1 values ('ab');
 select * from t1;
 insert into t1 values ('abc');
 select * from t1;
+drop table t1;
Thread
bk commit into 5.1 tree (gluh:1.2028)gluh11 Jan