• unknown's avatar
    After merge fixes · db676261
    unknown authored
    Added push_back(void *, MEM_ROOT *) to make some list-handling code easier that needs to be allocated in a different mem-root
    (Before one had to change thd->mem_root ; push_back(); restore mem_root.
    
    
    mysql-test/t/range.test:
      After merge fixRecR
    sql/item_func.cc:
      After merge fix
    sql/item_sum.cc:
      After merge fix
    sql/opt_range.cc:
      After merge fix
    sql/parse_file.cc:
      After merge fix
    sql/sp.cc:
      After merge fix
    sql/sp_head.cc:
      After merge fix
    sql/sp_head.h:
      After merge fix
    sql/sql_base.cc:
      After merge fix
    sql/sql_class.h:
      After merge fix
    sql/sql_list.h:
      Added push_back(void *, MEM_ROOT *) to make some list-handling code easier that needs to be allocated in a different mem-root
      (Before one had to change thd->mem_root ; push_back(); restore mem_root.
    sql/sql_prepare.cc:
      After merge fix
    sql/sql_select.cc:
      After merge fix
    sql/sql_table.cc:
      After merge fix
      Fixed problem with OPTIMIZE on INNODB tables
    sql/sql_trigger.cc:
      After merge fix
    sql/sql_union.cc:
      After merge fix
    sql/sql_view.cc:
      After merge fix
    sql/sql_yacc.yy:
      After merge fix
    sql/table.cc:
      After merge fix
    db676261
sql_union.cc 16.9 KB