mariadb/config/ac-macros
unknown 8c7852ba3c Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/mysql-5.1-new


include/my_base.h:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/examples/ha_example.cc:
  Auto merged
storage/myisam/ft_parser.c:
  Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
libmysqld/Makefile.am:
  Manual merge.
sql/ha_ndbcluster.cc:
  Manual merge.
sql/mysqld.cc:
  Manual merge.
2005-11-28 20:14:12 +01: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 Include libyassl.la and libtaocrypt.la in libmysqlclient.la 2005-11-28 16:28:00 +01:00
zlib.m4 Check for zlib with a zzlibCompileFlags() function in config/ac-macros/zlib.m4. 2005-11-21 16:05:40 +01:00