lp://qastaging/~brianaker/drizzle/bit-functions

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/drizzle/7.0 at revision 2198

Drizzle Developers: Pending requested 2011-02-24

Diff: 1968 lines (+1106/-86)

45 files modified

client/drizzle.cc (+55/-28)
drizzled/common.h (+1/-0)
drizzled/display.cc (+5/-0)
drizzled/function/bit.h (+64/-0)
drizzled/function/bit/functions.cc (+139/-0)
drizzled/function/bit/functions.h (+94/-0)
drizzled/include.am (+5/-0)
drizzled/kill.cc (+43/-0)
drizzled/kill.h (+33/-0)
drizzled/parser.h (+1/-0)
drizzled/plugin/client.h (+11/-1)
drizzled/sql_parse.cc (+26/-3)
drizzled/sql_yacc.yy (+39/-6)
drizzled/statement/kill.cc (+3/-16)
drizzled/statement/kill.h (+0/-3)
drizzled/symbol_hash.gperf (+4/-0)
libdrizzle/command.c (+4/-4)
libdrizzle/conn.c (+13/-2)
libdrizzle/conn_client.h (+6/-0)
libdrizzle/constants.h (+6/-1)
libdrizzle/handshake.c (+5/-0)
plugin/console/console.cc (+6/-1)
plugin/information_schema_dictionary/tests/r/tables.result (+4/-0)
plugin/mysql_protocol/mysql_protocol.cc (+14/-0)
plugin/mysql_protocol/mysql_protocol.h (+11/-0)
plugin/mysql_protocol/options.h (+2/-0)
plugin/schema_dictionary/tests/r/data_dictionary.result (+52/-4)
plugin/session_dictionary/dictionary.cc (+1/-0)
plugin/session_dictionary/dictionary.h (+1/-0)
plugin/session_dictionary/plugin.ini (+2/-0)
plugin/session_dictionary/sessions.cc (+149/-0)
plugin/session_dictionary/sessions.h (+55/-0)
plugin/session_dictionary/tests/r/sessions.result (+3/-0)
plugin/session_dictionary/tests/t/sessions.test (+3/-0)
plugin/sleep/plugin.ini (+4/-2)
plugin/utility_functions/bit_count.cc (+119/-0)
plugin/utility_functions/bit_count.h (+48/-0)
plugin/utility_functions/functions.cc (+1/-0)
plugin/utility_functions/functions.h (+1/-0)
plugin/utility_functions/plugin.ini (+2/-0)
tests/r/func_op.result (+43/-12)
tests/r/information_schema.result (+2/-0)
tests/suite/regression/r/722850.result (+3/-0)
tests/suite/regression/t/722850.test (+5/-0)
tests/t/func_op.test (+18/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2196. By Brian Aker on 2011-02-23

Bit functions/fix for <<

2195. By Brian Aker on 2011-02-23

Merge trunk.

2194. By Lee Bieber on 2011-02-23

Merge Andrew - 723389: ORDER BY on sys_replication_log table causes InnoDB crash
Merge Marisa - documentation updates

2193. By Brian Aker on 2011-02-22

Rollup changes in build.

2192. By Lee Bieber on 2011-02-22

Merge Patrick - 722884: mysql_protocol.prototest is taking too long to execute

2191. By Brian Aker on 2011-02-22

List update, header fixes, multiple symbols, and David deletes some code.

2190. By Brian Aker on 2011-02-22

Merge in Monty/Andrew's boolean MySQL compatible patch.

2189. By Brian Aker on 2011-02-22

Merge: This cleans up the the error message system by providing for the ability to

2188. By Lee Bieber on 2011-02-21

Merge Brian - getLex() usage and fix for table_name creation during admin commands.
Merge Olaf - Use List::begin() and Use List::iterator instead of List_iterator_fast

2187. By Brian Aker on 2011-02-20

Brian Aker 2011-02-20 Merge in additional header bits for strerror_r
Brian Aker 2011-02-20 Create CONST on additional Field methods.
Brian Aker 2011-02-19 Further commit const on field.
Brian Aker 2011-02-18 This fixes DEBUG based compiles.
Brian Aker 2011-02-18 Protect all of the val_* methods from modification.