• unknown's avatar
    merge with public tree · ad5e39bf
    unknown authored
    
    BitKeeper/etc/ignore:
      auto-union
    BitKeeper/etc/logging_ok:
      auto-union
    client/mysql.cc:
      Auto merged
    configure.in:
      Auto merged
    include/config-win.h:
      Auto merged
    include/mysql.h:
      Auto merged
    include/mysql_version.h.in:
      Auto merged
    libmysqld/lib_sql.cc:
      Auto merged
    mysql-test/r/alter_table.result:
      Auto merged
    mysql-test/r/create.result:
      Auto merged
    mysql-test/r/ctype_collate.result:
      Auto merged
    mysql-test/r/innodb.result:
      Auto merged
    mysql-test/r/show_check.result:
      Auto merged
    mysql-test/r/subselect.result:
      Auto merged
    mysql-test/r/type_blob.result:
      Auto merged
    mysql-test/t/subselect.test:
      Auto merged
    mysys/default.c:
      Auto merged
    sql/Makefile.am:
      Auto merged
    sql/field.cc:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/item.h:
      Auto merged
    sql/item_cmpfunc.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/mysqld.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_base.cc:
      Auto merged
    sql/sql_insert.cc:
      Auto merged
    sql/sql_show.cc:
      Auto merged
    sql/sql_string.cc:
      Auto merged
    sql/sql_string.h:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    ad5e39bf
item.cc 40.7 KB