• unknown's avatar
    Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge · 5a3c3045
    unknown authored
    into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
    
    
    client/mysqltest.c:
      Auto merged
    mysql-test/r/alter_table.result:
      Auto merged
    mysql-test/r/create.result:
      Auto merged
    mysql-test/r/ctype_ucs.result:
      Auto merged
    mysql-test/r/mysqltest.result:
      Auto merged
    mysql-test/r/ps.result:
      Auto merged
    mysql-test/r/sp-error.result:
      Auto merged
    mysql-test/r/sp.result:
      Auto merged
    mysql-test/r/type_decimal.result:
      Auto merged
    mysql-test/r/variables.result:
      Auto merged
    mysql-test/r/view_grant.result:
      Auto merged
    mysql-test/t/alter_table.test:
      Auto merged
    mysql-test/t/create.test:
      Auto merged
    mysql-test/t/ctype_ucs.test:
      Auto merged
    mysql-test/t/mysqltest.test:
      Auto merged
    mysql-test/t/ps.test:
      Auto merged
    mysql-test/t/sp.test:
      Auto merged
    sql/ha_berkeley.cc:
      Auto merged
    sql/sp_head.cc:
      Auto merged
    sql/sp_head.h:
      Auto merged
    sql/sql_handler.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    sql/share/errmsg.txt:
      Auto merged
    mysql-test/mysql-test-run.pl:
      SCCS merged
    sql/sql_yacc.yy:
      Manual merge: resolve the conflict with moved sp_if rule
    5a3c3045
sp.test 109 KB