• unknown's avatar
    Merge mysql.com:/home/jimw/my/mysql-5.0-clean · c3c5f8d6
    unknown authored
    into  mysql.com:/home/jimw/my/mysql-5.1-clean
    
    
    BitKeeper/etc/ignore:
      auto-union
    BitKeeper/deleted/.del-mysql_upgrade.dsp:
      Delete: VC++Files/client/mysql_upgrade.dsp
    BitKeeper/deleted/.del-mysql_upgrade_ia64.dsp:
      Delete: VC++Files/client/mysql_upgrade_ia64.dsp
    BitKeeper/deleted/.del-mysql_upgrade.c:
      Delete: client/mysql_upgrade.c
    VC++Files/mysql.dsw:
      Auto merged
    VC++Files/mysql.sln:
      Auto merged
    VC++Files/mysql_ia64.dsw:
      Auto merged
    client/mysql.cc:
      Auto merged
    config/ac-macros/zlib.m4:
      Auto merged
    configure.in:
      Auto merged
    extra/yassl/Makefile.am:
      Auto merged
    extra/yassl/taocrypt/Makefile.am:
      Auto merged
    include/my_global.h:
      Auto merged
    include/mysql.h:
      Auto merged
    libmysql/libmysql.def:
      Auto merged
    libmysqld/libmysqld.def:
      Auto merged
    mysql-test/r/grant2.result:
      Auto merged
    mysql-test/r/sp-security.result:
      Auto merged
    mysql-test/r/subselect.result:
      Auto merged
    mysql-test/r/trigger.result:
      Auto merged
    mysql-test/r/udf.result:
      Auto merged
    mysql-test/t/grant2.test:
      Auto merged
    mysql-test/t/rpl_openssl.test:
      Auto merged
    mysql-test/t/rpl_rotate_logs.test:
      Auto merged
    mysql-test/t/sp-security.test:
      Auto merged
    mysql-test/t/trigger.test:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/item.h:
      Auto merged
    sql/item_subselect.cc:
      Auto merged
    sql-common/client.c:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    client/Makefile.am:
      Resolve conflict
    config/ac-macros/yassl.m4:
      Resolve conflict
    mysql-test/include/have_udf.inc:
      Resolve conflict
    mysql-test/lib/mtr_process.pl:
      Resolve conflict
    mysql-test/mysql-test-run.pl:
      Resolve conflict
    mysql-test/r/have_udf.require:
      Resolve conflict
    mysql-test/r/rpl_openssl.result:
      Resolve conflict
    mysql-test/t/disabled.def:
      Resolve conflict
    mysql-test/t/information_schema.test:
      Resolve conflict
    server-tools/instance-manager/instance_options.cc:
      Resolve conflict
    sql/mysql_priv.h:
      Resolve conflict
    sql/set_var.cc:
      Resolve conflict
    support-files/mysql.spec.sh:
      Resolve conflict
    c3c5f8d6
rpl_openssl.result 2.29 KB