lp://staging/~james-page/ubuntu/trusty/mysql-5.6/5.6.19-security
- Get this branch:
- bzr branch lp://staging/~james-page/ubuntu/trusty/mysql-5.6/5.6.19-security
Branch merges
- Ubuntu Development Team: Pending requested
-
Diff: 73959 lines (+14402/-25010)261 files modified.pc/spelling.patch/sql/log_event.cc (+22/-7)
.pc/spelling.patch/sql/sql_yacc.cc (+2213/-2213)
CMakeLists.txt (+10/-0)
Docs/ChangeLog (+1066/-1389)
Docs/INFO_SRC (+6/-6)
Docs/INSTALL-BINARY (+15/-15)
INSTALL-SOURCE (+48/-62)
VERSION (+1/-1)
client/mysqldump.c (+12/-26)
cmake/os/WindowsCache.cmake (+1/-0)
cmake/ssl.cmake (+1/-1)
config.h.cmake (+1/-0)
configure.cmake (+14/-0)
debian/changelog (+14/-0)
extra/charset2html.c (+0/-179)
extra/mysql_waitpid.c (+5/-1)
include/errmsg.h (+4/-2)
include/my_base.h (+1/-2)
include/my_default.h (+2/-1)
include/my_global.h (+19/-29)
libmysql/errmsg.c (+3/-1)
libmysql/libmysql.c (+5/-1)
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 (+106/-6)
man/myisamlog.1 (+2/-2)
man/myisampack.1 (+2/-2)
man/mysql-stress-test.pl.1 (+3/-3)
man/mysql-test-run.pl.1 (+4/-4)
man/mysql.1 (+112/-10)
man/mysql.server.1 (+2/-2)
man/mysql_client_test.1 (+3/-3)
man/mysql_config.1 (+2/-2)
man/mysql_config_editor.1 (+4/-6)
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 (+145/-34)
man/mysql_plugin.1 (+2/-2)
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 (+110/-6)
man/mysql_waitpid.1 (+4/-2)
man/mysql_zap.1 (+4/-2)
man/mysqlaccess.1 (+2/-2)
man/mysqladmin.1 (+110/-6)
man/mysqlbinlog.1 (+113/-10)
man/mysqlbug.1 (+3/-3)
man/mysqlcheck.1 (+110/-6)
man/mysqld.8 (+2/-2)
man/mysqld_multi.1 (+2/-2)
man/mysqld_safe.1 (+2/-2)
man/mysqldump.1 (+128/-37)
man/mysqldumpslow.1 (+2/-2)
man/mysqlhotcopy.1 (+2/-2)
man/mysqlimport.1 (+110/-6)
man/mysqlshow.1 (+110/-6)
man/mysqlslap.1 (+125/-21)
man/mysqltest.1 (+4/-4)
man/ndb-common-options.1 (+2/-2)
man/ndb_blob_tool.1 (+3/-4)
man/ndb_config.1 (+4/-4)
man/ndb_cpcd.1 (+2/-2)
man/ndb_delete_all.1 (+3/-3)
man/ndb_desc.1 (+4/-5)
man/ndb_drop_index.1 (+4/-4)
man/ndb_drop_table.1 (+3/-3)
man/ndb_error_reporter.1 (+3/-3)
man/ndb_index_stat.1 (+4/-6)
man/ndb_mgm.1 (+2/-2)
man/ndb_mgmd.8 (+2/-2)
man/ndb_print_backup_file.1 (+4/-5)
man/ndb_print_schema_file.1 (+4/-5)
man/ndb_print_sys_file.1 (+4/-5)
man/ndb_restore.1 (+2/-2)
man/ndb_select_all.1 (+4/-5)
man/ndb_select_count.1 (+4/-4)
man/ndb_setup.py.1 (+3/-4)
man/ndb_show_tables.1 (+3/-3)
man/ndb_size.pl.1 (+4/-4)
man/ndb_waiter.1 (+4/-4)
man/ndbd.8 (+2/-2)
man/ndbd_redo_log_reader.1 (+3/-3)
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/collections/default.experimental (+0/-2)
mysql-test/collections/default.release.done (+1/-1)
mysql-test/extra/rpl_tests/rpl_deadlock.test (+0/-2)
mysql-test/extra/rpl_tests/rpl_kill_query.inc (+129/-0)
mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc (+0/-4)
mysql-test/include/begin_include_file.inc (+7/-0)
mysql-test/include/change_file_perms.inc (+12/-0)
mysql-test/include/eval.inc (+0/-1)
mysql-test/include/gtid_step_assert.inc (+96/-0)
mysql-test/include/gtid_step_reset.inc (+18/-0)
mysql-test/include/gtid_utils.inc (+156/-72)
mysql-test/include/gtid_utils_end.inc (+8/-2)
mysql-test/include/linux.inc (+5/-0)
mysql-test/include/master-slave.inc (+2/-1)
mysql-test/include/rpl_connection_master1.inc (+2/-0)
mysql-test/include/rpl_end.inc (+14/-6)
mysql-test/include/rpl_init.inc (+9/-0)
mysql-test/include/rpl_stop_server.inc (+10/-3)
mysql-test/include/show_rpl_debug_info.inc (+18/-1)
mysql-test/include/wait_for_slave_sql_error.inc (+17/-3)
mysql-test/include/wait_show_condition.inc (+6/-1)
mysql-test/r/check_auto_permission.result (+3/-0)
mysql-test/r/ddl_i18n_koi8r.result (+168/-168)
mysql-test/r/ddl_i18n_utf8.result (+168/-168)
mysql-test/r/debug_sync.result (+16/-16)
mysql-test/r/have_cp1251.require (+1/-1)
mysql-test/r/have_cp866.require (+1/-1)
mysql-test/r/have_koi8r.require (+1/-1)
mysql-test/r/loaddata.result (+12/-0)
mysql-test/r/myisam.result (+79/-0)
mysql-test/r/mysqldump.result (+47/-64)
mysql-test/r/outfile_loaddata.result (+16/-8)
mysql-test/r/partition_index_myisam.result (+3/-0)
mysql-test/r/sp_validation.result (+0/-1)
mysql-test/r/trigger.result (+17/-0)
mysql-test/suite/binlog/r/binlog_gtid_utils.result (+137/-0)
mysql-test/suite/binlog/r/binlog_truncate_kill.result (+37/-0)
mysql-test/suite/binlog/t/binlog_gtid_utils.test (+71/-0)
mysql-test/suite/binlog/t/binlog_truncate_kill.test (+56/-0)
mysql-test/suite/innodb/r/innodb_stats_external_pages.result (+19/-0)
mysql-test/suite/innodb/t/innodb_stats_external_pages.test (+83/-0)
mysql-test/suite/rpl/r/rpl_create_drop_temp_table.result (+13/-0)
mysql-test/suite/rpl/r/rpl_deadlock_innodb.result (+0/-11)
mysql-test/suite/rpl/r/rpl_gtid_empty_group.result (+0/-43)
mysql-test/suite/rpl/r/rpl_gtid_empty_transaction.result (+111/-0)
mysql-test/suite/rpl/r/rpl_gtid_execution.result (+0/-2)
mysql-test/suite/rpl/r/rpl_gtid_purged_fail_to_connect.result (+0/-2)
mysql-test/suite/rpl/r/rpl_gtid_purged_maintained.result (+0/-2)
mysql-test/suite/rpl/r/rpl_gtid_server_sighup.result (+40/-0)
mysql-test/suite/rpl/r/rpl_kill_query.result (+123/-0)
mysql-test/suite/rpl/r/rpl_rotate_row_trans.result (+39/-0)
mysql-test/suite/rpl/r/rpl_row_corrupt.result (+14/-0)
mysql-test/suite/rpl/r/rpl_row_create_select.result (+31/-0)
mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result (+0/-2736)
mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result (+0/-2736)
mysql-test/suite/rpl/r/rpl_semi_sync_deadlock.result (+1/-1)
mysql-test/suite/rpl/r/rpl_stm_mixed_mts_crash_safe.result (+0/-2736)
mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe.result (+0/-2736)
mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_checksum.result (+0/-2736)
mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_small.result (+0/-798)
mysql-test/suite/rpl/t/rpl_create_drop_temp_table.test (+74/-0)
mysql-test/suite/rpl/t/rpl_gtid_empty_group-master.opt (+0/-1)
mysql-test/suite/rpl/t/rpl_gtid_empty_group-slave.opt (+0/-1)
mysql-test/suite/rpl/t/rpl_gtid_empty_group.test (+0/-73)
mysql-test/suite/rpl/t/rpl_gtid_empty_transaction.cnf (+25/-0)
mysql-test/suite/rpl/t/rpl_gtid_empty_transaction.test (+301/-0)
mysql-test/suite/rpl/t/rpl_gtid_execution.test (+1/-4)
mysql-test/suite/rpl/t/rpl_gtid_purged_fail_to_connect.test (+1/-2)
mysql-test/suite/rpl/t/rpl_gtid_purged_maintained.test (+1/-2)
mysql-test/suite/rpl/t/rpl_gtid_server_sighup.test (+125/-0)
mysql-test/suite/rpl/t/rpl_kill_query-slave.opt (+2/-0)
mysql-test/suite/rpl/t/rpl_kill_query.test (+92/-0)
mysql-test/suite/rpl/t/rpl_rotate_row_trans.test (+94/-0)
mysql-test/suite/rpl/t/rpl_row_corrupt-master.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_row_corrupt-slave.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_row_corrupt.test (+36/-0)
mysql-test/suite/rpl/t/rpl_row_create_select.test (+29/-0)
mysql-test/suite/rpl/t/rpl_semi_sync_deadlock.test (+1/-1)
mysql-test/suite/sys_vars/r/debug_sync_basic.result (+3/-3)
mysql-test/t/check_auto_permission.test (+60/-0)
mysql-test/t/loaddata.test (+21/-0)
mysql-test/t/myisam.test (+70/-0)
mysql-test/t/mysqldump.test (+27/-0)
mysql-test/t/outfile_loaddata.test (+4/-0)
mysql-test/t/partition_index_innodb.test (+3/-0)
mysql-test/t/partition_index_myisam.test (+5/-0)
mysql-test/t/sp_validation.test (+0/-1)
mysql-test/t/trigger.test (+30/-0)
mysys/CMakeLists.txt (+0/-1)
mysys/my_isnan.c (+0/-27)
mysys/my_redel.c (+3/-11)
mysys/my_thr_init.c (+3/-0)
mysys_ssl/my_default.cc (+1/-2)
packaging/rpm-oel/mysql.spec.in (+58/-8)
packaging/solaris/CMakeLists.txt (+5/-1)
scripts/fill_help_tables.sql (+790/-786)
scripts/mysql_zap.sh (+3/-1)
scripts/mysqlbug.sh (+2/-1)
sql-common/client.c (+16/-6)
sql/debug_sync.cc (+148/-64)
sql/field.cc (+5/-8)
sql/item_func.cc (+6/-4)
sql/item_func.h (+2/-2)
sql/item_strfunc.cc (+1/-1)
sql/log_event.cc (+22/-7)
sql/mysqld.cc (+11/-0)
sql/parse_file.h (+1/-1)
sql/rpl_master.cc (+2/-2)
sql/rpl_slave.cc (+4/-0)
sql/sp_instr.cc (+11/-5)
sql/sql_base.cc (+25/-2)
sql/sql_class.cc (+0/-2)
sql/sql_cursor.cc (+11/-1)
sql/sql_lex.cc (+2/-3)
sql/sql_load.cc (+45/-28)
sql/sql_parse.cc (+53/-12)
sql/sql_reload.cc (+45/-25)
sql/sql_show.cc (+58/-7)
sql/sql_string.cc (+36/-0)
sql/sql_string.h (+3/-0)
sql/sql_truncate.cc (+37/-12)
sql/sql_truncate.h (+8/-2)
sql/sql_yacc.cc (+2213/-2213)
sql/sql_yacc.h (+2/-2)
sql/table.cc (+5/-0)
storage/heap/hp_hash.c (+2/-2)
storage/innobase/btr/btr0cur.cc (+6/-15)
storage/innobase/buf/buf0flu.cc (+4/-0)
storage/innobase/dict/dict0dict.cc (+87/-4)
storage/innobase/dict/dict0mem.cc (+5/-6)
storage/innobase/dict/dict0stats.cc (+314/-174)
storage/innobase/fil/fil0fil.cc (+1/-1)
storage/innobase/fts/fts0fts.cc (+64/-1)
storage/innobase/fts/fts0opt.cc (+1/-1)
storage/innobase/handler/ha_innodb.cc (+5/-5)
storage/innobase/include/btr0cur.h (+12/-1)
storage/innobase/include/dict0dict.h (+23/-1)
storage/innobase/include/dict0mem.h (+6/-1)
storage/innobase/include/os0once.h (+125/-0)
storage/innobase/include/os0sync.h (+3/-2)
storage/innobase/include/sync0rw.h (+2/-2)
storage/innobase/include/univ.i (+4/-4)
storage/innobase/os/os0file.cc (+2/-2)
storage/innobase/row/row0ins.cc (+9/-7)
storage/innobase/row/row0merge.cc (+1/-1)
storage/innobase/row/row0mysql.cc (+3/-3)
storage/innobase/srv/srv0mon.cc (+2/-2)
storage/innobase/srv/srv0start.cc (+2/-2)
storage/innobase/sync/sync0sync.cc (+6/-6)
storage/innobase/trx/trx0i_s.cc (+1/-1)
storage/innobase/trx/trx0trx.cc (+2/-2)
storage/myisam/mi_delete.c (+0/-2)
storage/myisam/mi_key.c (+2/-4)
storage/myisam/mi_open.c (+7/-1)
storage/myisam/mi_rkey.c (+3/-0)
storage/myisam/mi_rnext_same.c (+7/-5)
storage/myisam/mi_unique.c (+0/-3)
storage/myisam/mi_update.c (+0/-3)
storage/myisam/mi_write.c (+0/-3)
storage/myisam/myisamdef.h (+7/-1)
storage/myisam/sp_key.c (+1/-1)
strings/ctype-tis620.c (+18/-5)
support-files/mysql.5.6.17.spec (+0/-2080)
support-files/mysql.5.6.19.spec (+2080/-0)
unittest/gunit/CMakeLists.txt (+1/-0)
unittest/gunit/debug_sync-t.cc (+205/-0)
unittest/gunit/stdcxx-t.cc (+6/-2)
unittest/gunit/test_utils.cc (+8/-0)
Branch information
- Owner:
- James Page
- Status:
- Development
Recent revisions
- 6. By James Page
-
* SECURITY UPDATE: Update to 5.6.19 to fix security issues (LP: #1330168).
- www.oracle.com/technetwork /topics/ security/ cpujul2014- 1972956. html
- CVE-2014-2484
- CVE-2014-4258
- CVE-2014-4260
- CVE-2014-4238
- CVE-2014-4233
- CVE-2014-4240
- CVE-2014-4214 - 5. By James Page
-
* SECURITY UPDATE: Update to 5.6.17 to fix security issues (LP: #1313566).
- http://www.oracle. com/technetwork /topics/ security/ cpuapr2014- 1972952. html
- CVE-2014-0001
- CVE-2014-2430
- CVE-2014-2431
- CVE-2014-2435
- CVE-2014-2436
- CVE-2014-2440
* d/p/CVE-2014-0001. patch: Dropped, included in security update. - 4. By James Page
-
* New upstream point release:
- d/p/*: Refreshed.
* d/rules: Don't run dh_install with --fail-missing and exclusions until
package is a complete replacement for mysql-5.5.
* d/p/CVE-2014-0001. patch:
- Fix buffer overflow in client/mysql.cc via a long server version string.
CVE-2014-0001 (Closes: #741590).
* d/mysql-server- 5.6.mysql. upstart: Add upstart configuration.
* d/tests/*,control: Add autopkgtest from mysql-5.5:
- disable binlog.binlog_ server_ start_options as it requires writable /usr.
- disable build autopkgtest until package ships libmysqlclient18.
* d/rules,mysql-server- 5.6.install, apparmor- profile: Fixup install of
apparmor profile. - 3. By James Page
-
* d/control,rules: Drop libmysqlclient18.1* and libmysqld-5.6* due to conflicts
with libmysqlclient{18}-dev and incorrect SONAME naming (Closes: #741200).
NOTE: libmysqlclient* and libmysqld* can be re-instated when the 5.5->5.6
transition happens.
* d/control: Align Conflicts/Breaks/ Replaces/ Provides with virtual-mysql-*
approach for switching in/out MySQL alternatives.
* d/mysql-server- 5.6.mysql. init: Bump timeout on start to 30 seconds inline
with mysql-5.5 changes. - 2. By James Page
-
[ Akhil Mohan ]
* added libmysqlclient.so link to libmysqlclient18.1-dev package
* revisited patches in d/patches/series; removed extra patches not needed
* some patches were modified to handle 5.6 issues
* mysql-server-5.6 and mysql-client-5.6 now depend on mysql-common (>= 5.5)
* mysql-server-5.6 now provides only virtual-mysql-server
* mysql-client-5.6 now provides only virtual-mysql-client
* MySQL 5.6 now contains mysql-common-5.6 which is only suggested
* moved mysql-common/etc/mysql/ my.cnf to
mysql-common- 5.6/usr/ share/mysql/ my.cnf
* MySQL 5.6 now gives libmysqlclient18.1, libmysqlclient18.1-dev,
libmysqld-5.6-dev and libmysqld-5.6-pic
* libmysqlclient18.1-dev, libmysqld-5.6-dev and libmysqld-5.6-pic packages
conflict with their respective counterparts from MySQL 5.5
* link traversal for libmysqlclient is
libmysqlclient.so (contained in libmysqclient18 .1-dev) ->
libmysqlclient.so. 18 (contained in libmysqclient18.1) ->
libmysqlclient.so. 18.1 (contained in libmysqclient18.1) ->
libmysqlclient.so. 18.1.0 (contained in libmysqclient18.1)
* Placeholder packages mysql-server, mysql-client, mysql-testsuite
have been discontinued
* d/rules, d/control removed gcc-4.4 dependency and disable X86 assembly in
taocrypt.
- Cherry-pick from Debian svn r2231 with thanks to Clint Byrum.
* changed mirror to download source tar
* replaced mysql_install_db script with small shell script to create
root accounts. This avoids creating anonymous users which were
security concern.
* Docs/mysql.info has been removed in the mysql 5.6.15 source
* removed debian/repack.* and 'DFSG and repacking' section in
debian/README. source because repack not needed
* dropped '+dfsg' from version in changelog since there is no repack
* simplified debian/watch since there is no repack
* removed redundant *_r* links to mysql client library in libmysqlclient18
and libmysqlclient-dev packages
* updated debian/control to allow mysql-*-5.6 packages upgrade/ replace
an existing installation of mysql-*-5.5 packages
* modified debian/rules to use system zlib library, install additional
man pages and remove execute bit on few test and result files
* added patches to fix link path in man page mysql_client_test_embedded. 1
and mysqltest_embedded. 1
* added man page for mysql_config_pic at debian/additions/ mysql_config_ pic.1
* added man page for mysql_embedded at debian/additions/ mysql_embedded. 1
* moved libmysqlcient.so link from libmysqlclient18 to libmysqlclient-dev
based on lintian warning non-dev-pkg-with- shlib-symlink
* moved mysql_client_test_embedded binary from mysql-testsuite-5.6
package to mysql-client-5.6 package
* moved mysql_config_editor. 1 man page to mysql-client-5.6 package
* moved mysql_embedded from mysql-testsuite-5.6 package to mysql-client-5.6
package
* moved mysqltest_embedded binary from mysql-testsuite-5.6
package to mysql-server-5.6 package
* removed absolute path for mysql_install_db script in mysql-server-5.6
postinst script based on lintian warning[ Bjoern Boschman ]
* Initial release of mysql-5.6 package.
* mysql_install_db is now a perl script. Do not run it with bash.
* added innodb_data_file_ path to my.cnf for mysql-5.1 => mysql-5.6 upgrade
path.
* added multiarch support
* do not include .a files within libmysqlclient18
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/ubuntu/utopic/mysql-5.6