[Pkg-mysql-commits] [mariadb-5.5] 02/03: Merge tag 'upstream/5.5.47' into ubuntu-14.04
Otto Kekäläinen
ottok-guest at moszumanska.debian.org
Thu Dec 10 10:18:40 UTC 2015
This is an automated email from the git hooks/post-receive script.
ottok-guest pushed a commit to branch ubuntu-14.04
in repository mariadb-5.5.
commit 2137df410195127934a80b4c752ce48a44df31c0
Merge: d315cf0 a295acf
Author: Otto Kekäläinen <otto at seravo.fi>
Date: Thu Dec 10 10:23:54 2015 +0200
Merge tag 'upstream/5.5.47' into ubuntu-14.04
Upstream version 5.5.47
Conflicts:
debian/mariadb-server-5.5.mysql-server.logrotate
Docs/INFO_SRC | 10 +-
VERSION | 2 +-
client/mysql_plugin.c | 10 +-
client/mysql_upgrade.c | 94 +-
client/mysqlcheck.c | 2 +-
client/mysqldump.c | 20 +-
client/mysqlshow.c | 39 +-
cmake/cpack_rpm.cmake | 2 +-
debian/mariadb-server-5.5.mysql-server.logrotate | 2 +-
libmysql/conf_to_src.c | 4 +-
mysql-test/include/default_mysqld.cnf | 3 +
mysql-test/r/create.result | 6 +
mysql-test/r/ctype_filename.result | 3 +
mysql-test/r/ctype_utf8.result | 27 +
mysql-test/r/events_1.result | 2 +-
mysql-test/r/fulltext.result | 2 +-
mysql-test/r/mysql_plugin.result | 2 +-
mysql-test/r/mysql_upgrade.result | 9 +-
mysql-test/r/mysqldump.result | 26 +
mysql-test/r/ps.result | 21 +
mysql-test/r/ps_change_master.result | 22 +
mysql-test/r/range.result | 13 +
mysql-test/r/range_mrr_icp.result | 13 +
mysql-test/r/show_row_order-9226.result | 80 +
mysql-test/r/udf_notembedded.result | 6 +
mysql-test/r/update.result | 59 +
mysql-test/r/view.result | 33 +
.../suite/federated/error_on_close-8313.result | 27 +
.../suite/federated/error_on_close-8313.test | 38 +
mysql-test/suite/innodb/r/dropdb.result | 9 +
mysql-test/suite/innodb/r/innodb-autoinc.result | 16 +-
.../suite/innodb/r/innodb-fk-warnings.result | 24 +-
mysql-test/suite/innodb/r/innodb-fk.result | 6 +-
.../r/innodb_information_schema_tables.result | 2 +
mysql-test/suite/innodb/t/dropdb.test | 12 +
mysql-test/suite/innodb/t/innodb-autoinc.test | 3 +-
.../innodb/t/innodb_information_schema_tables.opt | 29 +
.../innodb/t/innodb_information_schema_tables.test | 64 +
.../suite/plugins/r/feedback_plugin_install.result | 3 +-
.../suite/plugins/r/feedback_plugin_load.result | 3 +-
.../suite/plugins/r/feedback_plugin_send.result | 10 +-
.../suite/plugins/t/feedback_plugin_install.test | 4 +-
.../suite/plugins/t/feedback_plugin_load.test | 3 +-
.../suite/plugins/t/feedback_plugin_send.test | 21 +-
mysql-test/t/create.test | 8 +
mysql-test/t/ctype_filename.test | 3 +
mysql-test/t/ctype_utf8.test | 16 +
mysql-test/t/events_1.test | 2 +-
mysql-test/t/mysql_upgrade.test | 9 +-
mysql-test/t/mysqldump.test | 10 +
mysql-test/t/ps.test | 22 +
mysql-test/t/ps_change_master.test | 45 +
mysql-test/t/range.test | 12 +
mysql-test/t/show_row_order-9226.test | 73 +
mysql-test/t/udf_notembedded.test | 14 +
mysql-test/t/update.test | 73 +
mysql-test/t/view.test | 35 +
mysys/my_getopt.c | 2 +-
packaging/rpm-oel/mysql.spec.in | 7 +-
plugin/daemon_example/daemon_example.cc | 12 +-
plugin/feedback/feedback.cc | 33 +
plugin/feedback/feedback.h | 4 +
plugin/feedback/sender_thread.cc | 8 +-
regex/main.c | 17 +-
scripts/mysqld_multi.sh | 20 +-
sql-common/client.c | 55 +-
sql/field.h | 20 +-
sql/item.cc | 23 +-
sql/item_cmpfunc.cc | 2 +-
sql/item_cmpfunc.h | 4 +-
sql/item_func.cc | 10 +-
sql/item_subselect.cc | 28 +-
sql/log.cc | 2 +
sql/mysqld.cc | 14 +-
sql/mysqld.h | 4 +-
sql/sql_acl.cc | 4 +
sql/sql_insert.cc | 16 +-
sql/sql_lex.cc | 23 +
sql/sql_lex.h | 2 +
sql/sql_prepare.cc | 16 +-
sql/sql_reload.cc | 5 +-
sql/sql_select.cc | 38 +-
sql/sql_show.cc | 5 +-
sql/sql_table.cc | 5 +-
sql/sql_udf.cc | 4 +-
sql/sql_udf.h | 3 +
sql/sql_update.cc | 32 +-
sql/sql_update.h | 1 +
sql/sql_view.cc | 5 +
sql/sql_yacc.cc | 2437 ++++++++++----------
sql/sql_yacc.yy | 9 +
sql/table.cc | 17 +-
storage/federated/ha_federated.cc | 31 +-
storage/federatedx/ha_federatedx.cc | 71 +-
storage/innobase/dict/dict0crea.c | 2 +-
storage/innobase/dict/dict0dict.c | 122 +-
storage/innobase/handler/ha_innodb.cc | 32 +-
storage/innobase/log/log0recv.c | 8 +-
storage/myisam/mi_create.c | 6 +-
storage/tokudb/hatoku_cmp.cc | 186 --
storage/tokudb/hatoku_cmp.h | 19 -
storage/tokudb/hatoku_hton.h | 8 -
storage/xtradb/CMakeLists.txt | 17 +-
storage/xtradb/btr/btr0cur.c | 47 +-
storage/xtradb/dict/dict0crea.c | 2 +-
storage/xtradb/dict/dict0dict.c | 122 +-
storage/xtradb/handler/ha_innodb.cc | 178 +-
storage/xtradb/handler/i_s.cc | 15 +-
storage/xtradb/include/ha_prototypes.h | 10 +
storage/xtradb/include/os0file.h | 11 +-
storage/xtradb/include/os0sync.h | 115 +-
storage/xtradb/include/sync0sync.h | 9 +-
storage/xtradb/include/sync0sync.ic | 9 +-
storage/xtradb/include/univ.i | 4 +-
storage/xtradb/lock/lock0lock.c | 10 +-
storage/xtradb/log/log0online.c | 16 +-
storage/xtradb/log/log0recv.c | 2 +-
storage/xtradb/os/os0file.c | 17 +-
storage/xtradb/row/row0ins.c | 5 +-
storage/xtradb/trx/trx0trx.c | 6 +
strings/ctype-utf8.c | 2 +-
support-files/mysql.server.sh | 2 +-
unittest/mysys/CMakeLists.txt | 1 +
unittest/mysys/my_getopt-t.c | 71 +
124 files changed, 3188 insertions(+), 1963 deletions(-)
diff --cc debian/mariadb-server-5.5.mysql-server.logrotate
index 05c2d68,789ad35..5421bfa
--- a/debian/mariadb-server-5.5.mysql-server.logrotate
+++ b/debian/mariadb-server-5.5.mysql-server.logrotate
@@@ -2,7 -2,7 +2,7 @@@
# flush-logs'd only once.
# Else the binary logs would automatically increase by n times every day.
# - The error log is obsolete, messages go to syslog now.
- /var/log/mysql.log /var/log/mysql/mysql.log /var/log/mysql/mysql-slow.log /var/log/mysql/error.log {
-/var/log/mysql.log /var/log/mysql/mysql.log /var/log/mysql/mariadb-slow.log {
++/var/log/mysql.log /var/log/mysql/mysql.log /var/log/mysql/mysql-slow.log /var/log/mysql/mariadb-slow.log /var/log/mysql/error.log {
daily
rotate 7
missingok
--
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git
More information about the Pkg-mysql-commits
mailing list