mariadb/sql/share
unknown 9aa1504062 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-mysqlproc


mysql-test/r/sp-error.result:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/share/errmsg.txt:
  Manual merge.
sql/sp.cc:
  Manual merge.
2005-07-13 15:08:13 +04:00
..
charsets Merge mysql.com:/home/ram/work/mysql-4.1 2005-05-06 20:11:01 +05:00
.cvsignore
errmsg.txt Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-07-13 15:08:13 +04:00
Makefile.am - manual merge 2005-04-21 08:30:59 +02:00