unknown 33a2716a85 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 ... into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new Makefile.am: Auto merged client/mysqltest.c: Auto merged configure.in: Auto merged extra/Makefile.am: Auto merged include/Makefile.am: Auto merged include/my_global.h: Auto merged libmysqld/examples/Makefile.am: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/r/ndb_alter_table.result: Auto merged mysql-test/t/ndb_alter_table.test: Auto merged scripts/Makefile.am: Auto merged sql/Makefile.am: Auto merged sql/field.cc: Auto merged sql/ha_federated.cc: Auto merged sql/ha_federated.h: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisammrg.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.cc: Auto merged sql/item.cc: Auto merged sql/item_subselect.cc: Auto merged sql/key.cc: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/slave.cc: Auto merged sql/sp.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_load.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_table.cc: Auto merged sql/structs.h: Auto merged sql/table.cc: Auto merged sql/tztime.cc: Auto merged storage/myisam/myisamchk.c: Auto merged storage/myisam/myisampack.c: Auto merged storage/ndb/docs/Makefile.am: Auto merged support-files/mysql.spec.sh: Auto merged libmysqld/Makefile.am: Merged from 5.0 to 5.1. sql/ha_berkeley.cc: Merged from 5.0 to 5.1. sql/lex.h: Merged from 5.0 to 5.1. sql/set_var.cc: Merged from 5.0 to 5.1. sql/share/errmsg.txt: Merged from 5.0 to 5.1. sql/sql_lex.h: Merged from 5.0 to 5.1. sql/sql_show.cc: Merged from 5.0 to 5.1. sql/sql_yacc.yy: Merged from 5.0 to 5.1.		2005-11-23 14:57:00 +02:00
..
alloca.m4	Fixing problem with case insitive file systems.	2004-12-04 11:00:33 -08:00
character_sets.m4	Many files:	2005-09-12 19:35:50 +05:00
check_cpu.m4	Fixing problem with case insitive file systems.	2004-12-04 11:00:33 -08:00
compiler_flag.m4	Fixing problem with case insitive file systems.	2004-12-04 11:00:33 -08:00
ha_archive.m4	Fixing problem with case insitive file systems.	2004-12-04 11:00:33 -08:00
ha_berkeley.m4	Make storage engines "pluggable", handlerton work	2005-11-07 16:25:06 +01:00
ha_blackhole.m4	Adding rules for building blackhole, also updating test case.	2005-03-25 13:43:42 -08:00
ha_example.m4	Fixing problem with case insitive file systems.	2004-12-04 11:00:33 -08:00
ha_federated.m4	Fixed a typo in the configure --help menu.	2005-09-06 23:32:00 -07:00
ha_innodb.m4	All changes for change to all storage engines being under storage directory.	2005-04-26 19:04:36 -07:00
ha_ndbcluster.m4	Make storage engines "pluggable", handlerton work	2005-11-07 16:25:06 +01:00
ha_partition.m4	Make storage engines "pluggable", handlerton work	2005-11-07 16:25:06 +01:00
ha_tina.m4	Fixing problem with case insitive file systems.	2004-12-04 11:00:33 -08:00
large_file.m4	Fixing problem with case insitive file systems.	2004-12-04 11:00:33 -08:00
misc.m4	Better AR guessing.	2005-06-22 16:29:21 +05:00
openssl.m4	Post-merge fix of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497).	2005-04-26 12:16:12 +02:00
readline.m4	Fix for Bug#3982	2005-09-14 21:47:24 -07:00
storage.m4	Make storage engines "pluggable", handlerton work	2005-11-07 16:25:06 +01:00
yassl.m4	Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985	2005-10-28 11:45:30 +02:00
zlib.m4	Check for zlib with a zzlibCompileFlags() function in config/ac-macros/zlib.m4.	2005-11-21 16:05:40 +01:00