• unknown's avatar
    Merge mysql.com:/home/jimw/my/mysql-5.0-12792 · 8d52b8a6
    unknown authored
    into  mysql.com:/home/jimw/my/mysql-5.0-clean
    
    
    sql/item_func.cc:
      Auto merged
    sql/set_var.cc:
      Auto merged
    mysql-test/r/variables.result:
      Resolve conflict
    mysql-test/t/variables.test:
      Resolve conflict
    8d52b8a6
item_func.cc 120 KB