lp:~laurynas-biveinis/percona-server/merge-5.5.33
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.
- Alexey Kopytov (community): Approve
-
Diff: 9163 lines (+2140/-1450)318 files modifiedPercona-Server/CMakeLists.txt (+1/-0)
Percona-Server/VERSION (+1/-1)
Percona-Server/client/mysqlbinlog.cc (+1/-0)
Percona-Server/client/mysqldump.c (+51/-26)
Percona-Server/cmake/dtrace.cmake (+1/-1)
Percona-Server/extra/comp_err.c (+19/-1)
Percona-Server/include/my_getopt.h (+2/-0)
Percona-Server/include/my_global.h (+2/-2)
Percona-Server/include/mysql/plugin.h (+11/-0)
Percona-Server/mysql-test/include/default_mysqld.cnf (+2/-2)
Percona-Server/mysql-test/mysql-test-run.pl (+11/-1)
Percona-Server/mysql-test/r/func_str.result (+2/-2)
Percona-Server/mysql-test/r/group_min_max.result (+3/-2)
Percona-Server/mysql-test/r/mysqldump.result (+1/-1)
Percona-Server/mysql-test/r/partition_myisam.result (+2/-2)
Percona-Server/mysql-test/r/percona_innodb_expand_fast_index_creation.result (+6/-6)
Percona-Server/mysql-test/r/plugin.result (+81/-1)
Percona-Server/mysql-test/suite/binlog/t/binlog_killed_simulate.test (+4/-5)
Percona-Server/mysql-test/t/client_xml.test (+1/-1)
Percona-Server/mysql-test/t/func_str.test (+4/-2)
Percona-Server/mysql-test/t/group_min_max.test (+2/-0)
Percona-Server/mysql-test/t/mysqldump.test (+11/-11)
Percona-Server/mysql-test/t/openssl_1.test (+6/-6)
Percona-Server/mysql-test/t/partition_myisam.test (+2/-3)
Percona-Server/mysql-test/t/plugin.test (+52/-0)
Percona-Server/mysys/CMakeLists.txt (+6/-1)
Percona-Server/mysys/my_getopt.c (+49/-6)
Percona-Server/packaging/WiX/CPackWixConfig.cmake (+1/-1)
Percona-Server/packaging/rpm-uln/mysql.spec.sh (+5/-1)
Percona-Server/packaging/solaris/postinstall-solaris.sh (+0/-127)
Percona-Server/sql/debug_sync.cc (+2/-2)
Percona-Server/sql/field.cc (+3/-3)
Percona-Server/sql/ha_partition.cc (+75/-45)
Percona-Server/sql/ha_partition.h (+1/-1)
Percona-Server/sql/item_func.h (+8/-0)
Percona-Server/sql/item_subselect.cc (+19/-4)
Percona-Server/sql/log_event.h (+0/-1)
Percona-Server/sql/partition_info.cc (+1/-1)
Percona-Server/sql/signal_handler.cc (+1/-1)
Percona-Server/sql/sql_bitmap.h (+1/-0)
Percona-Server/sql/sql_lex.cc (+1/-0)
Percona-Server/sql/sql_lex.h (+7/-0)
Percona-Server/sql/sql_partition.cc (+216/-151)
Percona-Server/sql/sql_plugin.cc (+61/-0)
Percona-Server/sql/sql_rename.cc (+2/-2)
Percona-Server/sql/sql_select.cc (+95/-46)
Percona-Server/sql/sql_table.cc (+19/-6)
Percona-Server/sql/sql_table.h (+3/-1)
Percona-Server/sql/sql_yacc.yy (+12/-5)
Percona-Server/sql/sys_vars.h (+18/-10)
Percona-Server/sql/table.h (+3/-0)
Percona-Server/storage/example/ha_example.cc (+29/-2)
Percona-Server/storage/innobase/btr/btr0btr.c (+165/-88)
Percona-Server/storage/innobase/btr/btr0pcur.c (+2/-2)
Percona-Server/storage/innobase/btr/btr0sea.c (+2/-2)
Percona-Server/storage/innobase/buf/buf0buddy.c (+2/-2)
Percona-Server/storage/innobase/buf/buf0buf.c (+2/-2)
Percona-Server/storage/innobase/buf/buf0flu.c (+2/-2)
Percona-Server/storage/innobase/buf/buf0lru.c (+2/-2)
Percona-Server/storage/innobase/buf/buf0rea.c (+2/-2)
Percona-Server/storage/innobase/compile-innodb (+2/-2)
Percona-Server/storage/innobase/data/data0data.c (+2/-2)
Percona-Server/storage/innobase/data/data0type.c (+2/-2)
Percona-Server/storage/innobase/dict/dict0boot.c (+2/-2)
Percona-Server/storage/innobase/dict/dict0crea.c (+9/-9)
Percona-Server/storage/innobase/dict/dict0dict.c (+69/-20)
Percona-Server/storage/innobase/dict/dict0load.c (+43/-26)
Percona-Server/storage/innobase/dict/dict0mem.c (+2/-2)
Percona-Server/storage/innobase/eval/eval0eval.c (+2/-2)
Percona-Server/storage/innobase/eval/eval0proc.c (+2/-2)
Percona-Server/storage/innobase/fil/fil0fil.c (+15/-16)
Percona-Server/storage/innobase/fut/fut0fut.c (+2/-2)
Percona-Server/storage/innobase/fut/fut0lst.c (+2/-2)
Percona-Server/storage/innobase/ha/ha0ha.c (+2/-2)
Percona-Server/storage/innobase/ha/ha0storage.c (+2/-2)
Percona-Server/storage/innobase/ha/hash0hash.c (+2/-2)
Percona-Server/storage/innobase/handler/ha_innodb.cc (+79/-79)
Percona-Server/storage/innobase/handler/ha_innodb.h (+2/-2)
Percona-Server/storage/innobase/handler/handler0alter.cc (+3/-2)
Percona-Server/storage/innobase/handler/i_s.cc (+41/-24)
Percona-Server/storage/innobase/handler/i_s.h (+2/-2)
Percona-Server/storage/innobase/ibuf/ibuf0ibuf.c (+25/-12)
Percona-Server/storage/innobase/include/btr0btr.ic (+2/-2)
Percona-Server/storage/innobase/include/btr0pcur.h (+2/-2)
Percona-Server/storage/innobase/include/btr0pcur.ic (+2/-2)
Percona-Server/storage/innobase/include/btr0sea.h (+2/-2)
Percona-Server/storage/innobase/include/btr0sea.ic (+2/-2)
Percona-Server/storage/innobase/include/btr0types.h (+2/-2)
Percona-Server/storage/innobase/include/buf0buddy.h (+2/-2)
Percona-Server/storage/innobase/include/buf0buddy.ic (+2/-2)
Percona-Server/storage/innobase/include/buf0flu.h (+2/-2)
Percona-Server/storage/innobase/include/buf0flu.ic (+2/-2)
Percona-Server/storage/innobase/include/buf0lru.h (+2/-2)
Percona-Server/storage/innobase/include/buf0lru.ic (+2/-2)
Percona-Server/storage/innobase/include/buf0rea.h (+2/-2)
Percona-Server/storage/innobase/include/buf0types.h (+2/-2)
Percona-Server/storage/innobase/include/data0data.h (+2/-2)
Percona-Server/storage/innobase/include/data0data.ic (+2/-2)
Percona-Server/storage/innobase/include/data0type.h (+2/-2)
Percona-Server/storage/innobase/include/data0type.ic (+2/-2)
Percona-Server/storage/innobase/include/data0types.h (+2/-2)
Percona-Server/storage/innobase/include/dict0boot.h (+2/-2)
Percona-Server/storage/innobase/include/dict0boot.ic (+2/-2)
Percona-Server/storage/innobase/include/dict0crea.h (+2/-2)
Percona-Server/storage/innobase/include/dict0crea.ic (+2/-2)
Percona-Server/storage/innobase/include/dict0dict.h (+13/-16)
Percona-Server/storage/innobase/include/dict0dict.ic (+8/-32)
Percona-Server/storage/innobase/include/dict0load.h (+10/-8)
Percona-Server/storage/innobase/include/dict0load.ic (+2/-2)
Percona-Server/storage/innobase/include/dict0mem.ic (+2/-2)
Percona-Server/storage/innobase/include/dict0types.h (+4/-2)
Percona-Server/storage/innobase/include/eval0eval.h (+2/-2)
Percona-Server/storage/innobase/include/eval0eval.ic (+2/-2)
Percona-Server/storage/innobase/include/eval0proc.h (+2/-2)
Percona-Server/storage/innobase/include/eval0proc.ic (+2/-2)
Percona-Server/storage/innobase/include/fil0fil.h (+2/-2)
Percona-Server/storage/innobase/include/fsp0types.h (+2/-2)
Percona-Server/storage/innobase/include/fut0fut.h (+2/-2)
Percona-Server/storage/innobase/include/fut0fut.ic (+2/-2)
Percona-Server/storage/innobase/include/fut0lst.h (+2/-2)
Percona-Server/storage/innobase/include/fut0lst.ic (+2/-2)
Percona-Server/storage/innobase/include/ha0ha.h (+2/-2)
Percona-Server/storage/innobase/include/ha0ha.ic (+2/-2)
Percona-Server/storage/innobase/include/ha0storage.h (+2/-2)
Percona-Server/storage/innobase/include/ha0storage.ic (+2/-2)
Percona-Server/storage/innobase/include/ha_prototypes.h (+2/-2)
Percona-Server/storage/innobase/include/handler0alter.h (+2/-2)
Percona-Server/storage/innobase/include/hash0hash.h (+2/-2)
Percona-Server/storage/innobase/include/hash0hash.ic (+2/-2)
Percona-Server/storage/innobase/include/ibuf0ibuf.h (+2/-2)
Percona-Server/storage/innobase/include/ibuf0ibuf.ic (+2/-2)
Percona-Server/storage/innobase/include/ibuf0types.h (+2/-2)
Percona-Server/storage/innobase/include/lock0iter.h (+2/-2)
Percona-Server/storage/innobase/include/lock0lock.h (+2/-2)
Percona-Server/storage/innobase/include/lock0lock.ic (+2/-2)
Percona-Server/storage/innobase/include/lock0priv.h (+2/-2)
Percona-Server/storage/innobase/include/lock0priv.ic (+2/-2)
Percona-Server/storage/innobase/include/lock0types.h (+2/-2)
Percona-Server/storage/innobase/include/log0log.ic (+2/-2)
Percona-Server/storage/innobase/include/log0recv.h (+2/-2)
Percona-Server/storage/innobase/include/log0recv.ic (+2/-2)
Percona-Server/storage/innobase/include/mach0data.h (+2/-2)
Percona-Server/storage/innobase/include/mach0data.ic (+2/-2)
Percona-Server/storage/innobase/include/mem0dbg.h (+2/-2)
Percona-Server/storage/innobase/include/mem0dbg.ic (+2/-2)
Percona-Server/storage/innobase/include/mem0mem.h (+2/-2)
Percona-Server/storage/innobase/include/mem0mem.ic (+2/-2)
Percona-Server/storage/innobase/include/mem0pool.h (+2/-2)
Percona-Server/storage/innobase/include/mem0pool.ic (+2/-2)
Percona-Server/storage/innobase/include/mtr0log.h (+2/-2)
Percona-Server/storage/innobase/include/mtr0log.ic (+2/-2)
Percona-Server/storage/innobase/include/mtr0types.h (+2/-2)
Percona-Server/storage/innobase/include/os0file.ic (+2/-2)
Percona-Server/storage/innobase/include/os0proc.h (+2/-2)
Percona-Server/storage/innobase/include/os0proc.ic (+2/-2)
Percona-Server/storage/innobase/include/os0sync.h (+2/-2)
Percona-Server/storage/innobase/include/os0sync.ic (+2/-2)
Percona-Server/storage/innobase/include/os0thread.h (+2/-2)
Percona-Server/storage/innobase/include/os0thread.ic (+2/-2)
Percona-Server/storage/innobase/include/page0cur.h (+2/-2)
Percona-Server/storage/innobase/include/page0cur.ic (+2/-2)
Percona-Server/storage/innobase/include/page0types.h (+2/-2)
Percona-Server/storage/innobase/include/page0zip.h (+2/-2)
Percona-Server/storage/innobase/include/page0zip.ic (+2/-2)
Percona-Server/storage/innobase/include/pars0grm.h (+2/-2)
Percona-Server/storage/innobase/include/pars0opt.h (+2/-2)
Percona-Server/storage/innobase/include/pars0opt.ic (+2/-2)
Percona-Server/storage/innobase/include/pars0pars.h (+2/-2)
Percona-Server/storage/innobase/include/pars0pars.ic (+2/-2)
Percona-Server/storage/innobase/include/pars0sym.h (+2/-2)
Percona-Server/storage/innobase/include/pars0sym.ic (+2/-2)
Percona-Server/storage/innobase/include/pars0types.h (+2/-2)
Percona-Server/storage/innobase/include/que0que.h (+2/-2)
Percona-Server/storage/innobase/include/que0que.ic (+2/-2)
Percona-Server/storage/innobase/include/que0types.h (+2/-2)
Percona-Server/storage/innobase/include/read0read.h (+2/-2)
Percona-Server/storage/innobase/include/read0read.ic (+2/-2)
Percona-Server/storage/innobase/include/read0types.h (+2/-2)
Percona-Server/storage/innobase/include/rem0cmp.h (+2/-2)
Percona-Server/storage/innobase/include/rem0cmp.ic (+2/-2)
Percona-Server/storage/innobase/include/rem0rec.h (+2/-2)
Percona-Server/storage/innobase/include/rem0rec.ic (+2/-2)
Percona-Server/storage/innobase/include/rem0types.h (+2/-2)
Percona-Server/storage/innobase/include/row0ext.h (+2/-2)
Percona-Server/storage/innobase/include/row0ext.ic (+2/-2)
Percona-Server/storage/innobase/include/row0ins.h (+2/-2)
Percona-Server/storage/innobase/include/row0ins.ic (+2/-2)
Percona-Server/storage/innobase/include/row0merge.h (+2/-2)
Percona-Server/storage/innobase/include/row0mysql.h (+2/-2)
Percona-Server/storage/innobase/include/row0mysql.ic (+2/-2)
Percona-Server/storage/innobase/include/row0purge.h (+2/-2)
Percona-Server/storage/innobase/include/row0purge.ic (+2/-2)
Percona-Server/storage/innobase/include/row0row.h (+2/-2)
Percona-Server/storage/innobase/include/row0row.ic (+2/-2)
Percona-Server/storage/innobase/include/row0sel.h (+2/-2)
Percona-Server/storage/innobase/include/row0sel.ic (+2/-2)
Percona-Server/storage/innobase/include/row0types.h (+2/-2)
Percona-Server/storage/innobase/include/row0uins.h (+2/-2)
Percona-Server/storage/innobase/include/row0uins.ic (+2/-2)
Percona-Server/storage/innobase/include/row0umod.h (+2/-2)
Percona-Server/storage/innobase/include/row0umod.ic (+2/-2)
Percona-Server/storage/innobase/include/row0undo.h (+2/-2)
Percona-Server/storage/innobase/include/row0undo.ic (+2/-2)
Percona-Server/storage/innobase/include/row0upd.h (+2/-2)
Percona-Server/storage/innobase/include/row0upd.ic (+2/-2)
Percona-Server/storage/innobase/include/row0vers.h (+2/-2)
Percona-Server/storage/innobase/include/row0vers.ic (+2/-2)
Percona-Server/storage/innobase/include/srv0srv.h (+2/-2)
Percona-Server/storage/innobase/include/srv0srv.ic (+2/-2)
Percona-Server/storage/innobase/include/srv0start.h (+2/-2)
Percona-Server/storage/innobase/include/sync0arr.h (+2/-2)
Percona-Server/storage/innobase/include/sync0arr.ic (+2/-2)
Percona-Server/storage/innobase/include/sync0rw.h (+2/-2)
Percona-Server/storage/innobase/include/sync0rw.ic (+2/-2)
Percona-Server/storage/innobase/include/sync0sync.ic (+2/-2)
Percona-Server/storage/innobase/include/sync0types.h (+2/-2)
Percona-Server/storage/innobase/include/trx0i_s.h (+2/-2)
Percona-Server/storage/innobase/include/trx0purge.h (+2/-2)
Percona-Server/storage/innobase/include/trx0purge.ic (+2/-2)
Percona-Server/storage/innobase/include/trx0rec.h (+2/-2)
Percona-Server/storage/innobase/include/trx0roll.h (+2/-2)
Percona-Server/storage/innobase/include/trx0roll.ic (+2/-2)
Percona-Server/storage/innobase/include/trx0rseg.h (+2/-2)
Percona-Server/storage/innobase/include/trx0rseg.ic (+2/-2)
Percona-Server/storage/innobase/include/trx0sys.h (+2/-2)
Percona-Server/storage/innobase/include/trx0sys.ic (+2/-2)
Percona-Server/storage/innobase/include/trx0trx.h (+2/-2)
Percona-Server/storage/innobase/include/trx0trx.ic (+2/-2)
Percona-Server/storage/innobase/include/trx0types.h (+2/-2)
Percona-Server/storage/innobase/include/trx0undo.ic (+2/-2)
Percona-Server/storage/innobase/include/trx0xa.h (+2/-2)
Percona-Server/storage/innobase/include/univ.i (+2/-2)
Percona-Server/storage/innobase/include/usr0sess.h (+2/-2)
Percona-Server/storage/innobase/include/usr0sess.ic (+2/-2)
Percona-Server/storage/innobase/include/usr0types.h (+2/-2)
Percona-Server/storage/innobase/include/ut0bh.h (+2/-2)
Percona-Server/storage/innobase/include/ut0bh.ic (+2/-2)
Percona-Server/storage/innobase/include/ut0byte.h (+2/-2)
Percona-Server/storage/innobase/include/ut0byte.ic (+2/-2)
Percona-Server/storage/innobase/include/ut0dbg.h (+2/-2)
Percona-Server/storage/innobase/include/ut0list.h (+2/-2)
Percona-Server/storage/innobase/include/ut0list.ic (+2/-2)
Percona-Server/storage/innobase/include/ut0lst.h (+2/-2)
Percona-Server/storage/innobase/include/ut0mem.h (+2/-2)
Percona-Server/storage/innobase/include/ut0mem.ic (+2/-2)
Percona-Server/storage/innobase/include/ut0rbt.h (+2/-2)
Percona-Server/storage/innobase/include/ut0rnd.h (+2/-2)
Percona-Server/storage/innobase/include/ut0rnd.ic (+2/-2)
Percona-Server/storage/innobase/include/ut0sort.h (+2/-2)
Percona-Server/storage/innobase/include/ut0ut.h (+2/-2)
Percona-Server/storage/innobase/include/ut0ut.ic (+2/-2)
Percona-Server/storage/innobase/include/ut0vec.h (+2/-2)
Percona-Server/storage/innobase/include/ut0vec.ic (+2/-2)
Percona-Server/storage/innobase/include/ut0wqueue.h (+2/-2)
Percona-Server/storage/innobase/lock/lock0iter.c (+2/-2)
Percona-Server/storage/innobase/lock/lock0lock.c (+2/-2)
Percona-Server/storage/innobase/log/log0recv.c (+2/-2)
Percona-Server/storage/innobase/mach/mach0data.c (+2/-2)
Percona-Server/storage/innobase/mem/mem0dbg.c (+2/-2)
Percona-Server/storage/innobase/mem/mem0mem.c (+2/-2)
Percona-Server/storage/innobase/mem/mem0pool.c (+2/-2)
Percona-Server/storage/innobase/mtr/mtr0log.c (+2/-2)
Percona-Server/storage/innobase/os/os0proc.c (+2/-2)
Percona-Server/storage/innobase/os/os0sync.c (+2/-2)
Percona-Server/storage/innobase/os/os0thread.c (+2/-2)
Percona-Server/storage/innobase/page/page0zip.c (+41/-8)
Percona-Server/storage/innobase/pars/lexyy.c (+2/-2)
Percona-Server/storage/innobase/pars/make_bison.sh (+2/-2)
Percona-Server/storage/innobase/pars/make_flex.sh (+2/-2)
Percona-Server/storage/innobase/pars/pars0grm.c (+2/-2)
Percona-Server/storage/innobase/pars/pars0grm.y (+2/-2)
Percona-Server/storage/innobase/pars/pars0lex.l (+2/-2)
Percona-Server/storage/innobase/pars/pars0opt.c (+2/-2)
Percona-Server/storage/innobase/pars/pars0pars.c (+4/-4)
Percona-Server/storage/innobase/pars/pars0sym.c (+2/-2)
Percona-Server/storage/innobase/que/que0que.c (+2/-2)
Percona-Server/storage/innobase/read/read0read.c (+2/-2)
Percona-Server/storage/innobase/rem/rem0cmp.c (+2/-2)
Percona-Server/storage/innobase/rem/rem0rec.c (+2/-2)
Percona-Server/storage/innobase/row/row0ext.c (+2/-2)
Percona-Server/storage/innobase/row/row0ins.c (+2/-1)
Percona-Server/storage/innobase/row/row0merge.c (+4/-4)
Percona-Server/storage/innobase/row/row0mysql.c (+13/-11)
Percona-Server/storage/innobase/row/row0sel.c (+3/-3)
Percona-Server/storage/innobase/row/row0uins.c (+2/-2)
Percona-Server/storage/innobase/row/row0umod.c (+2/-2)
Percona-Server/storage/innobase/row/row0undo.c (+2/-2)
Percona-Server/storage/innobase/row/row0upd.c (+3/-2)
Percona-Server/storage/innobase/row/row0vers.c (+2/-2)
Percona-Server/storage/innobase/srv/srv0srv.c (+13/-4)
Percona-Server/storage/innobase/srv/srv0start.c (+2/-2)
Percona-Server/storage/innobase/sync/sync0arr.c (+2/-2)
Percona-Server/storage/innobase/trx/trx0i_s.c (+2/-2)
Percona-Server/storage/innobase/trx/trx0purge.c (+2/-2)
Percona-Server/storage/innobase/trx/trx0roll.c (+2/-2)
Percona-Server/storage/innobase/trx/trx0rseg.c (+2/-2)
Percona-Server/storage/innobase/trx/trx0trx.c (+2/-2)
Percona-Server/storage/innobase/usr/usr0sess.c (+2/-2)
Percona-Server/storage/innobase/ut/ut0bh.c (+2/-2)
Percona-Server/storage/innobase/ut/ut0byte.c (+2/-2)
Percona-Server/storage/innobase/ut/ut0dbg.c (+2/-2)
Percona-Server/storage/innobase/ut/ut0list.c (+2/-2)
Percona-Server/storage/innobase/ut/ut0mem.c (+2/-2)
Percona-Server/storage/innobase/ut/ut0rbt.c (+2/-2)
Percona-Server/storage/innobase/ut/ut0rnd.c (+2/-2)
Percona-Server/storage/innobase/ut/ut0vec.c (+2/-2)
Percona-Server/storage/innobase/ut/ut0wqueue.c (+2/-2)
Percona-Server/storage/myisam/mi_checksum.c (+1/-2)
Percona-Server/storage/myisam/mi_key.c (+2/-2)
Percona-Server/storage/myisam/mi_packrec.c (+2/-2)
Percona-Server/strings/ctype-uca.c (+22/-20)
Percona-Server/strings/ctype-utf8.c (+3/-1)
Percona-Server/support-files/build-tags (+1/-1)
Percona-Server/support-files/mysql.spec.sh (+51/-86)
Percona-Server/unittest/my_decimal/CMakeLists.txt (+32/-0)
Percona-Server/unittest/my_decimal/my_decimal-t.cc (+72/-0)
Percona-Server/unittest/mysys/explain_filename-t.cc (+2/-2)
Percona-Server/unittest/mysys/my_vsnprintf-t.c (+0/-2)
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