• unknown's avatar
    Merge mysql.com:/extern/mysql/5.0/bug17476/mysql-5.0 · d2115f04
    unknown authored
    into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
    
    
    mysql-test/mysql-test-run.pl:
      Auto merged
    mysql-test/mysql-test-run.sh:
      Auto merged
    mysql-test/r/grant2.result:
      Auto merged
    mysql-test/r/sp.result:
      Auto merged
    mysql-test/t/grant2.test:
      Auto merged
    mysql-test/t/skip_grants.test:
      Auto merged
    mysql-test/t/sp.test:
      Auto merged
    scripts/make_binary_distribution.sh:
      Auto merged
    sql/field_conv.cc:
      Auto merged
    sql/item.h:
      Auto merged
    sql/item_timefunc.cc:
      Auto merged
    sql/sql_udf.cc:
      Auto merged
    VC++Files/mysql.sln:
      Manual merge (use local).
    configure.in:
      Manual merge.
    sql/table.cc:
      Manual merge.
    d2115f04
grant2.result 16.1 KB