From: Mattias Jonsson
Date: February 7 2012 2:59pm
Subject: bzr push into mysql-trunk branch (mattias.jonsson:3832 to 3833) WL#4443
List-Archive: http://lists.mysql.com/commits/142784
Message-Id: <201202071459.q17Exo40029042@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3833 Mattias Jonsson	2012-02-07
      WL#4443 - did not compile with gcc, only VC++ due to enum issues.

    modified:
      sql/item.cc
      sql/item.h
      sql/partition_info.h
 3832 Mattias Jonsson	2012-02-07 [merge]
      merge of WL#4443 into more recent mysql-trunk

    added:
      mysql-test/r/partition_locking.result
      mysql-test/t/partition_locking.test
    modified:
      include/my_bitmap.h
      mysql-test/include/commit.inc
      mysql-test/r/commit_1innodb.result
      mysql-test/r/explain.result
      mysql-test/r/grant_cache_no_prot.result
      mysql-test/r/handler_myisam.result
      mysql-test/r/innodb_explain_non_select_none.result
      mysql-test/r/myisam_explain_non_select_none.result
      mysql-test/r/partition_binlog.result
      mysql-test/r/partition_datatype.result
      mysql-test/r/partition_error.result
      mysql-test/r/partition_explicit_prune.result
      mysql-test/r/partition_pruning.result
      mysql-test/r/partition_truncate.result
      mysql-test/r/type_date.result
      mysql-test/suite/binlog/r/binlog_unsafe.result
      mysql-test/suite/opt_trace/r/bugs_no_prot_none.result
      mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result
      mysql-test/suite/parts/inc/partition-dml-1-9.inc
      mysql-test/suite/parts/r/partition-dml-1-9-innodb.result
      mysql-test/suite/parts/r/partition-dml-1-9-myisam.result
      mysql-test/suite/perfschema/r/part_table_io.result
      mysql-test/suite/perfschema/r/stage_mdl_function.result
      mysql-test/t/explain.test
      mysql-test/t/handler_myisam.test
      mysql-test/t/partition_binlog.test
      mysql-test/t/partition_explicit_prune.test
      mysql-test/t/partition_pruning.test
      mysql-test/t/partition_truncate.test
      mysql-test/t/type_date.test
      mysys/my_bitmap.c
      sql/field_conv.cc
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.cc
      sql/handler.h
      sql/item.cc
      sql/item.h
      sql/item_cmpfunc.cc
      sql/item_row.cc
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/log_event.cc
      sql/opt_explain.cc
      sql/opt_range.cc
      sql/opt_range.h
      sql/partition_info.cc
      sql/partition_info.h
      sql/share/errmsg-utf8.txt
      sql/sp_head.cc
      sql/sql_acl.cc
      sql/sql_base.cc
      sql/sql_base.h
      sql/sql_cache.h
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_delete.cc
      sql/sql_executor.cc
      sql/sql_insert.cc
      sql/sql_insert.h
      sql/sql_join_buffer.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_load.cc
      sql/sql_optimizer.cc
      sql/sql_parse.cc
      sql/sql_partition.cc
      sql/sql_partition_admin.cc
      sql/sql_prepare.cc
      sql/sql_resolver.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_show.cc
      sql/sql_union.cc
      sql/sql_update.cc
      sql/sql_view.cc
      sql/table.cc
      sql/table.h
      unittest/gunit/my_bitmap-t.cc
=== modified file 'sql/item.cc'
--- a/sql/item.cc	revid:mattias.jonsson@stripped
+++ b/sql/item.cc	revid:mattias.jonsson@stripped
@@ -9334,7 +9334,7 @@ void view_error_processor(THD *thd, void
   prepare phase.
 */
 
-inline bool can_evaluate_item_now(THD *thd, Item *item)
+bool can_evaluate_item_now(THD *thd, Item *item)
 {
   if (item->const_item() &&
       ((thd->lex->is_query_tables_locked() ||

=== modified file 'sql/item.h'
--- a/sql/item.h	revid:mattias.jonsson@stripped
+++ b/sql/item.h	revid:mattias.jonsson@stripped
@@ -4137,7 +4137,7 @@ void mark_select_range_as_dependent(THD 
                                     st_select_lex *current_sel,
                                     Field *found_field, Item *found_item,
                                     Item_ident *resolved_item);
-extern inline bool can_evaluate_item_now(THD *thd, Item *item);
+bool can_evaluate_item_now(THD *thd, Item *item);
 
 extern Cached_item *new_Cached_item(THD *thd, Item *item,
                                     bool use_result_field);

=== modified file 'sql/partition_info.h'
--- a/sql/partition_info.h	revid:mattias.jonsson@stripped
+++ b/sql/partition_info.h	revid:mattias.jonsson@stripped
@@ -17,6 +17,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #include "partition_element.h"
+#include "sql_class.h"                        // enum_duplicates
 
 class partition_info;
 class COPY_INFO;
@@ -322,7 +323,7 @@ public:
                           bool copy_default_values,
                           MY_BITMAP *used_partitions);
   enum enum_can_prune {PRUNE_NO=0, PRUNE_DEFAULTS, PRUNE_YES};
-  enum_can_prune can_prune_insert(enum enum_duplicates duplic,
+  enum_can_prune can_prune_insert(enum_duplicates duplic,
                                   COPY_INFO &update,
                                   List<Item> &update_fields,
                                   List<Item> &fields,

No bundle (reason: useless for push emails).