[Pkg-mysql-commits] [mariadb-5.5] 02/03: Merge tag 'upstream/5.5.54' into ubuntu-14.04

Otto Kekäläinen otto at moszumanska.debian.org
Thu Jan 19 07:03:58 UTC 2017


This is an automated email from the git hooks/post-receive script.

otto pushed a commit to branch ubuntu-14.04
in repository mariadb-5.5.

commit ac824fa5fdc64773d41dafe71b504538b544297d
Merge: 823a5cd aa39e58
Author: Otto Kekäläinen <otto at seravo.fi>
Date:   Thu Jan 19 00:27:02 2017 +0200

    Merge tag 'upstream/5.5.54' into ubuntu-14.04
    
    Upstream version 5.5.54

 .gitignore                                         |    1 +
 Docs/INFO_SRC                                      |   10 +-
 VERSION                                            |    2 +-
 client/mysqladmin.cc                               |    6 +-
 client/mysqltest.cc                                |   28 +-
 cmake/install_macros.cmake                         |    1 +
 cmake/os/Windows.cmake                             |    2 +-
 cmake/readline.cmake                               |    1 +
 configure.cmake                                    |    1 -
 debian/dist/Ubuntu/mariadb-server-5.5.files.in     |    1 +
 debian/mariadb-server-5.5.install                  |    1 +
 extra/CMakeLists.txt                               |    3 +
 extra/mysqld_safe_helper.c                         |   77 +
 include/my_sys.h                                   |    4 +
 mysql-test/include/ctype_numconv.inc               |   26 +-
 mysql-test/r/cache_temporal_4265.result            |    1 +
 mysql-test/r/create.result                         |    7 +
 mysql-test/r/ctype_binary.result                   |   42 +-
 mysql-test/r/ctype_cp1251.result                   |   46 +-
 mysql-test/r/ctype_latin1.result                   |   42 +-
 mysql-test/r/ctype_ucs.result                      |   48 +-
 mysql-test/r/ctype_utf8.result                     |   72 +-
 mysql-test/r/derived.result                        |   65 +
 mysql-test/r/derived_view.result                   |   83 +
 mysql-test/r/events_slowlog.result                 |   12 +
 mysql-test/r/fulltext_charsets.result              |    7 +
 mysql-test/r/func_time.result                      |    6 +
 mysql-test/r/group_by.result                       |   14 +
 mysql-test/r/index_merge_innodb.result             |   29 +
 mysql-test/r/information_schema.result             |    8 +-
 mysql-test/r/information_schema_part.result        |    8 +
 mysql-test/r/loaddata.result                       |   26 +-
 mysql-test/r/parser.result                         |    9 +
 mysql-test/r/sp.result                             |   39 +
 mysql-test/r/subselect.result                      |   22 +
 mysql-test/r/subselect2.result                     |   45 +
 mysql-test/r/subselect4.result                     |   39 +
 mysql-test/r/subselect_no_mat.result               |   22 +
 mysql-test/r/subselect_no_opts.result              |   22 +
 mysql-test/r/subselect_no_scache.result            |   22 +
 mysql-test/r/subselect_no_semijoin.result          |   22 +
 mysql-test/r/type_decimal.result                   |    5 +-
 mysql-test/r/union.result                          |   33 +-
 mysql-test/std_data/bug20683959loaddata.txt        |    1 -
 mysql-test/suite/binlog/r/binlog_index.result      |    6 +-
 mysql-test/suite/binlog/t/binlog_index.test        |    6 +-
 .../suite/engines/iuds/r/insert_decimal.result     |    1 -
 mysql-test/suite/rpl/r/rpl_binlog_errors.result    |    4 +-
 mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result  |   37 +-
 mysql-test/suite/rpl/t/rpl_binlog_errors.test      |    4 +-
 mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test    |  120 +-
 .../suite/sys_vars/r/replicate_do_db_basic.result  |    4 +
 .../sys_vars/r/replicate_do_table_basic.result     |    4 +
 .../sys_vars/r/replicate_ignore_db_basic.result    |    4 +
 .../sys_vars/r/replicate_ignore_table_basic.result |    4 +
 .../r/replicate_wild_do_table_basic.result         |    4 +
 .../r/replicate_wild_ignore_table_basic.result     |    4 +
 .../suite/sys_vars/t/replicate_do_db_basic.test    |    3 +
 .../suite/sys_vars/t/replicate_do_table_basic.test |    3 +
 .../sys_vars/t/replicate_ignore_db_basic.test      |    3 +
 .../sys_vars/t/replicate_ignore_table_basic.test   |    3 +
 .../sys_vars/t/replicate_wild_do_table_basic.test  |    3 +
 .../t/replicate_wild_ignore_table_basic.test       |    3 +
 mysql-test/t/create.test                           |    9 +
 mysql-test/t/ctype_utf8.test                       |   14 +
 mysql-test/t/derived.test                          |   47 +
 mysql-test/t/derived_view.test                     |   54 +
 mysql-test/t/events_slowlog.test                   |   28 +
 mysql-test/t/fulltext_charsets.test                |   10 +
 mysql-test/t/func_time.test                        |    5 +
 mysql-test/t/group_by.test                         |   12 +
 mysql-test/t/index_merge_innodb.test               |   33 +-
 mysql-test/t/information_schema.test               |    8 +-
 mysql-test/t/information_schema_part.test          |    7 +
 mysql-test/t/loaddata.test                         |   25 +-
 mysql-test/t/parser.test                           |   10 +
 mysql-test/t/sp.test                               |   51 +
 mysql-test/t/subselect.test                        |   24 +
 mysql-test/t/subselect2.test                       |   50 +
 mysql-test/t/subselect4.test                       |   41 +
 mysql-test/t/type_decimal.test                     |    5 +
 mysql-test/t/union.test                            |   22 +-
 mysys/CMakeLists.txt                               |    4 +-
 mysys/my_setuser.c                                 |   81 +
 plugin/server_audit/server_audit.c                 |    1 +
 scripts/mysql_install_db.sh                        |    6 +-
 scripts/mysqld_safe.sh                             |  107 +-
 sql/event_db_repository.cc                         |   15 +-
 sql/field.cc                                       |   15 +-
 sql/filesort.cc                                    |    2 +-
 sql/handler.cc                                     |    2 +-
 sql/item.cc                                        |  114 +-
 sql/item.h                                         |    2 +-
 sql/item_func.cc                                   |    3 +-
 sql/item_func.h                                    |    1 +
 sql/item_strfunc.cc                                |    2 +-
 sql/item_strfunc.h                                 |    1 -
 sql/item_subselect.cc                              |   37 +-
 sql/item_timefunc.cc                               |   29 +-
 sql/item_timefunc.h                                |   62 +-
 sql/log.cc                                         |   17 +-
 sql/mysqld.cc                                      |  112 +-
 sql/rpl_filter.cc                                  |    3 +
 sql/signal_handler.cc                              |    2 +-
 sql/sp_head.cc                                     |   16 +-
 sql/sql_connect.cc                                 |   16 +-
 sql/sql_const.h                                    |    2 +-
 sql/sql_derived.cc                                 |    2 +
 sql/sql_lex.cc                                     |   28 +-
 sql/sql_load.cc                                    |   77 +-
 sql/sql_parse.cc                                   |   23 +-
 sql/sql_parse.h                                    |    1 +
 sql/sql_select.cc                                  |   16 +-
 sql/sql_select.h                                   |    5 +-
 sql/sql_table.cc                                   |   10 +-
 sql/sql_time.cc                                    |   17 +
 sql/sql_time.h                                     |    2 +
 sql/sql_udf.cc                                     |    6 +-
 sql/sql_yacc.cc                                    | 4244 ++++++++++----------
 sql/sql_yacc.yy                                    |    8 +-
 sql/sys_vars.cc                                    |    3 +-
 storage/innobase/mach/mach0data.c                  |   53 +-
 storage/myisam/ft_boolean_search.c                 |    7 +-
 .../tokudb/mysql-test/tokudb/r/type_decimal.result |    2 -
 strings/decimal.c                                  |    2 +
 support-files/mysql.server.sh                      |    8 +-
 win/packaging/extra.wxs.in                         |   17 +-
 win/packaging/heidisql.cmake                       |    2 +-
 win/packaging/heidisql.wxi.in                      |   14 +-
 129 files changed, 4124 insertions(+), 2711 deletions(-)


-- 
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