• unknown's avatar
    Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · fc7ef4be
    unknown authored
    into  vajra.(none):/opt/local/work/mysql-5.1-runtime
    
    
    mysql-test/include/mix1.inc:
      Auto merged
    mysql-test/r/innodb_mysql.result:
      Auto merged
    mysql-test/r/ps_1general.result:
      Auto merged
    mysql-test/t/disabled.def:
      Auto merged
    mysql-test/t/ps_1general.test:
      Auto merged
    sql/ha_ndbcluster.cc:
      Auto merged
    sql/ha_ndbcluster_binlog.cc:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/set_var.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_lex.cc:
      Auto merged
    sql/sql_lex.h:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_partition.cc:
      Auto merged
    sql/sql_prepare.cc:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    sql/table.h:
      Auto merged
    sql/sql_insert.cc:
      SCCS merged
    fc7ef4be
item_func.cc 135 KB