• unknown's avatar
    Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 5a0b54fd
    unknown authored
    into  shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
    
    
    BitKeeper/etc/ignore:
      auto-union
    client/mysql.cc:
      Auto merged
    mysql-test/r/func_misc.result:
      Auto merged
    sql/item_func.h:
      Auto merged
    mysql-test/r/mysql.result:
      Manual merge
    mysql-test/t/mysql.test:
      Manual merge
    5a0b54fd
mysql.cc 107 KB