unknown ebd53ca2e6 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 ... into labbari.dsl.inet.fi:/home/my/bk/mysql-maria.prod BitKeeper/etc/ignore: auto-union client/mysqldump.c: Auto merged include/my_base.h: Auto merged include/my_sys.h: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/lib/mtr_report.pl: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_7ndb.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/view.test: Auto merged sql/Makefile.am: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/mysql_priv.h: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/share/errmsg.txt: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged storage/myisam/mi_key.c: Auto merged storage/myisam/mi_open.c: Merged with main 5.1.		2007-07-07 18:33:43 +03:00
..
.cvsignore
acinclude.m4
client_settings.h	Embedded Server doesn't build on Windows.	2007-06-15 14:32:16 -04:00
CMakeLists.txt	Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1	2007-06-27 17:49:12 +03:00
conf_to_src.c
dll.c
errmsg.c	Added more descriptive error message of why statement was automaticly dropped	2007-04-13 01:56:22 +03:00
get_password.c
libmysql.c	Merge labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marvel	2007-07-06 13:49:15 +03:00
libmysql.def	Fixed compiler warnings	2007-02-23 13:13:55 +02:00
libmysql.ver.in
Makefile.am	Bug#22508 BUILD/compile-dist fails due to problem with readline/libedit	2007-03-27 23:56:48 +02:00
Makefile.shared	Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1	2007-06-27 17:49:12 +03:00
manager.c	WL#3817: Simplify string / memory area types and make things more consistent (first part)	2007-05-10 12:59:39 +03:00
mytest.c