mariadb

mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00

Files

unknown 5bb9169118 Manual merge 5.0->5.1

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/innobase/include/lock0lock.h:
  Auto merged
storage/innobase/include/srv0srv.h:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/innobase/srv/srv0srv.c:
  Auto merged
storage/ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
sql/slave.cc:
  Due to refactoring, this needs to be checked before the call.
sql/sql_acl.cc:
  Resolving conflicts due to bug fix and filter refactoring

2005-05-06 15:04:07 +02:00

alloca.m4

Fixing problem with case insitive file systems.

2004-12-04 11:00:33 -08:00

character_sets.m4

Manual transfer of the change in "configure.in" (4.1) to "config/ac-macros/character_sets.m4".

2005-04-11 11:24:30 +02: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.