• unknown's avatar
    Manual merge · 5d91dc25
    unknown authored
    BitKeeper/etc/ignore:
      auto-union
    mysql-test/r/events_logs_tests.result:
      Auto merged
    mysql-test/t/events_logs_tests.test:
      Auto merged
    mysql-test/t/events_stress.test:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/set_var.cc:
      Auto merged
    sql/sql_class.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_db.cc:
      Auto merged
    sql/sql_lex.h:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/share/errmsg.txt:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    sql/event_data_objects.cc:
      manual merge
    sql/events.cc:
      manual merge
    5d91dc25
set_var.cc 127 KB