Merge sita.local:/Users/tsmith/m/bk/51

into  sita.local:/Users/tsmith/m/bk/maint/51

This merge requires a post-merge fix to remove rpl_udf from
suite/rpl/t/disabled.def.

1 files changed, 2 insertions, 4 deletions

diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index e74f09362e3..593e0f74596 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -2259,11 +2259,9 @@ bool uses_only_table_name_fields(Item *item, TABLE_LIST *table)
   if (item->type() == Item::FUNC_ITEM)
   {
     Item_func *item_func= (Item_func*)item;
-    Item **child;
-    Item **item_end= (item_func->arguments()) + item_func->argument_count();
-    for (child= item_func->arguments(); child != item_end; child++)
+    for (uint i=0; i<item_func->argument_count(); i++)
     {
-      if (!uses_only_table_name_fields(*child, table))
+      if (!uses_only_table_name_fields(item_func->arguments()[i], table))
         return 0;
     }
   }