• unknown's avatar
    Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 2ee2747b
    unknown authored
    into  mysql.com:/home/alik/MySQL/devel/5.0-wl2818
    
    
    mysql-test/r/mysqldump.result:
      Auto merged
    mysql-test/t/mysqldump.test:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/share/errmsg.txt:
      Auto merged
    sql/sp.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_trigger.cc:
      Auto merged
    mysql-test/r/rpl_sp.result:
      Manual merge.
    2ee2747b
item_func.cc 119 KB