Commit 721e4128 authored by unknown's avatar unknown
Browse files

after merge fixes 

Removed 


mysql-test/t/disabled.def:
  Disabled rp_ndb_dd_advance, becasue of random failures
mysql-test/t/rpl_ndb_dd_advance.test:
  Added big_test, as this test takes +600 seconds
plugin/daemon_example/daemon_example.c:
  Removed compiler warnings
sql/item_cmpfunc.cc:
  after merge fixes
sql/item_subselect.cc:
  after merge fixes
storage/ndb/src/common/util/ConfigValues.cpp:
  Removed declarations to nonexisting functions
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  Removed not used function
storage/ndb/src/kernel/blocks/lgman.cpp:
  Removed not used variables
storage/ndb/src/kernel/blocks/pgman.cpp:
  Removed not used variables
storage/ndb/src/kernel/blocks/restore.cpp:
  Removed not used variables
storage/ndb/src/kernel/blocks/tsman.cpp:
  Removed not used variables
storage/ndb/src/kernel/vm/DynArr256.cpp:
  Removed not used variables
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
  Removed not used variables
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Removed not used variables
storage/ndb/src/ndbapi/NdbIndexStat.cpp:
  Removed not used variable
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Removed not used variable
storage/ndb/tools/desc.cpp:
  Removed not used variable
support-files/compiler_warnings.supp:
  Added suppress message for hard to remove warning
parent 533497d8

mysql-test/t/disabled.def

+1 −1
Original line number Diff line number Diff line
@@ -39,4 +39,4 @@ synchronization : Bug#24529 Test 'synchronization' fails on Mac pushb 
flush2                   : Bug#24805 Pushbuild can't handle test with --disable-log-bin

mysql_upgrade            : Bug#25074 mysql_upgrade gives inconsisten results

plugin                   : Bug#25659 memory leak via "plugins" test

rpl_ndb_dd_advance	 : Bug#25913 rpl_ndb_dd_advance fails randomly

mysql-test/t/rpl_ndb_dd_advance.test

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
--source include/have_binlog_format_row.inc

--source include/ndb_default_cluster.inc

--source include/not_embedded.inc

--source include/big_test.inc

#--source include/have_ndb_extra.inc

--source include/master-slave.inc

plugin/daemon_example/daemon_example.c

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
    1                    failure (cannot happen)

*/



static int daemon_example_plugin_init(void *p)

static int daemon_example_plugin_init(void *p __attribute__ ((unused)))

{

  return(0);

}
@@ -59,7 +59,7 @@ static int daemon_example_plugin_init(void *p) 


*/



static int daemon_example_plugin_deinit(void *p)

static int daemon_example_plugin_deinit(void *p __attribute__ ((unused)))

{

  return(0);

}

sql/item_cmpfunc.cc

+5 −3
Original line number Diff line number Diff line
@@ -896,7 +896,7 @@ longlong Item_in_optimizer::val_int() 
          */

          for (i= 0; i < ncols; i++)

          {

            if (cache->el(i)->null_value)

            if (cache->element_index(i)->null_value)

              item_subs->set_cond_guard_var(i, FALSE);

          }
@@ -1020,8 +1020,10 @@ longlong Item_func_strcmp::val_int() 


void Item_func_interval::fix_length_and_dec()

{

  use_decimal_comparison= (row->element_index(0)->result_type() == DECIMAL_RESULT) ||

    (row->element_index(0)->result_type() == INT_RESULT);

  use_decimal_comparison= ((row->element_index(0)->result_type() ==

                            DECIMAL_RESULT) ||

                           (row->element_index(0)->result_type() ==

                            INT_RESULT));

  if (row->cols() > 8)

  {

    bool consts=1;

sql/item_subselect.cc

+3 −4
Original line number Diff line number Diff line
@@ -1259,7 +1259,7 @@ Item_in_subselect::row_value_transformer(JOIN *join) 
                                      (char *)"<list ref>")

                            );

      Item *col_item= new Item_cond_or(item_eq, item_isnull);

      if (!abort_on_null && left_expr->el(i)->maybe_null)

      if (!abort_on_null && left_expr->element_index(i)->maybe_null)

      {

        if (!(col_item= new Item_func_trig_cond(col_item, get_cond_guard(i))))

          DBUG_RETURN(RES_ERROR);
@@ -1273,7 +1273,7 @@ Item_in_subselect::row_value_transformer(JOIN *join) 
                                                ref_pointer_array + i,

                                                (char *)"<no matter>",

                                                (char *)"<list ref>"));

      if (!abort_on_null && left_expr->el(i)->maybe_null)

      if (!abort_on_null && left_expr->element_index(i)->maybe_null)

      {

        if (!(item_nnull_test= 

              new Item_func_trig_cond(item_nnull_test, get_cond_guard(i))))
@@ -1350,7 +1350,7 @@ Item_in_subselect::row_value_transformer(JOIN *join) 
          TODO: why we create the above for cases where the right part

                cant be NULL?

        */

        if (left_expr->el(i)->maybe_null)

        if (left_expr->element_index(i)->maybe_null)

        {

          if (!(item= new Item_func_trig_cond(item, get_cond_guard(i))))

            DBUG_RETURN(RES_ERROR);
@@ -1801,7 +1801,6 @@ int subselect_single_select_engine::exec() 
  if (!executed)

  {

    item->reset_value_registration();

    bool have_changed_access= FALSE;

    JOIN_TAB *changed_tabs[MAX_TABLES];

    JOIN_TAB **last_changed_tab= changed_tabs;

    if (item->have_guarded_conds())