• unknown's avatar
    Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51 · 61430c77
    unknown authored
    into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
    
    
    BUILD/check-cpu:
      Auto merged
    configure.in:
      Auto merged
    include/my_global.h:
      Auto merged
    mysql-test/mysql-test-run.pl:
      Auto merged
    mysql-test/r/sp.result:
      Auto merged
    mysql-test/r/type_enum.result:
      Auto merged
    mysql-test/r/udf.result:
      Auto merged
    mysql-test/r/view.result:
      Auto merged
    mysql-test/t/mysqladmin.test:
      Auto merged
    mysql-test/t/sp.test:
      Auto merged
    mysql-test/t/type_enum.test:
      Auto merged
    mysql-test/t/view.test:
      Auto merged
    mysys/my_read.c:
      Auto merged
    scripts/make_binary_distribution.sh:
      Auto merged
    server-tools/instance-manager/Makefile.am:
      Auto merged
    sql/event_queue.cc:
      Auto merged
    sql/field.h:
      Auto merged
    sql/item_sum.h:
      Auto merged
    sql/log_event.cc:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/share/errmsg.txt:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_show.cc:
      Auto merged
    sql/table.cc:
      Auto merged
    storage/federated/ha_federated.cc:
      Auto merged
    server-tools/instance-manager/instance.cc:
      Use remote (global 5.1 version)
    sql/unireg.cc:
      Use remote (5.1 global version)
    mysql-test/t/trigger.test:
      Manual merge
    server-tools/instance-manager/guardian.cc:
      Manual merge
    61430c77
view.result 89.8 KB