• unknown's avatar
    Merge mysql.com:/opt/local/work/tmp_merge2 · fb5677b8
    unknown authored
    into  mysql.com:/opt/local/work/mysql-5.1-merge
    
    
    mysql-test/r/ps.result:
      Auto merged
    mysql-test/r/sp-error.result:
      Auto merged
    mysql-test/r/sp-prelocking.result:
      Auto merged
    mysql-test/r/sp.result:
      Auto merged
    mysql-test/r/trigger.result:
      Auto merged
    mysql-test/t/ps.test:
      Auto merged
    mysql-test/t/sp-error.test:
      Auto merged
    mysql-test/t/sp.test:
      Auto merged
    mysql-test/t/trigger.test:
      Auto merged
    sql/field.h:
      Auto merged
    sql/sp.cc:
      Auto merged
    sql/sql_insert.cc:
      Auto merged
    sql/sql_load.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    sql/sql_view.cc:
      Auto merged
    mysql-test/t/sp-prelocking.test:
      Manual merge.
    fb5677b8
sp-prelocking.test 4.7 KB