• unknown's avatar
    Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main · 61f4440c
    unknown authored
    into  mysql.com:/home/stewart/Documents/MySQL/5.1/main
    
    
    mysql-test/r/ndb_condition_pushdown.result:
      Auto merged
    mysql-test/r/type_newdecimal.result:
      Auto merged
    mysql-test/r/view_grant.result:
      Auto merged
    mysql-test/t/ndb_condition_pushdown.test:
      Auto merged
    mysql-test/t/type_newdecimal.test:
      Auto merged
    mysql-test/t/view_grant.test:
      Auto merged
    sql/ha_ndbcluster.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    mysql-test/valgrind.supp:
      Manual merge
    61f4440c
valgrind.supp 6.74 KB