List:Commits« Previous MessageNext Message »
From:ahristov Date:January 11 2006 11:51am
Subject:bk commit into 5.1 tree (andrey:1.2031)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of andrey. When andrey 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.2031 06/01/11 12:51:17 andrey@lmy004. +1 -0
  Merge ahristov@stripped:/home/bk/mysql-5.1-new
  into lmy004.:/work/mysql-5.1-tt-copy-works

  sql/sql_show.cc
    1.288 06/01/11 12:51:14 andrey@lmy004. +0 -0
    Auto merged

# 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:	andrey
# Host:	lmy004.
# Root:	/work/mysql-5.1-tt-copy-works/RESYNC

--- 1.287/sql/sql_show.cc	2006-01-10 19:50:19 +01:00
+++ 1.288/sql/sql_show.cc	2006-01-11 12:51:14 +01:00
@@ -3583,18 +3583,22 @@
   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;
@@ -3751,6 +3755,7 @@
     DBUG_RETURN(0);
   }
   else
+#endif
   {
     store_schema_partitions_record(thd, table, 0, file, 0);
     if(schema_table_store_record(thd, table))
Thread
bk commit into 5.1 tree (andrey:1.2031)ahristov11 Jan