unknown 38ed1be3ec Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 ... into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51 client/mysqldump.c: Auto merged include/m_string.h: Auto merged include/mysql_com.h: Auto merged include/violite.h: Auto merged libmysql/libmysql.c: Auto merged mysql-test/include/mix1.inc: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/innodb_mysql.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/t/mysqltest.test: Auto merged mysql-test/t/ps.test: Auto merged mysys/my_init.c: Auto merged server-tools/instance-manager/mysql_connection.cc: Auto merged sql/field.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/net_serv.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_connect.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql-common/client.c: Auto merged sql/sql_yacc.yy: Auto merged strings/ctype-mb.c: Auto merged strings/ctype-ucs2.c: Auto merged strings/strtod.c: Auto merged vio/vio_priv.h: Auto merged vio/viosocket.c: Auto merged client/mysqltest.c: SCCS merged include/my_global.h: SCCS merged sql/field.h: SCCS merged sql/sql_table.cc: Manual merge strings/ctype-bin.c: Manual merge		2007-06-05 17:51:30 +02:00
..
.cvsignore
acinclude.m4
client_settings.h	WL#3817: Simplify string / memory area types and make things more consistent (first part)	2007-05-10 12:59:39 +03:00
CMakeLists.txt	Bug#24732 Executables do not include Vista manifests	2007-04-23 16:23:32 -04: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 quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51	2007-06-05 17:51:30 +02: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	Bug#22508 BUILD/compile-dist fails due to problem with readline/libedit	2007-03-27 23:56:48 +02: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