mariadb/extra
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
..
yassl Merge mysql.com:/usr/home/pem/bug14834/mysql-5.0 2005-12-07 15:17:18 +01:00
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
charset2html.c dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all features 2004-11-04 22:29:00 +01:00
comp_err.c Fail when two messages exist for the same language for an error in the 2005-10-05 10:06:31 -07:00
innochecksum.c Make it buildable with -ansi flag on some platforms. 2005-11-24 18:42:39 +03:00
Makefile.am Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 2005-11-23 14:57:00 +02:00
my_print_defaults.c Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 2005-08-26 15:56:52 +03:00
mysql_waitpid.c Added global my_getopt_error_reporter function pointer which is 2004-08-31 21:27:58 +05:00
perror.c Merge 2005-10-07 01:12:46 +02:00
replace.c fix for bug#5650 ('replace' does not follow symlinks) 2005-07-26 07:41:32 +02:00
resolve_stack_dump.c Several fixes for Netware. 2005-08-24 22:03:34 +03:00
resolveip.c Merge with 4.0 2004-09-01 04:12:09 +03:00