unknown ceadd59644 Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 ... into janus.mylan:/usr/home/serg/Abk/mysql-maria1 Makefile.am: Auto merged client/mysqldump.c: Auto merged configure.in: Auto merged libmysqld/Makefile.am: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/mysqldump.test: Auto merged mysys/mf_tempfile.c: Auto merged sql/Makefile.am: Auto merged sql/ha_partition.cc: Auto merged sql/ha_partition.h: Auto merged sql/handler.cc: Auto merged sql/lock.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_plugin.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged BUILD/compile-dist: SCCS merged		2007-10-08 21:01:44 +02:00
..
.cvsignore	Import changeset	2000-07-31 21:29:14 +02:00
acinclude.m4	Import changeset	2000-07-31 21:29:14 +02:00
client_settings.h	Embedded Server doesn't build on Windows.	2007-06-15 14:32:16 -04:00
CMakeLists.txt	CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:	2007-08-06 23:16:01 +02:00
conf_to_src.c	manually merged	2004-08-18 19:57:55 +02:00
dll.c	Final patch to remove the last of the OS2 support.	2006-04-15 18:17:32 -07:00
errmsg.c	Added more descriptive error message of why statement was automaticly dropped	2007-04-13 01:56:22 +03:00
get_password.c	This is an implementation of two WL items:	2006-05-18 18:57:50 +04:00
libmysql.c	Merge trift2.:/MySQL/M50/push-5.0	2007-09-05 09:35:02 +02:00
libmysql.def	Fixed compiler warnings	2007-02-23 13:13:55 +02:00
libmysql.ver.in	BUG#3074: Unversioned symbols in shared library	2006-01-17 18:51:08 +04:00
Makefile.am	Makefile.am:	2007-09-26 18:47:55 +02:00
Makefile.shared	Merge hynda.mysql.fi:/home/my/mysql-5.1-main	2007-09-27 17:05:07 +03:00
manager.c	Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris	2007-08-13 16:11:25 +03:00
mytest.c	make dist changes for Cmake build	2006-09-01 10:32:12 +02:00