• unknown's avatar
    Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · afc91556
    unknown authored
    into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
    
    
    libmysql/libmysql.c:
      Auto merged
    libmysqld/lib_sql.cc:
      Auto merged
    mysql-test/r/udf.result:
      Auto merged
    mysql-test/t/udf.test:
      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/sql_lex.cc:
      Auto merged
    sql/sql_lex.h:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    afc91556
item_func.cc 125 KB