mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +01:00
b3018e8613
Conflicts: - client/mysql.cc - client/mysqldump.c - configure.in - mysql-test/r/csv.result - mysql-test/r/func_time.result - mysql-test/r/show_check.result - mysql-test/r/sp-error.result - mysql-test/r/sp.result - mysql-test/r/sp_trans.result - mysql-test/r/type_blob.result - mysql-test/r/type_timestamp.result - mysql-test/r/warnings.result - mysql-test/suite/rpl/r/rpl_sp.result - sql/mysql_priv.h - sql/mysqld.cc - sql/sp.cc - sql/sql_base.cc - sql/sql_table.cc - sql/sql_trigger.cc - sql/sql_view.cc - sql/table.h - sql/share/errmsg.txt - mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.result |
||
---|---|---|
.. | ||
dtrace | ||
MacOSX | ||
RHEL4-SElinux | ||
SCO | ||
binary-configure.sh | ||
build-tags | ||
CMakeLists.txt | ||
compiler_warnings.supp | ||
config.huge.ini.sh | ||
config.medium.ini.sh | ||
config.small.ini.sh | ||
magic | ||
Makefile.am | ||
my-huge.cnf.sh | ||
my-innodb-heavy-4G.cnf.sh | ||
my-large.cnf.sh | ||
my-medium.cnf.sh | ||
my-small.cnf.sh | ||
mysql-log-rotate.sh | ||
mysql-multi.server.sh | ||
MySQL-shared-compat.spec.sh | ||
mysql.m4 | ||
mysql.server-sys5.sh | ||
mysql.server.sh | ||
mysql.spec.sh | ||
mysqld_multi.server.sh | ||
ndb-config-2-node.ini.sh |