mariadb/config/ac-macros
unknown 26b6dc4291 Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge


client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
config/ac-macros/ha_ndbcluster.m4:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/rpl_timezone.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/rpl_injector.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/t/mysqldump.test:
  Manual merge
sql/log_event.cc:
  manual merge
2006-12-08 23:41:29 +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 traditional grep does not have -q option 2006-06-21 20:27:52 -07:00
ha_ndbcluster.m4 Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 2006-12-08 23:41:29 +01:00
large_file.m4 Fixing problem with case insitive file systems. 2004-12-04 11:00:33 -08:00
misc.m4 compile-time definition of intptr type 2006-08-01 14:02:19 +02:00
plugins.m4 libmysqld/Makefile.am fixed 2006-10-19 16:39:24 +05:00
readline.m4 Fix for Bug#3982 2005-09-14 21:47:24 -07:00
ssl.m4 Many files: 2006-11-29 18:36:51 +01:00
zlib.m4 Merge neptunus.(none):/home/msvensson/mysql/bug18818/my50-bug18818 2006-05-12 11:32:43 +02:00