• unknown's avatar
    Conflicts resolving · 52176532
    unknown authored
    BitKeeper/etc/logging_ok:
      auto-union
    client/mysql.cc:
      Auto merged
    client/mysqltest.c:
      Auto merged
    include/my_global.h:
      Auto merged
    include/mysql.h:
      Auto merged
    include/mysql_com.h:
      Auto merged
    sql/field.cc:
      Auto merged
    sql/field.h:
      Auto merged
    sql/ha_innodb.cc:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/item.h:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/item_strfunc.cc:
      Auto merged
    sql/log.cc:
      Auto merged
    sql/log_event.cc:
      Auto merged
    sql/log_event.h:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/net_serv.cc:
      Auto merged
    sql/protocol.cc:
      Auto merged
    sql/set_var.cc:
      Auto merged
    sql/set_var.h:
      Auto merged
    sql/slave.cc:
      Auto merged
    sql/sql_acl.cc:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_cache.cc:
      Auto merged
    sql/sql_class.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_db.cc:
      Auto merged
    sql/sql_handler.cc:
      Auto merged
    sql/sql_load.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_prepare.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    sql/sql_show.cc:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    libmysqld/libmysqld.c:
      conflicts resolving
    52176532
sql_parse.cc 115 KB