mariadb

mirror of https://github.com/MariaDB/server.git synced 2025-08-23 03:54:27 +03:00

Files

unknown a8e5dcb449 Resolve merge colflict

mysql-test/r/create.result:
  Auto merged
mysql-test/r/isam.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
include/mysqld_error.h:
  Resolve merge colflict by changing the warning codes

2003-05-21 00:12:09 -07:00

des_key_file

Added FLUSH DES_KEY_FILE.

2001-12-13 15:53:18 +02:00

master-bin.000001

Changed binlog name padding from binlog.001 to binlog.000001

2002-10-29 15:11:13 -07:00

rpl_loaddata2.dat

changed processing of LOAD DATA in mysqlbinlog

2003-05-20 17:03:18 -04:00

rpl_loaddata.dat

Guard against compiling without -fno-exceptions