Merge lp://qastaging/~linuxjedi/drizzle/elliott-bug-653471 into lp://qastaging/drizzle/7.0

Proposed by Andrew Hutchings
Status: Merged
Approved by: Brian Aker
Approved revision: 1805
Merge reported by: Lee Bieber
Merged at revision: not available
Proposed branch: lp://qastaging/~linuxjedi/drizzle/elliott-bug-653471
Merge into: lp://qastaging/drizzle/7.0
Diff against target: 18466 lines (+3361/-2698)
758 files modified
COPYING (+287/-300)
client/client_priv.h (+1/-1)
client/drizzle.cc (+2/-4)
client/drizzledump.cc (+10/-4)
client/drizzledump_data.cc (+2/-2)
client/drizzledump_data.h (+1/-1)
client/drizzledump_mysql.cc (+12/-9)
client/drizzledump_mysql.h (+1/-1)
client/drizzleimport.cc (+1/-1)
client/drizzletest.cc (+1/-3)
client/linebuffer.cc (+1/-1)
client/linebuffer.h (+1/-1)
docs/clients/drizzledump.rst (+0/-6)
docs/index.rst (+0/-1)
docs/options.rst (+290/-1)
docs/protocol.rst (+7/-9)
drizzled/algorithm/include.am (+1/-1)
drizzled/charset-def.cc (+1/-1)
drizzled/charset.cc (+1/-1)
drizzled/charset_info.h (+1/-1)
drizzled/ctype-bin.cc (+2/-2)
drizzled/ctype-mb.cc (+7/-2)
drizzled/ctype-simple.cc (+1/-1)
drizzled/ctype-uca.cc (+2/-2)
drizzled/ctype-utf8.cc (+2/-2)
drizzled/ctype.cc (+1/-1)
drizzled/db.cc (+1/-1)
drizzled/decimal.cc (+1/-1)
drizzled/decimal.h (+1/-1)
drizzled/drizzle_time.cc (+1/-1)
drizzled/drizzled.cc (+3/-23)
drizzled/dynamic_array.cc (+1/-1)
drizzled/field/date.cc (+4/-4)
drizzled/field/datetime.cc (+5/-9)
drizzled/field/enum.cc (+3/-5)
drizzled/field/timestamp.cc (+5/-6)
drizzled/field_conv.cc (+1/-1)
drizzled/filesort.cc (+1/-1)
drizzled/function/str/strfunc.cc (+1/-1)
drizzled/function/time/from_days.cc (+2/-3)
drizzled/function/time/from_unixtime.cc (+2/-4)
drizzled/identifier/table.cc (+1/-1)
drizzled/identifier/table.h (+17/-3)
drizzled/include.am (+2/-0)
drizzled/internal/bmove_upp.cc (+1/-1)
drizzled/internal/checksum.cc (+1/-1)
drizzled/internal/default.cc (+1/-1)
drizzled/internal/dtoa.cc (+1/-1)
drizzled/internal/int2str.cc (+1/-1)
drizzled/internal/llstr.cc (+1/-1)
drizzled/internal/longlong2str.cc (+1/-1)
drizzled/internal/m_string.h (+1/-1)
drizzled/internal/mf_arr_appstr.cc (+1/-1)
drizzled/internal/mf_cache.cc (+1/-1)
drizzled/internal/mf_dirname.cc (+1/-1)
drizzled/internal/mf_fn_ext.cc (+1/-1)
drizzled/internal/mf_format.cc (+1/-1)
drizzled/internal/mf_getdate.cc (+1/-1)
drizzled/internal/mf_iocache.cc (+1/-1)
drizzled/internal/mf_loadpath.cc (+1/-1)
drizzled/internal/mf_pack.cc (+1/-1)
drizzled/internal/mf_qsort.cc (+1/-1)
drizzled/internal/mf_qsort2.cc (+1/-1)
drizzled/internal/mf_radix.cc (+1/-1)
drizzled/internal/mf_same.cc (+1/-1)
drizzled/internal/mf_sort.cc (+1/-1)
drizzled/internal/mf_tempfile.cc (+1/-1)
drizzled/internal/mf_wcomp.cc (+1/-1)
drizzled/internal/my_access.cc (+1/-1)
drizzled/internal/my_bit.cc (+1/-1)
drizzled/internal/my_copy.cc (+1/-1)
drizzled/internal/my_create.cc (+1/-1)
drizzled/internal/my_delete.cc (+1/-1)
drizzled/internal/my_init.cc (+1/-1)
drizzled/internal/my_open.cc (+1/-1)
drizzled/internal/my_pthread.h (+1/-1)
drizzled/internal/my_read.cc (+1/-1)
drizzled/internal/my_redel.cc (+1/-1)
drizzled/internal/my_rename.cc (+1/-1)
drizzled/internal/my_static.cc (+1/-1)
drizzled/internal/my_static.h (+1/-1)
drizzled/internal/my_strtoll10.cc (+1/-1)
drizzled/internal/my_symlink.cc (+1/-1)
drizzled/internal/my_symlink2.cc (+1/-1)
drizzled/internal/my_sync.cc (+1/-1)
drizzled/internal/my_thr_init.cc (+1/-1)
drizzled/internal/my_write.cc (+1/-1)
drizzled/internal/ptr_cmp.cc (+1/-1)
drizzled/internal/t_ctype.h (+1/-1)
drizzled/internal/thread_var.h (+1/-1)
drizzled/item/cmpfunc.cc (+1/-1)
drizzled/item/create.cc (+1/-1)
drizzled/item/row.cc (+1/-1)
drizzled/item/subselect.cc (+1/-1)
drizzled/item/sum.cc (+1/-1)
drizzled/key.cc (+1/-1)
drizzled/lock.cc (+1/-1)
drizzled/main.cc (+1/-0)
drizzled/memory/multi_malloc.cc (+1/-1)
drizzled/memory/root.cc (+1/-1)
drizzled/memory/root.h (+1/-1)
drizzled/memory/sql_alloc.cc (+1/-1)
drizzled/message.cc (+87/-0)
drizzled/message.h (+39/-0)
drizzled/message/include.am (+1/-1)
drizzled/message/schema.proto (+5/-0)
drizzled/message/schema_writer.cc (+2/-0)
drizzled/message/statement_transform.cc (+8/-20)
drizzled/message/table.proto (+6/-1)
drizzled/module/loader.cc (+1/-1)
drizzled/my_getsystime.cc (+1/-1)
drizzled/option.cc (+1/-1)
drizzled/option.h (+1/-1)
drizzled/parser.h (+1/-1)
drizzled/plugin/schema_engine.cc (+1/-0)
drizzled/records.cc (+1/-1)
drizzled/set_var.cc (+0/-1)
drizzled/set_var.h (+0/-1)
drizzled/sql_base.cc (+1/-1)
drizzled/sql_bitmap.cc (+1/-1)
drizzled/sql_bitmap.h (+1/-1)
drizzled/sql_delete.cc (+1/-1)
drizzled/sql_derived.cc (+1/-1)
drizzled/sql_error.cc (+1/-1)
drizzled/sql_insert.cc (+1/-1)
drizzled/sql_lex.cc (+1/-1)
drizzled/sql_list.cc (+1/-1)
drizzled/sql_load.cc (+1/-1)
drizzled/sql_locale.cc (+1/-1)
drizzled/sql_parse.cc (+1/-1)
drizzled/sql_select.cc (+1/-1)
drizzled/sql_string.cc (+1/-1)
drizzled/sql_table.cc (+1/-1)
drizzled/sql_union.cc (+1/-1)
drizzled/sql_update.cc (+1/-1)
drizzled/sql_yacc.yy (+1/-1)
drizzled/statement/alter_schema.cc (+17/-6)
drizzled/statement/alter_schema.h (+0/-1)
drizzled/statement/alter_table.cc (+6/-2)
drizzled/statement/alter_table.h (+0/-1)
drizzled/statement/create_schema.cc (+2/-6)
drizzled/statement/create_schema.h (+10/-0)
drizzled/statement/create_table.cc (+2/-15)
drizzled/statement/create_table.h (+0/-3)
drizzled/status_helper.cc (+6/-10)
drizzled/strfunc.cc (+1/-1)
drizzled/structs.h (+9/-3)
drizzled/table.cc (+1/-1)
drizzled/table_list.cc (+1/-1)
drizzled/table_proto_write.cc (+1/-1)
drizzled/thr_lock.cc (+1/-1)
drizzled/thr_lock.h (+1/-1)
drizzled/tree.cc (+1/-1)
drizzled/tree.h (+1/-1)
drizzled/typelib.cc (+1/-1)
drizzled/typelib.h (+1/-1)
drizzled/unique.cc (+1/-1)
drizzled/util/convert.h (+2/-3)
drizzled/util/include.am (+1/-1)
m4/pandora_intltool.m4 (+1/-1)
m4/pkg.m4 (+1/-1)
plugin/archive/archive_engine.h (+1/-1)
plugin/archive/ha_archive.cc (+1/-1)
plugin/archive/ha_archive.h (+1/-1)
plugin/archive/plugin.cc (+1/-1)
plugin/blackhole/ha_blackhole.cc (+1/-1)
plugin/blackhole/ha_blackhole.h (+1/-1)
plugin/csv/ha_tina.cc (+1/-1)
plugin/csv/ha_tina.h (+1/-1)
plugin/csv/transparent_file.cc (+1/-1)
plugin/csv/transparent_file.h (+1/-1)
plugin/drizzle_protocol/drizzle_protocol.cc (+1/-1)
plugin/drizzle_protocol/vio.cc (+1/-1)
plugin/drizzle_protocol/vio.h (+1/-1)
plugin/drizzle_protocol/viosocket.cc (+1/-1)
plugin/filesystem_engine/transparent_file.cc (+1/-1)
plugin/filesystem_engine/transparent_file.h (+1/-1)
plugin/haildb/haildb_engine.cc (+3/-3)
plugin/innobase/btr/btr0btr.c (+2/-2)
plugin/innobase/btr/btr0cur.c (+2/-2)
plugin/innobase/btr/btr0pcur.c (+2/-2)
plugin/innobase/btr/btr0sea.c (+2/-2)
plugin/innobase/buf/buf0buddy.c (+2/-2)
plugin/innobase/buf/buf0buf.c (+2/-2)
plugin/innobase/buf/buf0flu.c (+2/-2)
plugin/innobase/buf/buf0lru.c (+2/-2)
plugin/innobase/buf/buf0rea.c (+2/-2)
plugin/innobase/data/data0data.c (+2/-2)
plugin/innobase/data/data0type.c (+2/-2)
plugin/innobase/dict/dict0boot.c (+2/-2)
plugin/innobase/dict/dict0crea.c (+2/-2)
plugin/innobase/dict/dict0dict.c (+2/-2)
plugin/innobase/dict/dict0load.c (+2/-2)
plugin/innobase/dict/dict0mem.c (+2/-2)
plugin/innobase/dyn/dyn0dyn.c (+2/-2)
plugin/innobase/eval/eval0eval.c (+2/-2)
plugin/innobase/eval/eval0proc.c (+2/-2)
plugin/innobase/fil/fil0fil.c (+2/-2)
plugin/innobase/fsp/fsp0fsp.c (+2/-2)
plugin/innobase/fut/fut0fut.c (+2/-2)
plugin/innobase/fut/fut0lst.c (+2/-2)
plugin/innobase/ha/ha0ha.c (+2/-2)
plugin/innobase/ha/ha0storage.c (+2/-2)
plugin/innobase/ha/hash0hash.c (+2/-2)
plugin/innobase/handler/data_dictionary.cc (+2/-2)
plugin/innobase/handler/ha_innodb.cc (+3/-3)
plugin/innobase/handler/ha_innodb.h (+2/-2)
plugin/innobase/handler/handler0alter.cc (+2/-2)
plugin/innobase/handler/handler0vars.h (+2/-2)
plugin/innobase/handler/internal_dictionary.cc (+2/-2)
plugin/innobase/handler/mysql_addons.cc (+2/-2)
plugin/innobase/ibuf/ibuf0ibuf.c (+2/-2)
plugin/innobase/include/btr0btr.h (+2/-2)
plugin/innobase/include/btr0btr.ic (+2/-2)
plugin/innobase/include/btr0cur.h (+2/-2)
plugin/innobase/include/btr0cur.ic (+2/-2)
plugin/innobase/include/btr0pcur.h (+2/-2)
plugin/innobase/include/btr0pcur.ic (+2/-2)
plugin/innobase/include/btr0sea.h (+2/-2)
plugin/innobase/include/btr0sea.ic (+2/-2)
plugin/innobase/include/btr0types.h (+2/-2)
plugin/innobase/include/buf0buddy.h (+2/-2)
plugin/innobase/include/buf0buddy.ic (+2/-2)
plugin/innobase/include/buf0buf.h (+2/-2)
plugin/innobase/include/buf0buf.ic (+2/-2)
plugin/innobase/include/buf0flu.h (+2/-2)
plugin/innobase/include/buf0flu.ic (+2/-2)
plugin/innobase/include/buf0lru.h (+2/-2)
plugin/innobase/include/buf0lru.ic (+2/-2)
plugin/innobase/include/buf0rea.h (+2/-2)
plugin/innobase/include/buf0types.h (+2/-2)
plugin/innobase/include/data0data.h (+2/-2)
plugin/innobase/include/data0data.ic (+2/-2)
plugin/innobase/include/data0type.h (+2/-2)
plugin/innobase/include/data0type.ic (+2/-2)
plugin/innobase/include/data0types.h (+2/-2)
plugin/innobase/include/db0err.h (+2/-2)
plugin/innobase/include/dict0boot.h (+2/-2)
plugin/innobase/include/dict0boot.ic (+2/-2)
plugin/innobase/include/dict0crea.h (+2/-2)
plugin/innobase/include/dict0crea.ic (+2/-2)
plugin/innobase/include/dict0dict.h (+2/-2)
plugin/innobase/include/dict0dict.ic (+2/-2)
plugin/innobase/include/dict0load.h (+2/-2)
plugin/innobase/include/dict0load.ic (+2/-2)
plugin/innobase/include/dict0mem.h (+2/-2)
plugin/innobase/include/dict0mem.ic (+2/-2)
plugin/innobase/include/dict0types.h (+2/-2)
plugin/innobase/include/dyn0dyn.h (+2/-2)
plugin/innobase/include/dyn0dyn.ic (+2/-2)
plugin/innobase/include/eval0eval.h (+2/-2)
plugin/innobase/include/eval0eval.ic (+2/-2)
plugin/innobase/include/eval0proc.h (+2/-2)
plugin/innobase/include/eval0proc.ic (+2/-2)
plugin/innobase/include/fil0fil.h (+2/-2)
plugin/innobase/include/fsp0fsp.h (+2/-2)
plugin/innobase/include/fsp0fsp.ic (+2/-2)
plugin/innobase/include/fsp0types.h (+2/-2)
plugin/innobase/include/fut0fut.h (+2/-2)
plugin/innobase/include/fut0fut.ic (+2/-2)
plugin/innobase/include/fut0lst.h (+2/-2)
plugin/innobase/include/fut0lst.ic (+2/-2)
plugin/innobase/include/ha0ha.h (+2/-2)
plugin/innobase/include/ha0ha.ic (+2/-2)
plugin/innobase/include/ha0storage.h (+2/-2)
plugin/innobase/include/ha0storage.ic (+2/-2)
plugin/innobase/include/ha_prototypes.h (+2/-2)
plugin/innobase/include/handler0alter.h (+2/-2)
plugin/innobase/include/hash0hash.h (+2/-2)
plugin/innobase/include/hash0hash.ic (+2/-2)
plugin/innobase/include/ibuf0ibuf.h (+2/-2)
plugin/innobase/include/ibuf0ibuf.ic (+2/-2)
plugin/innobase/include/ibuf0types.h (+2/-2)
plugin/innobase/include/lock0iter.h (+2/-2)
plugin/innobase/include/lock0lock.h (+2/-2)
plugin/innobase/include/lock0lock.ic (+2/-2)
plugin/innobase/include/lock0priv.h (+2/-2)
plugin/innobase/include/lock0priv.ic (+2/-2)
plugin/innobase/include/lock0types.h (+2/-2)
plugin/innobase/include/log0log.h (+4/-4)
plugin/innobase/include/log0log.ic (+2/-2)
plugin/innobase/include/log0recv.h (+2/-2)
plugin/innobase/include/log0recv.ic (+2/-2)
plugin/innobase/include/mach0data.h (+2/-2)
plugin/innobase/include/mach0data.ic (+2/-2)
plugin/innobase/include/mem0dbg.h (+2/-2)
plugin/innobase/include/mem0dbg.ic (+2/-2)
plugin/innobase/include/mem0mem.h (+2/-2)
plugin/innobase/include/mem0mem.ic (+2/-2)
plugin/innobase/include/mem0pool.h (+2/-2)
plugin/innobase/include/mem0pool.ic (+2/-2)
plugin/innobase/include/mtr0log.h (+2/-2)
plugin/innobase/include/mtr0log.ic (+2/-2)
plugin/innobase/include/mtr0mtr.h (+2/-2)
plugin/innobase/include/mtr0mtr.ic (+2/-2)
plugin/innobase/include/mtr0types.h (+2/-2)
plugin/innobase/include/mysql_addons.h (+2/-2)
plugin/innobase/include/os0file.h (+3/-3)
plugin/innobase/include/os0proc.h (+2/-2)
plugin/innobase/include/os0proc.ic (+2/-2)
plugin/innobase/include/os0sync.h (+2/-2)
plugin/innobase/include/os0sync.ic (+2/-2)
plugin/innobase/include/os0thread.h (+2/-2)
plugin/innobase/include/os0thread.ic (+2/-2)
plugin/innobase/include/page0cur.h (+2/-2)
plugin/innobase/include/page0cur.ic (+2/-2)
plugin/innobase/include/page0page.h (+2/-2)
plugin/innobase/include/page0page.ic (+2/-2)
plugin/innobase/include/page0types.h (+2/-2)
plugin/innobase/include/page0zip.h (+2/-2)
plugin/innobase/include/page0zip.ic (+2/-2)
plugin/innobase/include/pars0opt.h (+2/-2)
plugin/innobase/include/pars0opt.ic (+2/-2)
plugin/innobase/include/pars0pars.h (+2/-2)
plugin/innobase/include/pars0pars.ic (+2/-2)
plugin/innobase/include/pars0sym.h (+2/-2)
plugin/innobase/include/pars0sym.ic (+2/-2)
plugin/innobase/include/pars0types.h (+2/-2)
plugin/innobase/include/que0que.h (+2/-2)
plugin/innobase/include/que0que.ic (+2/-2)
plugin/innobase/include/que0types.h (+2/-2)
plugin/innobase/include/read0read.h (+2/-2)
plugin/innobase/include/read0read.ic (+2/-2)
plugin/innobase/include/read0types.h (+2/-2)
plugin/innobase/include/rem0cmp.h (+2/-2)
plugin/innobase/include/rem0cmp.ic (+2/-2)
plugin/innobase/include/rem0rec.h (+2/-2)
plugin/innobase/include/rem0rec.ic (+2/-2)
plugin/innobase/include/rem0types.h (+2/-2)
plugin/innobase/include/row0ext.h (+2/-2)
plugin/innobase/include/row0ext.ic (+2/-2)
plugin/innobase/include/row0ins.h (+2/-2)
plugin/innobase/include/row0ins.ic (+2/-2)
plugin/innobase/include/row0merge.h (+2/-2)
plugin/innobase/include/row0mysql.h (+2/-2)
plugin/innobase/include/row0mysql.ic (+2/-2)
plugin/innobase/include/row0purge.h (+2/-2)
plugin/innobase/include/row0purge.ic (+2/-2)
plugin/innobase/include/row0row.h (+2/-2)
plugin/innobase/include/row0row.ic (+2/-2)
plugin/innobase/include/row0sel.h (+2/-2)
plugin/innobase/include/row0sel.ic (+2/-2)
plugin/innobase/include/row0types.h (+2/-2)
plugin/innobase/include/row0uins.h (+2/-2)
plugin/innobase/include/row0uins.ic (+2/-2)
plugin/innobase/include/row0umod.h (+2/-2)
plugin/innobase/include/row0umod.ic (+2/-2)
plugin/innobase/include/row0undo.h (+2/-2)
plugin/innobase/include/row0undo.ic (+2/-2)
plugin/innobase/include/row0upd.h (+2/-2)
plugin/innobase/include/row0upd.ic (+2/-2)
plugin/innobase/include/row0vers.h (+2/-2)
plugin/innobase/include/row0vers.ic (+2/-2)
plugin/innobase/include/srv0que.h (+2/-2)
plugin/innobase/include/srv0srv.h (+3/-3)
plugin/innobase/include/srv0srv.ic (+2/-2)
plugin/innobase/include/srv0start.h (+2/-2)
plugin/innobase/include/sync0arr.h (+2/-2)
plugin/innobase/include/sync0arr.ic (+2/-2)
plugin/innobase/include/sync0rw.h (+2/-2)
plugin/innobase/include/sync0rw.ic (+2/-2)
plugin/innobase/include/sync0sync.h (+2/-2)
plugin/innobase/include/sync0sync.ic (+2/-2)
plugin/innobase/include/sync0types.h (+2/-2)
plugin/innobase/include/thr0loc.h (+2/-2)
plugin/innobase/include/thr0loc.ic (+2/-2)
plugin/innobase/include/trx0i_s.h (+2/-2)
plugin/innobase/include/trx0purge.h (+2/-2)
plugin/innobase/include/trx0purge.ic (+2/-2)
plugin/innobase/include/trx0rec.h (+2/-2)
plugin/innobase/include/trx0rec.ic (+2/-2)
plugin/innobase/include/trx0roll.h (+2/-2)
plugin/innobase/include/trx0roll.ic (+2/-2)
plugin/innobase/include/trx0rseg.h (+2/-2)
plugin/innobase/include/trx0rseg.ic (+2/-2)
plugin/innobase/include/trx0sys.h (+2/-2)
plugin/innobase/include/trx0sys.ic (+2/-2)
plugin/innobase/include/trx0trx.h (+2/-2)
plugin/innobase/include/trx0trx.ic (+2/-2)
plugin/innobase/include/trx0types.h (+2/-2)
plugin/innobase/include/trx0undo.h (+2/-2)
plugin/innobase/include/trx0undo.ic (+2/-2)
plugin/innobase/include/trx0xa.h (+2/-2)
plugin/innobase/include/univ.i (+2/-2)
plugin/innobase/include/usr0sess.h (+2/-2)
plugin/innobase/include/usr0sess.ic (+2/-2)
plugin/innobase/include/usr0types.h (+2/-2)
plugin/innobase/include/ut0byte.h (+2/-2)
plugin/innobase/include/ut0byte.ic (+2/-2)
plugin/innobase/include/ut0dbg.h (+2/-2)
plugin/innobase/include/ut0list.h (+2/-2)
plugin/innobase/include/ut0list.ic (+2/-2)
plugin/innobase/include/ut0lst.h (+2/-2)
plugin/innobase/include/ut0mem.h (+2/-2)
plugin/innobase/include/ut0mem.ic (+2/-2)
plugin/innobase/include/ut0rnd.h (+2/-2)
plugin/innobase/include/ut0rnd.ic (+2/-2)
plugin/innobase/include/ut0sort.h (+2/-2)
plugin/innobase/include/ut0ut.h (+2/-2)
plugin/innobase/include/ut0ut.ic (+2/-2)
plugin/innobase/include/ut0vec.h (+2/-2)
plugin/innobase/include/ut0vec.ic (+2/-2)
plugin/innobase/include/ut0wqueue.h (+2/-2)
plugin/innobase/lock/lock0iter.c (+2/-2)
plugin/innobase/lock/lock0lock.c (+2/-2)
plugin/innobase/log/log0log.c (+4/-4)
plugin/innobase/log/log0recv.c (+2/-2)
plugin/innobase/mach/mach0data.c (+2/-2)
plugin/innobase/mem/mem0dbg.c (+2/-2)
plugin/innobase/mem/mem0mem.c (+2/-2)
plugin/innobase/mem/mem0pool.c (+2/-2)
plugin/innobase/mtr/mtr0log.c (+2/-2)
plugin/innobase/mtr/mtr0mtr.c (+2/-2)
plugin/innobase/os/os0file.c (+3/-3)
plugin/innobase/os/os0proc.c (+2/-2)
plugin/innobase/os/os0sync.c (+2/-2)
plugin/innobase/os/os0thread.c (+2/-2)
plugin/innobase/page/page0cur.c (+2/-2)
plugin/innobase/page/page0page.c (+2/-2)
plugin/innobase/page/page0zip.c (+2/-2)
plugin/innobase/pars/pars0opt.c (+2/-2)
plugin/innobase/pars/pars0pars.c (+2/-2)
plugin/innobase/pars/pars0sym.c (+2/-2)
plugin/innobase/plugin.ac (+2/-2)
plugin/innobase/plugin.am (+1/-1)
plugin/innobase/que/que0que.c (+2/-2)
plugin/innobase/read/read0read.c (+2/-2)
plugin/innobase/rem/rem0cmp.c (+2/-2)
plugin/innobase/rem/rem0rec.c (+2/-2)
plugin/innobase/row/row0ext.c (+2/-2)
plugin/innobase/row/row0ins.c (+2/-2)
plugin/innobase/row/row0merge.c (+2/-2)
plugin/innobase/row/row0mysql.c (+2/-2)
plugin/innobase/row/row0purge.c (+2/-2)
plugin/innobase/row/row0row.c (+2/-2)
plugin/innobase/row/row0sel.c (+2/-2)
plugin/innobase/row/row0uins.c (+2/-2)
plugin/innobase/row/row0umod.c (+2/-2)
plugin/innobase/row/row0undo.c (+2/-2)
plugin/innobase/row/row0upd.c (+2/-2)
plugin/innobase/row/row0vers.c (+2/-2)
plugin/innobase/srv/srv0que.c (+2/-2)
plugin/innobase/srv/srv0srv.c (+3/-3)
plugin/innobase/srv/srv0start.c (+3/-3)
plugin/innobase/sync/sync0arr.c (+2/-2)
plugin/innobase/sync/sync0rw.c (+2/-2)
plugin/innobase/sync/sync0sync.c (+2/-2)
plugin/innobase/thr/thr0loc.c (+2/-2)
plugin/innobase/trx/trx0i_s.c (+2/-2)
plugin/innobase/trx/trx0purge.c (+2/-2)
plugin/innobase/trx/trx0rec.c (+2/-2)
plugin/innobase/trx/trx0roll.c (+2/-2)
plugin/innobase/trx/trx0rseg.c (+2/-2)
plugin/innobase/trx/trx0sys.c (+2/-2)
plugin/innobase/trx/trx0trx.c (+2/-2)
plugin/innobase/trx/trx0undo.c (+2/-2)
plugin/innobase/usr/usr0sess.c (+2/-2)
plugin/innobase/ut/ut0auxconf_atomic_pthread_t_gcc.c (+2/-2)
plugin/innobase/ut/ut0auxconf_atomic_pthread_t_solaris.c (+2/-2)
plugin/innobase/ut/ut0auxconf_have_solaris_atomics.c (+2/-2)
plugin/innobase/ut/ut0auxconf_pause.c (+2/-2)
plugin/innobase/ut/ut0auxconf_sizeof_pthread_t.c (+2/-2)
plugin/innobase/ut/ut0byte.c (+2/-2)
plugin/innobase/ut/ut0dbg.c (+2/-2)
plugin/innobase/ut/ut0list.c (+2/-2)
plugin/innobase/ut/ut0mem.c (+2/-2)
plugin/innobase/ut/ut0rnd.c (+2/-2)
plugin/innobase/ut/ut0ut.c (+2/-2)
plugin/innobase/ut/ut0vec.c (+2/-2)
plugin/innobase/ut/ut0wqueue.c (+2/-2)
plugin/memcached_functions/start_mc.sh.in (+32/-0)
plugin/memory/ha_heap.cc (+1/-1)
plugin/memory/ha_heap.h (+1/-1)
plugin/memory/heap.h (+1/-1)
plugin/memory/heap_priv.h (+1/-1)
plugin/memory/hp_block.cc (+1/-1)
plugin/memory/hp_clear.cc (+1/-1)
plugin/memory/hp_close.cc (+1/-1)
plugin/memory/hp_create.cc (+1/-1)
plugin/memory/hp_delete.cc (+1/-1)
plugin/memory/hp_dspace.cc (+1/-1)
plugin/memory/hp_extra.cc (+1/-1)
plugin/memory/hp_hash.cc (+1/-1)
plugin/memory/hp_info.cc (+1/-1)
plugin/memory/hp_open.cc (+1/-1)
plugin/memory/hp_panic.cc (+1/-1)
plugin/memory/hp_record.cc (+1/-1)
plugin/memory/hp_rectest.cc (+1/-1)
plugin/memory/hp_rename.cc (+1/-1)
plugin/memory/hp_rfirst.cc (+1/-1)
plugin/memory/hp_rkey.cc (+1/-1)
plugin/memory/hp_rlast.cc (+1/-1)
plugin/memory/hp_rnext.cc (+1/-1)
plugin/memory/hp_rprev.cc (+1/-1)
plugin/memory/hp_rrnd.cc (+1/-1)
plugin/memory/hp_rsame.cc (+1/-1)
plugin/memory/hp_scan.cc (+1/-1)
plugin/memory/hp_static.cc (+1/-1)
plugin/memory/hp_update.cc (+1/-1)
plugin/memory/hp_write.cc (+1/-1)
plugin/memory/plugin.am (+1/-1)
plugin/multi_thread/multi_thread.h (+1/-1)
plugin/myisam/ha_myisam.cc (+1/-1)
plugin/myisam/ha_myisam.h (+1/-1)
plugin/myisam/keycache.h (+1/-1)
plugin/myisam/mf_keycache.cc (+1/-1)
plugin/myisam/mi_cache.cc (+1/-1)
plugin/myisam/mi_check.cc (+1/-1)
plugin/myisam/mi_checksum.cc (+1/-1)
plugin/myisam/mi_close.cc (+1/-1)
plugin/myisam/mi_create.cc (+1/-1)
plugin/myisam/mi_delete.cc (+1/-1)
plugin/myisam/mi_delete_all.cc (+1/-1)
plugin/myisam/mi_delete_table.cc (+1/-1)
plugin/myisam/mi_dynrec.cc (+1/-1)
plugin/myisam/mi_extra.cc (+1/-1)
plugin/myisam/mi_info.cc (+1/-1)
plugin/myisam/mi_key.cc (+1/-1)
plugin/myisam/mi_locking.cc (+1/-1)
plugin/myisam/mi_open.cc (+1/-1)
plugin/myisam/mi_page.cc (+1/-1)
plugin/myisam/mi_panic.cc (+1/-1)
plugin/myisam/mi_preload.cc (+1/-1)
plugin/myisam/mi_range.cc (+1/-1)
plugin/myisam/mi_rename.cc (+1/-1)
plugin/myisam/mi_rfirst.cc (+1/-1)
plugin/myisam/mi_rkey.cc (+1/-1)
plugin/myisam/mi_rlast.cc (+1/-1)
plugin/myisam/mi_rnext.cc (+1/-1)
plugin/myisam/mi_rnext_same.cc (+1/-1)
plugin/myisam/mi_rprev.cc (+1/-1)
plugin/myisam/mi_rrnd.cc (+1/-1)
plugin/myisam/mi_rsame.cc (+1/-1)
plugin/myisam/mi_scan.cc (+1/-1)
plugin/myisam/mi_search.cc (+1/-1)
plugin/myisam/mi_static.cc (+1/-1)
plugin/myisam/mi_statrec.cc (+1/-1)
plugin/myisam/mi_unique.cc (+1/-1)
plugin/myisam/mi_update.cc (+1/-1)
plugin/myisam/mi_write.cc (+1/-1)
plugin/myisam/my_handler.h (+2/-2)
plugin/myisam/my_pread.cc (+1/-1)
plugin/myisam/myisam.h (+1/-1)
plugin/myisam/myisam_priv.h (+1/-1)
plugin/myisam/myisampack.h (+1/-1)
plugin/myisam/sort.cc (+1/-1)
plugin/mysql_protocol/mysql_protocol.cc (+1/-1)
plugin/mysql_protocol/vio.cc (+1/-1)
plugin/mysql_protocol/vio.h (+1/-1)
plugin/pbms/src/TransTest.cc (+1/-1)
plugin/pbms/src/alias_ms.cc (+1/-1)
plugin/pbms/src/alias_ms.h (+1/-1)
plugin/pbms/src/api_ms.cc (+1/-1)
plugin/pbms/src/backup_ms.cc (+1/-1)
plugin/pbms/src/backup_ms.h (+1/-1)
plugin/pbms/src/cloud_ms.cc (+1/-1)
plugin/pbms/src/cloud_ms.h (+1/-1)
plugin/pbms/src/compactor_ms.cc (+1/-1)
plugin/pbms/src/compactor_ms.h (+1/-1)
plugin/pbms/src/connection_handler_ms.cc (+1/-1)
plugin/pbms/src/connection_handler_ms.h (+1/-1)
plugin/pbms/src/cslib/CSConfig.h (+1/-1)
plugin/pbms/src/cslib/CSDefs.h (+1/-1)
plugin/pbms/src/cslib/CSDirectory.cc (+1/-1)
plugin/pbms/src/cslib/CSDirectory.h (+1/-1)
plugin/pbms/src/cslib/CSEncode.cc (+1/-1)
plugin/pbms/src/cslib/CSEncode.h (+1/-1)
plugin/pbms/src/cslib/CSException.cc (+1/-1)
plugin/pbms/src/cslib/CSException.h (+1/-1)
plugin/pbms/src/cslib/CSFile.cc (+1/-1)
plugin/pbms/src/cslib/CSFile.h (+1/-1)
plugin/pbms/src/cslib/CSGlobal.h (+1/-1)
plugin/pbms/src/cslib/CSHTTPStream.cc (+1/-1)
plugin/pbms/src/cslib/CSHTTPStream.h (+1/-1)
plugin/pbms/src/cslib/CSLog.cc (+1/-1)
plugin/pbms/src/cslib/CSLog.h (+1/-1)
plugin/pbms/src/cslib/CSMd5.h (+1/-1)
plugin/pbms/src/cslib/CSMemory.cc (+1/-1)
plugin/pbms/src/cslib/CSMemory.h (+1/-1)
plugin/pbms/src/cslib/CSMutex.cc (+1/-1)
plugin/pbms/src/cslib/CSMutex.h (+1/-1)
plugin/pbms/src/cslib/CSObject.cc (+1/-1)
plugin/pbms/src/cslib/CSObject.h (+1/-1)
plugin/pbms/src/cslib/CSPath.cc (+1/-1)
plugin/pbms/src/cslib/CSPath.h (+1/-1)
plugin/pbms/src/cslib/CSS3Protocol.cc (+1/-1)
plugin/pbms/src/cslib/CSS3Protocol.h (+1/-1)
plugin/pbms/src/cslib/CSSha1.cc (+1/-1)
plugin/pbms/src/cslib/CSSha1.h (+1/-1)
plugin/pbms/src/cslib/CSSocket.cc (+1/-1)
plugin/pbms/src/cslib/CSSocket.h (+1/-1)
plugin/pbms/src/cslib/CSStorage.cc (+1/-1)
plugin/pbms/src/cslib/CSStorage.h (+1/-1)
plugin/pbms/src/cslib/CSStrUtil.cc (+1/-1)
plugin/pbms/src/cslib/CSStrUtil.h (+1/-1)
plugin/pbms/src/cslib/CSStream.cc (+1/-1)
plugin/pbms/src/cslib/CSStream.h (+1/-1)
plugin/pbms/src/cslib/CSString.cc (+1/-1)
plugin/pbms/src/cslib/CSString.h (+1/-1)
plugin/pbms/src/cslib/CSThread.cc (+1/-1)
plugin/pbms/src/cslib/CSThread.h (+1/-1)
plugin/pbms/src/cslib/CSTime.cc (+1/-1)
plugin/pbms/src/cslib/CSTime.h (+1/-1)
plugin/pbms/src/cslib/CSUTF8.cc (+1/-1)
plugin/pbms/src/cslib/CSUTF8.h (+1/-1)
plugin/pbms/src/cslib/CSXML.cc (+1/-1)
plugin/pbms/src/cslib/CSXML.h (+1/-1)
plugin/pbms/src/database_ms.cc (+1/-1)
plugin/pbms/src/database_ms.h (+1/-1)
plugin/pbms/src/defs_ms.h (+1/-1)
plugin/pbms/src/discover_ms.cc (+1/-1)
plugin/pbms/src/discover_ms.h (+1/-1)
plugin/pbms/src/engine_ms.cc (+1/-1)
plugin/pbms/src/engine_ms.h (+1/-1)
plugin/pbms/src/ha_pbms.cc (+1/-1)
plugin/pbms/src/ha_pbms.h (+1/-1)
plugin/pbms/src/metadata_ms.cc (+1/-1)
plugin/pbms/src/metadata_ms.h (+1/-1)
plugin/pbms/src/mysql_ms.cc (+1/-1)
plugin/pbms/src/mysql_ms.h (+1/-1)
plugin/pbms/src/network_ms.cc (+1/-1)
plugin/pbms/src/network_ms.h (+1/-1)
plugin/pbms/src/open_table_ms.cc (+1/-1)
plugin/pbms/src/open_table_ms.h (+1/-1)
plugin/pbms/src/parameters_ms.cc (+1/-1)
plugin/pbms/src/parameters_ms.h (+1/-1)
plugin/pbms/src/pbmslib.h (+1/-1)
plugin/pbms/src/plugin_ms.cc (+1/-1)
plugin/pbms/src/repository_ms.cc (+1/-1)
plugin/pbms/src/repository_ms.h (+1/-1)
plugin/pbms/src/systab_backup_ms.cc (+1/-1)
plugin/pbms/src/systab_backup_ms.h (+1/-1)
plugin/pbms/src/systab_cloud_ms.cc (+1/-1)
plugin/pbms/src/systab_cloud_ms.h (+1/-1)
plugin/pbms/src/systab_dump_ms.cc (+1/-1)
plugin/pbms/src/systab_dump_ms.h (+1/-1)
plugin/pbms/src/systab_enabled_ms.cc (+1/-1)
plugin/pbms/src/systab_enabled_ms.h (+1/-1)
plugin/pbms/src/systab_httpheader_ms.cc (+1/-1)
plugin/pbms/src/systab_httpheader_ms.h (+1/-1)
plugin/pbms/src/systab_util_ms.cc (+1/-1)
plugin/pbms/src/systab_util_ms.h (+1/-1)
plugin/pbms/src/systab_variable_ms.cc (+1/-1)
plugin/pbms/src/systab_variable_ms.h (+1/-1)
plugin/pbms/src/system_table_ms.cc (+1/-1)
plugin/pbms/src/system_table_ms.h (+1/-1)
plugin/pbms/src/table_ms.cc (+1/-1)
plugin/pbms/src/table_ms.h (+1/-1)
plugin/pbms/src/temp_log_ms.cc (+1/-1)
plugin/pbms/src/temp_log_ms.h (+1/-1)
plugin/pbms/src/trans_cache_ms.cc (+1/-1)
plugin/pbms/src/trans_cache_ms.h (+1/-1)
plugin/pbms/src/trans_log_ms.cc (+1/-1)
plugin/pbms/src/trans_log_ms.h (+1/-1)
plugin/pbms/src/transaction_ms.cc (+1/-1)
plugin/pbms/src/transaction_ms.h (+1/-1)
plugin/pbms/src/udf_ms.cc (+1/-1)
plugin/pbms/src/version_ms.h (+1/-1)
plugin/pbxt/bin/xtstat_xt.cc (+1/-1)
plugin/pbxt/src/backup_xt.cc (+1/-1)
plugin/pbxt/src/backup_xt.h (+1/-1)
plugin/pbxt/src/bsearch_xt.cc (+1/-1)
plugin/pbxt/src/bsearch_xt.h (+1/-1)
plugin/pbxt/src/cache_xt.cc (+1/-1)
plugin/pbxt/src/cache_xt.h (+1/-1)
plugin/pbxt/src/ccutils_xt.cc (+1/-1)
plugin/pbxt/src/ccutils_xt.h (+1/-1)
plugin/pbxt/src/database_xt.cc (+1/-1)
plugin/pbxt/src/database_xt.h (+1/-1)
plugin/pbxt/src/datadic_xt.cc (+1/-1)
plugin/pbxt/src/datadic_xt.h (+1/-1)
plugin/pbxt/src/datalog_xt.cc (+1/-1)
plugin/pbxt/src/datalog_xt.h (+1/-1)
plugin/pbxt/src/discover_xt.cc (+1/-1)
plugin/pbxt/src/discover_xt.h (+1/-1)
plugin/pbxt/src/filesys_xt.cc (+1/-1)
plugin/pbxt/src/filesys_xt.h (+1/-1)
plugin/pbxt/src/ha_pbxt.cc (+1/-1)
plugin/pbxt/src/ha_pbxt.h (+1/-1)
plugin/pbxt/src/ha_xtsys.cc (+1/-1)
plugin/pbxt/src/ha_xtsys.h (+1/-1)
plugin/pbxt/src/hashtab_xt.cc (+1/-1)
plugin/pbxt/src/hashtab_xt.h (+1/-1)
plugin/pbxt/src/heap_xt.cc (+1/-1)
plugin/pbxt/src/heap_xt.h (+1/-1)
plugin/pbxt/src/index_xt.cc (+1/-1)
plugin/pbxt/src/index_xt.h (+1/-1)
plugin/pbxt/src/iotest_xt.c (+1/-1)
plugin/pbxt/src/linklist_xt.cc (+1/-1)
plugin/pbxt/src/linklist_xt.h (+1/-1)
plugin/pbxt/src/lock_xt.cc (+1/-1)
plugin/pbxt/src/lock_xt.h (+1/-1)
plugin/pbxt/src/locklist_xt.cc (+1/-1)
plugin/pbxt/src/locklist_xt.h (+1/-1)
plugin/pbxt/src/memory_xt.cc (+1/-1)
plugin/pbxt/src/memory_xt.h (+1/-1)
plugin/pbxt/src/myxt_xt.cc (+1/-1)
plugin/pbxt/src/myxt_xt.h (+1/-1)
plugin/pbxt/src/pbms.h (+1/-1)
plugin/pbxt/src/pbms_enabled.cc (+1/-1)
plugin/pbxt/src/pbms_enabled.h (+1/-1)
plugin/pbxt/src/pthread_xt.cc (+1/-1)
plugin/pbxt/src/pthread_xt.h (+1/-1)
plugin/pbxt/src/restart_xt.cc (+1/-1)
plugin/pbxt/src/restart_xt.h (+1/-1)
plugin/pbxt/src/sortedlist_xt.cc (+1/-1)
plugin/pbxt/src/sortedlist_xt.h (+1/-1)
plugin/pbxt/src/strutil_xt.cc (+1/-1)
plugin/pbxt/src/strutil_xt.h (+1/-1)
plugin/pbxt/src/systab_xt.cc (+1/-1)
plugin/pbxt/src/systab_xt.h (+1/-1)
plugin/pbxt/src/tabcache_xt.cc (+1/-1)
plugin/pbxt/src/tabcache_xt.h (+1/-1)
plugin/pbxt/src/table_xt.cc (+1/-1)
plugin/pbxt/src/table_xt.h (+1/-1)
plugin/pbxt/src/thread_xt.cc (+1/-1)
plugin/pbxt/src/thread_xt.h (+1/-1)
plugin/pbxt/src/trace_xt.cc (+1/-1)
plugin/pbxt/src/trace_xt.h (+1/-1)
plugin/pbxt/src/util_xt.cc (+1/-1)
plugin/pbxt/src/util_xt.h (+1/-1)
plugin/pbxt/src/win_inttypes.h (+2/-2)
plugin/pbxt/src/xaction_xt.cc (+1/-1)
plugin/pbxt/src/xaction_xt.h (+1/-1)
plugin/pbxt/src/xactlog_xt.cc (+1/-1)
plugin/pbxt/src/xactlog_xt.h (+1/-1)
plugin/pbxt/src/xt_config.h (+1/-1)
plugin/pbxt/src/xt_defs.h (+1/-1)
plugin/pbxt/src/xt_errno.h (+1/-1)
plugin/pool_of_threads/session_scheduler.cc (+1/-1)
plugin/pool_of_threads/session_scheduler.h (+1/-1)
plugin/schema_dictionary/schemas.cc (+8/-0)
plugin/schema_dictionary/tables.cc (+19/-0)
plugin/schema_dictionary/tests/r/data_dictionary.result (+28/-3)
plugin/schema_dictionary/tests/r/schema_version.result (+30/-0)
plugin/schema_dictionary/tests/r/table_version.result (+30/-0)
plugin/schema_dictionary/tests/t/schema_version.test (+27/-0)
plugin/schema_dictionary/tests/t/table_version.test (+27/-0)
plugin/transaction_log/print_transaction_message.cc (+10/-0)
plugin/transaction_log/tests/r/bulk_commit.result (+2/-0)
plugin/transaction_log/tests/r/bulk_rollback.result (+2/-0)
plugin/transaction_log/tests/r/transaction_log_alter.result (+136/-120)
plugin/transaction_log/tests/r/transaction_log_create.result (+76/-40)
plugin/transaction_log/tests/r/transaction_log_data_type.result (+646/-646)
plugin/transaction_log/tests/r/transaction_log_delete.result (+90/-90)
plugin/transaction_log/tests/r/transaction_log_drop.result (+23/-23)
plugin/transaction_log/tests/r/transaction_log_large_blob.result (+4/-4)
plugin/transaction_log/tests/r/transaction_log_loaddata.result (+4/-4)
plugin/transaction_log/tests/r/transaction_log_replace.result (+28/-28)
plugin/transaction_log/tests/r/transaction_log_rollback.result (+4/-4)
plugin/transaction_log/tests/r/transaction_log_schema.result (+24/-20)
plugin/transaction_log/tests/r/transaction_log_transaction.result (+92/-90)
plugin/transaction_log/tests/r/transaction_log_update.result (+108/-108)
support-files/include.am (+2/-2)
tests/Makefile.am (+2/-2)
tests/include.am (+2/-2)
tests/r/data_dictionary_like_info.result (+4/-4)
tests/r/randgen_queries.result (+40/-40)
To merge this branch: bzr merge lp://qastaging/~linuxjedi/drizzle/elliott-bug-653471
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+37341@code.qastaging.launchpad.net

Description of the change

Add -A to drizzle client
Remove --compress from all clients

Note: this will probably conflict on drizzledump.rst on the compress option when merging as I think I changed it on another branch too. Please remove the compress option in it (as in this branch) if that happens.

To post a comment you must log in.
Revision history for this message
Lee Bieber (kalebral-deactivatedaccount) wrote :

Getting merge conflicts

% bzr merge lp:~linuxjedi/drizzle/elliott-bug-653471 M client/drizzle.cc
 M client/drizzledump.cc
 M client/drizzletest.cc
 M docs/clients/drizzledump.rst
Text conflict in client/drizzledump.cc
Text conflict in docs/clients/drizzledump.rst
2 conflicts encountered.

Revision history for this message
Andrew Hutchings (linuxjedi) wrote :

Merged with trunk and fixed conflicts.

1806. By Andrew Hutchings

merge with trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches