mariadb/sql/share
unknown 47fe447536 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/bug14233/mysql-5.0


mysql-test/r/sp-error.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_trigger.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged
2005-12-06 13:34:18 +01:00
..
charsets Merge mysql.com:/home/gluh/MySQL/Merge/4.1 2005-07-21 17:55:16 +05:00
.cvsignore
errmsg.txt Merge mysql.com:/usr/local/bk/mysql-5.0 2005-12-06 13:34:18 +01:00
Makefile.am Additional "make distcheck" changes specific to 5.0 2005-11-09 11:56:04 +02:00