mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-30 12:15:32 +02:00
Code Issues Projects Releases Packages Wiki Activity
mariadb/support-files
History
unknown 73c9909750 Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/r/drop.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
ndb/include/ndb_global.h.in:
  Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/time.cc:
  Auto merged
innobase/row/row0upd.c:
  Trivial merge
mysql-test/t/func_concat.test:
  Keep local code
mysql-test/t/multi_update.test:
  auto merge
sql/ha_ndbcluster.cc:
  manual merge
sql/item_timefunc.cc:
  manual merge
sql/mysql_priv.h:
  manual merge
sql/sql_class.h:
  manual merge
sql/sql_delete.cc:
  manual merge
sql/sql_insert.cc:
  manual merge
sql/sql_lex.cc:
  manual merge
sql/sql_lex.h:
  manual merge
sql/sql_load.cc:
  manual merge
sql/sql_parse.cc:
  manual merge
sql/sql_table.cc:
  manual merge
sql/sql_update.cc:
  manual merge
2005-01-03 23:04:52 +02:00
..
debian Many files: 2005-01-01 20:54:45 +01:00
MacOSX - fixed file name of the MySQL startup item script to MySQLCOM, 2004-07-14 09:10:49 +02:00
SCO - added support-files/MacOSX to include files specific for building 2003-02-03 20:39:48 +01:00
.cvsignore
binary-configure.sh Fixes for fill_help_tables.sql 2003-03-21 18:53:55 +02:00
build-tags Here comes a nasty patch, although I am not ready to push it yet. I will 2002-01-19 19:16:52 -07:00
magic sql/log.cc 2000-10-05 17:58:16 -06:00
Makefile.am - typo fix - make sure to include an existing file in the source 2004-08-26 19:46:11 +02:00
my-huge.cnf.sh Merge with 4.0.21 2004-06-18 04:38:58 +03:00
my-innodb-heavy-4G.cnf.sh my-innodb-heavy-4G.cnf.sh: 2004-12-17 22:25:35 -05:00
my-large.cnf.sh Merge with 4.0.21 2004-06-18 04:38:58 +03:00
my-medium.cnf.sh Merge with 4.0.21 2004-06-18 04:38:58 +03:00
my-small.cnf.sh Merge with 4.0.21 2004-06-18 04:38:58 +03:00
mysql-log-rotate.sh
mysql-max.spec.sh Changed safe_mysqld -> mysqld_safe 2001-06-28 10:49:16 +03:00
mysql-multi.server.sh Changed safe_mysqld -> mysqld_safe 2001-06-28 10:49:16 +03:00
MySQL-shared-compat.spec.sh - Fixed two small version number issues in MySQL-shared-compat.spec 2004-08-12 21:40:34 +02:00
mysql.server-sys5.sh Small bug fixes 2000-09-07 04:55:17 +03:00
mysql.server.sh Merge with 4.0.18 2004-02-11 00:06:46 +01:00
mysql.spec.sh - added the "Archive", "CSV" and "Example" storage engines to the Linux 2004-12-31 10:38:51 +01:00
mysqld_multi.server.sh Added possibility to use [GNR...] optional argument for 2004-10-09 13:57:27 +03:00