• unknown's avatar
    Merge kaamos.(none):/data/src/mysql-5.1 · e38a0de2
    unknown authored
    into  kaamos.(none):/data/src/opt/mysql-5.1-opt
    
    
    client/mysql.cc:
      Auto merged
    client/mysqldump.c:
      Auto merged
    configure.in:
      Auto merged
    include/my_global.h:
      Auto merged
    libmysql/libmysql.c:
      Auto merged
    libmysqld/lib_sql.cc:
      Auto merged
    mysql-test/include/mix1.inc:
      Auto merged
    mysql-test/r/create.result:
      Auto merged
    mysql-test/r/func_str.result:
      Auto merged
    mysql-test/r/innodb.result:
      Auto merged
    mysql-test/r/innodb_mysql.result:
      Auto merged
    mysql-test/r/select.result:
      Auto merged
    mysql-test/r/subselect.result:
      Auto merged
    mysql-test/t/create.test:
      Auto merged
    mysql-test/t/disabled.def:
      Auto merged
    sql/filesort.cc:
      Auto merged
    sql/handler.cc:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/item.h:
      Auto merged
    sql/item_cmpfunc.cc:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/item_func.h:
      Auto merged
    sql/item_sum.cc:
      Auto merged
    sql/log.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/set_var.cc:...
    e38a0de2
configure.in 86.7 KB