mariadb

mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

Files

unknown 058cad7848 Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1


BitKeeper/etc/ignore:
  auto-union
client/mysqldump.c:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/type_timestamp.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
mysql-test/t/type_timestamp.test:
  Auto merged
mysys/my_lib.c:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/func_time.result:
  manual merge
mysql-test/r/mysqldump.result:
  manual merge
mysql-test/t/func_time.test:
  manual merge
mysql-test/t/mysqldump.test:
  manual merge
sql/log.cc:
  manual merge
sql/sp_head.cc:
  manual merge
sql/sql_table.cc:
  manual merge

2006-07-03 11:35:58 -04:00

.cvsignore

…

client_priv.h

Removed double enum value.

2006-05-16 01:12:12 +03:00

CMakeLists.txt

performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1.

2006-05-11 11:29:08 -05:00

completion_hash.cc

few harmless warnings from automated code-checking tools fixed

2005-01-08 21:25:31 +01:00