• unknown's avatar
    Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · d4cf96c1
    unknown authored
    into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
    
    
    BitKeeper/etc/collapsed:
      auto-union
    BitKeeper/etc/ignore:
      auto-union
    client/mysql.cc:
      Auto merged
    include/m_ctype.h:
      Auto merged
    include/my_global.h:
      Auto merged
    mysql-test/lib/mtr_process.pl:
      Auto merged
    mysql-test/mysql-test-run.pl:
      Auto merged
    mysql-test/r/ctype_utf8.result:
      Auto merged
    mysql-test/r/mysql.result:
      Auto merged
    mysql-test/r/ps.result:
      Auto merged
    mysql-test/r/strict.result:
      Auto merged
    mysql-test/r/trigger.result:
      Auto merged
    mysql-test/r/warnings.result:
      Auto merged
    mysql-test/t/ctype_utf8.test:
      Auto merged
    mysql-test/t/mysql.test:
      Auto merged
    mysql-test/t/ps.test:
      Auto merged
    mysql-test/t/trigger.test:
      Auto merged
    sql/field.cc:
      Auto merged
    sql/filesort.cc:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/item_func.h:
      Auto merged
    sql/log.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/opt_range.cc:
      Auto merged
    sql/opt_range.h:
      Auto merged
    sql/set_var.cc:
      Auto merged
    sql/sql_acl.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_insert.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    sql/sql_show.cc:
      Auto merged
    sql/sql_update.cc:
      Auto merged
    configure.in:
      Use 5.1 version of configure.in
    d4cf96c1
m_ctype.h 20.7 KB