-
unknown authored
into mysql.com:/home/dlenev/src/mysql-5.0-bg11555-2 mysql-test/r/sp-error.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/view.test: Auto merged sql/sp_head.cc: Auto merged sql/sql_trigger.h: Auto merged sql/sp.cc: Manual merge. sql/sp.h: Manual merge. sql/sql_base.cc: Manual merge.
8b3081fb