mariadb/BitKeeper/triggers
unknown 2dbeedd504 Merge mysql.com:/usr/home/pem/bug14834/mysql-5.0
into  mysql.com:/usr/home/pem/mysql-5.1-new


BitKeeper/triggers/post-commit:
  Merge.
configure.in:
  Manual merge.
mysql-test/r/sp.result:
  Merge.
mysql-test/r/view.result:
  Merge.
sql/share/errmsg.txt:
  Manual merge.
sql/sp_head.cc:
  Merge.
sql/sql_parse.cc:
  Merge.
sql/sql_table.cc:
  Merge.
sql/sql_yacc.yy:
  Merge.
2005-12-07 15:17:18 +01:00
..
post-commit Merge mysql.com:/usr/home/pem/bug14834/mysql-5.0 2005-12-07 15:17:18 +01:00
pre-commit don't allow to commit as mysqldev 2005-03-18 09:00:46 +01:00
pre-delta BitKeeper/triggers/pre-delta 2004-12-22 22:59:19 +01:00