[Pkg-mysql-commits] [mariadb-5.5] 02/05: Merge tag 'upstream/5.5.44' into ubuntu-14.10
Otto Kekäläinen
ottok-guest at moszumanska.debian.org
Sat Jun 13 20:51:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
ottok-guest pushed a commit to branch ubuntu-14.10
in repository mariadb-5.5.
commit de84b90db3bc54ec87381a381f2af88159b11053
Merge: 8bd8d1d 3f8c7c9
Author: Otto Kekäläinen <otto at seravo.fi>
Date: Sat Jun 13 22:19:29 2015 +0300
Merge tag 'upstream/5.5.44' into ubuntu-14.10
Upstream version 5.5.44
Conflicts:
debian/po/it.po
.gitattributes | 23 +
.gitignore | 1 +
Docs/INFO_SRC | 10 +-
VERSION | 2 +-
client/mysqlcheck.c | 40 +-
cmake/do_abi_check.cmake | 2 +-
cmake/make_dist.cmake.in | 10 +-
cmake/mysql_add_executable.cmake | 112 +-
cmake/versioninfo.rc.in | 76 +-
cmd-line-utils/libedit/el_terminal.h | 4 +-
cmd-line-utils/libedit/emacs.c | 8 +-
cmd-line-utils/libedit/terminal.c | 15 +-
cmd-line-utils/libedit/vi.c | 8 +-
config.h.cmake | 24 +-
debian/dist/Debian/control | 7 +-
debian/dist/Ubuntu/control | 7 +-
debian/po/it.po | 9 +-
debian/po/sv.po | 12 +-
include/mysql.h.pp | 7 -
include/mysql/client_plugin.h.pp | 2 -
include/mysql/plugin_audit.h.pp | 12 -
include/mysql/plugin_auth.h.pp | 13 -
include/mysql/plugin_ftparser.h.pp | 11 -
include/mysql/psi/psi_abi_v1.h.pp | 1 -
include/mysql/psi/psi_abi_v2.h.pp | 1 -
libmysql/CMakeLists.txt | 2 +-
mysql-test/r/ctype_utf8.result | 15 +
mysql-test/r/dyncol.result | 6 +
mysql-test/r/empty_server_name-8224.result | 1 +
mysql-test/r/gis.result | 2 +-
mysql-test/r/group_by.result | 2 +-
mysql-test/r/information_schema2.result | 12 +
mysql-test/r/myisam.result | 11 +
mysql-test/r/mysql_tzinfo_to_sql_symlink.result | 9 +
mysql-test/r/mysql_upgrade_view.result | 35 +
mysql-test/r/mysqlcheck.result | 23 +
mysql-test/r/partition_innodb.result | 23 +-
mysql-test/r/range_innodb.result | 39 +
mysql-test/r/repair.result | 7 +
mysql-test/r/ssl_7937,nossl.result | 15 +
mysql-test/r/ssl_7937.result | 16 +
mysql-test/r/truncate-stale-6500.result | 33 +
mysql-test/r/type_decimal.result | 21 +
mysql-test/r/update_innodb.result | 31 +
mysql-test/r/view.result | 18 +
mysql-test/std_data/old_decimal/t1dec102.MYD | 1 +
mysql-test/std_data/old_decimal/t1dec102.MYI | Bin 0 -> 1024 bytes
mysql-test/std_data/old_decimal/t1dec102.frm | Bin 0 -> 8554 bytes
.../suite/binlog/r/binlog_mysqlbinlog_row.result | 65 +
.../suite/binlog/t/binlog_mysqlbinlog_row.test | 13 +-
.../binlog/t/binlog_row_mysqlbinlog_options.test | 4 +-
mysql-test/suite/innodb/r/xa_recovery.result | 17 +
mysql-test/suite/innodb/t/foreign-keys.test | 5 -
mysql-test/suite/innodb/t/innodb-autoinc.test | 5 -
mysql-test/suite/innodb/t/insert_debug.test | 5 -
mysql-test/suite/innodb/t/sp_temp_table.test | 5 -
mysql-test/suite/innodb/t/strict_mode.test | 5 -
mysql-test/suite/innodb/t/xa_recovery.test | 47 +
mysql-test/suite/maria/optimize.result | 11 +
mysql-test/suite/maria/optimize.test | 10 +
.../suite/optimizer_unfixed_bugs/t/bug42991.test | 496 +-
.../parts/r/partition_debug_sync_innodb.result | 11 +-
.../suite/parts/t/partition_debug_sync_innodb.test | 5 +-
mysql-test/suite/plugins/r/server_audit.result | 9 +
...udit.result => thread_pool_server_audit.result} | 9 +
mysql-test/suite/plugins/t/server_audit.test | 7 +
.../suite/plugins/t/thread_pool_server_audit.opt | 2 +
...er_audit.test => thread_pool_server_audit.test} | 9 +-
mysql-test/suite/rpl/r/rpl_old_decimal.result | 9 +
.../suite/rpl/r/rpl_tmp_table_and_DDL.result | 5 +
mysql-test/suite/rpl/t/rpl_old_decimal.test | 25 +
mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test | 10 +
mysql-test/suite/sphinx/my.cnf | 3 +-
.../sys_vars/t/innodb_buffer_pool_evict_basic.test | 5 -
.../t/innodb_thread_sleep_delay_basic.test | 5 -
mysql-test/suite/tokudb.bugs/r/db805.result | 18 +
mysql-test/suite/tokudb.bugs/r/db806.result | 9 +
mysql-test/suite/tokudb.bugs/r/db811.result | 14 +
mysql-test/suite/tokudb.bugs/r/db811s.result | 14 +
mysql-test/suite/tokudb.bugs/r/db823.result | 11 +
mysql-test/suite/tokudb.bugs/t/db805.test | 17 +
mysql-test/suite/tokudb.bugs/t/db806.test | 13 +
mysql-test/suite/tokudb.bugs/t/db811.test | 22 +
mysql-test/suite/tokudb.bugs/t/db811s.test | 22 +
mysql-test/suite/tokudb.bugs/t/db823.test | 16 +
mysql-test/t/aborted_clients.test | 56 +-
mysql-test/t/auth_rpl.test | 132 +-
mysql-test/t/ctype_utf8.test | 16 +
mysql-test/t/dyncol.test | 6 +
mysql-test/t/empty_server_name-8224.test | 9 +
mysql-test/t/func_gconcat.test | 6 +-
mysql-test/t/group_by.test | 2 +-
mysql-test/t/information_schema2.test | 13 +
mysql-test/t/lowercase_table4.test | 214 +-
mysql-test/t/myisam.test | 10 +
mysql-test/t/mysql_tzinfo_to_sql_symlink.test | 11 +
mysql-test/t/mysql_upgrade_view.test | 29 +
mysql-test/t/mysqlcheck.test | 45 +-
mysql-test/t/partition_innodb.test | 28 +-
mysql-test/t/range_innodb.test | 47 +
mysql-test/t/repair.test | 9 +
mysql-test/t/ssl_7937.combinations | 5 +
mysql-test/t/ssl_7937.test | 35 +
mysql-test/t/truncate-stale-6500.test | 32 +
mysql-test/t/type_decimal.test | 24 +
mysql-test/t/update_innodb.test | 39 +
mysql-test/t/view.test | 13 +
mysys/my_gethwaddr.c | 2 +-
mysys/my_init.c | 2 +-
packaging/WiX/CPackWixConfig.cmake | 238 +-
packaging/WiX/create_msi.cmake.in | 796 +-
packaging/WiX/custom_ui.wxs | 230 +-
packaging/WiX/extra.wxs.in | 162 +-
packaging/WiX/mysql_server.wxs.in | 392 +-
packaging/rpm-oel/mysql.spec.in | 4 +-
plugin/server_audit/server_audit.c | 14 +-
sql-bench/limits/access_odbc.cfg | 894 +-
sql-common/client.c | 23 +-
sql/field.cc | 10 +-
sql/field.h | 1 +
sql/field_conv.cc | 5 +-
sql/filesort.cc | 11 +-
sql/ha_ndbcluster_binlog.cc | 6 +-
sql/item.cc | 35 +
sql/item.h | 9 +-
sql/item_strfunc.cc | 10 +
sql/item_sum.cc | 18 +-
sql/log.h | 8 +-
sql/log_event.cc | 6 +
sql/message.h | 154 +-
sql/message.rc | 4 +-
sql/rpl_utility.cc | 2 +-
sql/slave.cc | 4 +-
sql/sql_admin.cc | 2 +-
sql/sql_base.cc | 3 +-
sql/sql_connect.cc | 13 +-
sql/sql_lex.cc | 15 +-
sql/sql_lex.h | 3 +-
sql/sql_partition_admin.cc | 11 +-
sql/sql_plugin.cc | 38 +-
sql/sql_select.cc | 18 +-
sql/sql_servers.cc | 3 +-
sql/sql_show.cc | 22 +-
sql/sql_table.cc | 2 +-
sql/sql_view.cc | 2 +-
sql/sql_yacc.cc | 18301 ++++++++++---------
sql/sql_yacc.yy | 62 +-
sql/table.h | 2 +
sql/tztime.cc | 3 +-
sql/winservice.h | 80 +-
storage/federatedx/CMakeLists.txt | 8 +-
storage/federatedx/README.windows | 46 +-
storage/innobase/CMakeLists.txt | 2 +
storage/innobase/buf/buf0buf.c | 5 +-
storage/innobase/dict/dict0dict.c | 2 +-
storage/innobase/handler/ha_innodb.cc | 40 +-
storage/innobase/handler/i_s.cc | 6 +-
storage/innobase/include/os0sync.h | 2 +-
storage/innobase/srv/srv0start.c | 4 +-
storage/innobase/sync/sync0arr.c | 7 +-
storage/maria/ma_check.c | 6 +-
storage/maria/ma_test_force_start.pl | 2 +-
storage/myisam/mi_check.c | 6 +-
storage/myisam/rt_split.c | 9 +-
storage/tokudb/CMakeLists.txt | 2 +-
storage/tokudb/ft-index/buildheader/make_tdb.cc | 3 +-
storage/tokudb/ft-index/ft/ft-verify.cc | 20 +-
storage/tokudb/ft-index/ft/logger/recover.cc | 62 +-
storage/tokudb/ft-index/ft/txn/txn.cc | 5 +
storage/tokudb/ft-index/ft/txn/txn.h | 3 +
.../src/tests/test_iterate_live_transactions.cc | 4 +-
storage/tokudb/ft-index/src/tests/test_stress0.cc | 4 +-
storage/tokudb/ft-index/src/ydb.cc | 21 +-
storage/tokudb/ft-index/src/ydb_txn.cc | 6 +
storage/tokudb/ft-index/tools/CMakeLists.txt | 9 +-
.../tools/{tdb_logprint.cc => tokuft_logprint.cc} | 2 -
storage/tokudb/ft-index/tools/tokuftdump.cc | 6 +-
storage/tokudb/ft-index/util/scoped_malloc.cc | 25 +-
storage/tokudb/ft-index/util/scoped_malloc.h | 4 +
storage/tokudb/ha_tokudb.cc | 67 +-
storage/tokudb/ha_tokudb_admin.cc | 18 +-
storage/tokudb/ha_tokudb_alter_56.cc | 15 +-
storage/tokudb/hatoku_defines.h | 1 +
storage/tokudb/hatoku_hton.cc | 18 +-
.../tokudb/r/i_s_tokudb_lock_waits_released.result | 10 +-
.../tokudb/r/i_s_tokudb_lock_waits_timeout.result | 6 +-
.../mysql-test/tokudb/r/i_s_tokudb_trx.result | 10 +-
.../tokudb/t/i_s_tokudb_lock_waits_released.test | 10 +-
.../tokudb/t/i_s_tokudb_lock_waits_timeout.test | 6 +-
.../tokudb/mysql-test/tokudb/t/i_s_tokudb_trx.test | 10 +-
.../mysql-test/tokudb_bugs/r/tokudb718.result | 5 +-
.../tokudb/mysql-test/tokudb_bugs/t/tokudb718.test | 3 +-
storage/xtradb/CMakeLists.txt | 2 +
storage/xtradb/handler/ha_innodb.cc | 6 +-
storage/xtradb/handler/i_s.cc | 7 +-
storage/xtradb/include/os0sync.h | 2 +-
storage/xtradb/include/univ.i | 4 +-
support-files/mysql.spec.sh | 4 +-
.../tdb_logprint.cc => util/tests/sm-basic.cc | 69 +-
.../tests/sm-crash-double-free.cc | 72 +-
vio/viosslfactories.c | 52 +-
win/packaging/COPYING.rtf | 122 +-
win/packaging/CPackWixConfig.cmake | 230 +-
win/packaging/ca/CustomAction.cpp | 84 +-
win/packaging/custom_ui.wxs | 364 +-
win/packaging/extra.wxs.in | 1826 +-
win/packaging/heidisql.cmake | 46 +-
win/packaging/heidisql.wxi.in | 154 +-
win/packaging/heidisql_feature.wxi.in | 20 +-
win/packaging/mysql_server.wxs.in | 178 +-
win/upgrade_wizard/stdafx.h | 94 +-
win/upgrade_wizard/targetver.h | 16 +-
win/upgrade_wizard/upgrade.cpp | 114 +-
win/upgrade_wizard/upgrade.h | 62 +-
win/upgrade_wizard/upgrade.rc | 296 +-
win/upgrade_wizard/upgradeDlg.h | 146 +-
win/upgrade_wizard/upgrade_wizard.exe.manifest | 28 +-
217 files changed, 14953 insertions(+), 13643 deletions(-)
diff --cc debian/po/it.po
index b6cdfd6,b1a3eba..55b71bf
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@@ -1,13 -1,14 +1,14 @@@
- # Italian (it) translation of debconf templates for mariadb-5.5
- # This file is distributed under the same license as the mariadb-5.5 package.
- # Luca Monducci <luca.mo at tiscali.it>, 2006-2014.
- #
+ # Italian (it) translation of debconf templates for mysql-dfsg-5.1
+ # Copyright (C) 2009 Software in the Public Interest
+ # This file is distributed under the same license as the mysql-dfsg-5.1 package.
+ # Luca Monducci <luca.mo at tiscali.it>, 2006 - 2009.
+ #
msgid ""
msgstr ""
-"Project-Id-Version: mysql-dfsg-5.1 5.1.37 italian debconf templates\n"
+"Project-Id-Version: mariadb-5.5 5.5.39 italian debconf templates\n"
"Report-Msgid-Bugs-To: mariadb-5.5 at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-12 13:08+0100\n"
-"PO-Revision-Date: 2009-08-08 11:03+0200\n"
+"POT-Creation-Date: 2013-09-09 12:48+0300\n"
+"PO-Revision-Date: 2014-08-30 18:35+0200\n"
"Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
"Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
"Language: it\n"
--
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