lp:~laurynas-biveinis/percona-server/merge-5.5.41
Created by
Laurynas Biveinis
and last modified
Only
Laurynas Biveinis
can upload to this branch. If you are
Laurynas Biveinis
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Laurynas Biveinis (community): Approve
-
Diff: 10094 lines (+7085/-460)151 files modified.gitignore (+3071/-0)
CMakeLists.txt (+54/-39)
VERSION (+2/-2)
client/CMakeLists.txt (+6/-0)
client/mysqlbinlog.cc (+2/-1)
cmake/build_configurations/mysql_release.cmake (+10/-9)
cmake/compile_flags.cmake (+44/-0)
cmake/maintainer.cmake (+37/-40)
cmake/os/Darwin.cmake (+1/-20)
cmake/os/WindowsCache.cmake (+3/-3)
configure.cmake (+0/-9)
extra/replace.c (+2/-2)
extra/yassl/README (+9/-0)
extra/yassl/include/openssl/ssl.h (+1/-1)
extra/yassl/taocrypt/src/rsa.cpp (+1/-1)
include/my_pthread.h (+13/-3)
libmysqld/CMakeLists.txt (+8/-0)
libmysqld/examples/CMakeLists.txt (+6/-0)
libmysqld/lib_sql.cc (+3/-0)
man/comp_err.1 (+2/-2)
man/innochecksum.1 (+2/-2)
man/msql2mysql.1 (+2/-2)
man/my_print_defaults.1 (+2/-2)
man/myisam_ftdump.1 (+2/-2)
man/myisamchk.1 (+3/-3)
man/myisamlog.1 (+2/-2)
man/myisampack.1 (+2/-2)
man/mysql-stress-test.pl.1 (+2/-2)
man/mysql-test-run.pl.1 (+2/-2)
man/mysql.1 (+3/-3)
man/mysql.server.1 (+2/-2)
man/mysql_client_test.1 (+2/-2)
man/mysql_config.1 (+2/-2)
man/mysql_convert_table_format.1 (+2/-2)
man/mysql_find_rows.1 (+2/-2)
man/mysql_fix_extensions.1 (+2/-2)
man/mysql_install_db.1 (+24/-12)
man/mysql_plugin.1 (+3/-3)
man/mysql_secure_installation.1 (+2/-2)
man/mysql_setpermission.1 (+2/-2)
man/mysql_tzinfo_to_sql.1 (+2/-2)
man/mysql_upgrade.1 (+2/-2)
man/mysql_waitpid.1 (+2/-2)
man/mysql_zap.1 (+2/-2)
man/mysqlaccess.1 (+2/-2)
man/mysqladmin.1 (+3/-3)
man/mysqlbinlog.1 (+3/-3)
man/mysqlbug.1 (+2/-2)
man/mysqlcheck.1 (+3/-3)
man/mysqld.8 (+2/-2)
man/mysqld_multi.1 (+2/-2)
man/mysqld_safe.1 (+19/-17)
man/mysqldump.1 (+4/-4)
man/mysqldumpslow.1 (+2/-2)
man/mysqlhotcopy.1 (+3/-3)
man/mysqlimport.1 (+3/-3)
man/mysqlshow.1 (+3/-3)
man/mysqlslap.1 (+3/-3)
man/mysqltest.1 (+2/-2)
man/ndb-common-options.1 (+2/-8)
man/ndb_blob_tool.1 (+2/-2)
man/ndb_config.1 (+3/-3)
man/ndb_cpcd.1 (+2/-2)
man/ndb_delete_all.1 (+2/-2)
man/ndb_desc.1 (+2/-2)
man/ndb_drop_index.1 (+3/-3)
man/ndb_drop_table.1 (+2/-2)
man/ndb_error_reporter.1 (+2/-2)
man/ndb_index_stat.1 (+2/-2)
man/ndb_mgm.1 (+2/-2)
man/ndb_mgmd.8 (+2/-2)
man/ndb_print_backup_file.1 (+2/-2)
man/ndb_print_schema_file.1 (+4/-4)
man/ndb_print_sys_file.1 (+4/-4)
man/ndb_restore.1 (+3/-3)
man/ndb_select_all.1 (+2/-2)
man/ndb_select_count.1 (+2/-2)
man/ndb_show_tables.1 (+2/-2)
man/ndb_size.pl.1 (+2/-2)
man/ndb_waiter.1 (+2/-2)
man/ndbd.8 (+2/-2)
man/ndbd_redo_log_reader.1 (+4/-4)
man/ndbinfo_select_all.1 (+2/-2)
man/ndbmtd.8 (+2/-2)
man/perror.1 (+2/-2)
man/replace.1 (+2/-2)
man/resolve_stack_dump.1 (+2/-2)
man/resolveip.1 (+2/-2)
mysql-test/mysql-test-run.pl (+64/-15)
mysql-test/r/lock_sync.result (+51/-0)
mysql-test/r/windows.result (+5/-0)
mysql-test/suite/binlog/r/binlog_switch_inside_trans.result (+1/-7)
mysql-test/suite/binlog/t/binlog_grant.test (+1/-1)
mysql-test/suite/binlog/t/binlog_switch_inside_trans.test (+1/-5)
mysql-test/suite/innodb/r/foreign-keys.result (+2/-2)
mysql-test/suite/innodb/r/foreign-keys.result.moved (+16/-0)
mysql-test/suite/innodb/r/innodb_corrupt_bit.result (+1/-0)
mysql-test/suite/innodb/r/insert_debug.result (+11/-0)
mysql-test/suite/innodb/r/sp_temp_table.result (+253/-0)
mysql-test/suite/innodb/r/strict_mode.result (+242/-0)
mysql-test/suite/innodb/t/foreign-keys.test (+2/-2)
mysql-test/suite/innodb/t/foreign-keys.test.moved (+26/-0)
mysql-test/suite/innodb/t/innodb_corrupt_bit.test (+9/-3)
mysql-test/suite/innodb/t/insert_debug.test (+16/-0)
mysql-test/suite/innodb/t/sp_temp_table.test (+103/-0)
mysql-test/suite/innodb/t/strict_mode.test (+246/-0)
mysql-test/suite/sys_vars/r/sql_log_bin_basic.result (+6/-1)
mysql-test/suite/sys_vars/t/sql_log_bin_basic.test (+5/-1)
mysql-test/t/lock_sync.test (+55/-0)
mysql-test/t/windows.test (+16/-0)
mysys/my_wincond.c (+1/-23)
packaging/rpm-oel/mysql-systemd-start (+19/-3)
packaging/rpm-oel/mysql.init (+6/-2)
packaging/rpm-sles/CMakeLists.txt (+28/-0)
packaging/rpm-sles/filter-provides.sh (+6/-0)
packaging/rpm-sles/filter-requires.sh (+6/-0)
packaging/rpm-sles/my.cnf (+31/-0)
packaging/rpm-sles/my_config.h (+30/-0)
packaging/rpm-sles/mysql-systemd-start (+66/-0)
packaging/rpm-sles/mysql.conf (+1/-0)
packaging/rpm-sles/mysql.init (+236/-0)
packaging/rpm-sles/mysql.spec.in (+1646/-0)
packaging/rpm-sles/mysqld.service (+48/-0)
plugin/auth/CMakeLists.txt (+3/-1)
scripts/CMakeLists.txt (+8/-4)
scripts/mysql_setpermission.sh (+3/-3)
sql/CMakeLists.txt (+8/-0)
sql/handler.h (+1/-0)
sql/item_func.cc (+22/-9)
sql/item_func.h (+3/-2)
sql/log_event.cc (+13/-9)
sql/log_event.h (+2/-2)
sql/sql_parse.cc (+119/-1)
sql/sql_parse.h (+3/-0)
sql/sql_repl.cc (+4/-1)
sql/sql_table.cc (+12/-0)
sql/sys_vars.cc (+11/-11)
storage/innobase/CMakeLists.txt (+8/-0)
storage/innobase/dict/dict0dict.c (+34/-8)
storage/innobase/handler/ha_innodb.cc (+52/-2)
storage/innobase/include/btr0cur.ic (+2/-2)
storage/innobase/include/dict0dict.h (+8/-0)
storage/innobase/include/dict0dict.ic (+12/-0)
storage/innobase/include/univ.i (+4/-0)
storage/innobase/log/log0log.c (+1/-1)
storage/innobase/log/log0recv.c (+2/-1)
storage/innobase/row/row0mysql.c (+6/-3)
storage/myisam/ftbench/ft-test-run.sh (+1/-1)
support-files/mysql.spec.sh (+14/-12)
tests/fork_big.pl (+1/-1)
tests/fork_big2.pl (+1/-1)
Related bugs
Bug #1384561: Failing assertion: node_addr.page != FIL_NULL in btr0btr.cc line 1101 | Undecided | Fix Released |
Related blueprints
Merge MySQL 5.5.41
(Essential)
Branch information
- Owner:
- Laurynas Biveinis
- Status:
- Merged
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:percona-server/5.6