• unknown's avatar
    Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-runtime · 1dc0efc6
    unknown authored
    into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
    
    
    mysql-test/t/sp-error.test:
      Auto merged
    mysql-test/t/udf.test:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/sp.cc:
      Auto merged
    sql/sp_head.h:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_udf.cc:
      Auto merged
    mysql-test/r/sp-error.result:
      failed auto merge
    mysql-test/r/sp.result:
      failed auto merge
    mysql-test/r/udf.result:
      failed auto merge
    mysql-test/t/sp.test:
      failed auto merge
    sql/sp_head.cc:
      failed auto merge
    sql/sql_yacc.yy:
      failed auto merge
    1dc0efc6
sql_parse.cc 214 KB