Merge lp://qastaging/~patrick-crews/drizzle/dbqp_libdrizzle_fix into lp://qastaging/~mordred/drizzle/libdrizzle-2.0

client/drizzletest.cc (+3/-8)
drizzled/cached_item.cc (+2/-2)
drizzled/catalog/cache.h (+1/-0)
drizzled/cursor.cc (+8/-31)
drizzled/diagnostics_area.h (+5/-1)
drizzled/drizzled.cc (+2/-0)
drizzled/error.cc (+3/-8)
drizzled/error.h (+21/-13)
drizzled/field/blob.cc (+1/-0)
drizzled/field/date.cc (+1/-0)
drizzled/field/time.cc (+6/-10)
drizzled/field_conv.cc (+1/-0)
drizzled/filesort.cc (+2/-0)
drizzled/function/math/divide.cc (+2/-2)
drizzled/function/str/concat.cc (+2/-2)
drizzled/function/str/insert.cc (+4/-8)
drizzled/function/str/load_file.cc (+1/-0)
drizzled/function/str/pad.cc (+2/-2)
drizzled/function/str/repeat.cc (+2/-2)
drizzled/function/str/replace.cc (+2/-2)
drizzled/function/time/date_format.cc (+2/-2)
drizzled/function/time/dayname.cc (+2/-2)
drizzled/function/time/month.cc (+2/-2)
drizzled/function/time/sysdate_local.cc (+1/-0)
drizzled/identifier.h (+3/-2)
drizzled/identifier/schema.cc (+5/-17)
drizzled/identifier/schema.h (+2/-20)
drizzled/identifier/user.cc (+5/-15)
drizzled/identifier/user.h (+8/-21)
drizzled/internal/mf_tempfile.cc (+7/-12)
drizzled/internal/my_open.cc (+2/-8)
drizzled/item.cc (+1/-0)
drizzled/item/cmpfunc.cc (+3/-4)
drizzled/item/cmpfunc.h (+2/-2)
drizzled/item/create.cc (+2/-2)
drizzled/item/subselect.cc (+3/-1)
drizzled/item/sum.cc (+11/-21)
drizzled/join.cc (+8/-6)
drizzled/join_cache.cc (+2/-4)
drizzled/main.cc (+1/-0)
drizzled/module/loader.cc (+1/-0)
drizzled/named_savepoint.h (+2/-2)
drizzled/open_tables_state.h (+2/-1)
drizzled/optimizer/access_method/scan.cc (+1/-0)
drizzled/optimizer/quick_group_min_max_select.cc (+2/-2)
drizzled/optimizer/quick_index_merge_select.cc (+2/-2)
drizzled/optimizer/quick_range_select.cc (+2/-2)
drizzled/optimizer/quick_ror_intersect_select.cc (+2/-3)
drizzled/optimizer/quick_ror_union_select.cc (+2/-2)
drizzled/optimizer/range.cc (+3/-2)
drizzled/optimizer/sel_tree.cc (+4/-5)
drizzled/plugin/event_observer.cc (+7/-25)
drizzled/plugin/storage_engine.cc (+1/-0)
drizzled/plugin/transactional_storage_engine.cc (+3/-5)
drizzled/query_id.cc (+2/-9)
drizzled/query_id.h (+3/-4)
drizzled/records.cc (+2/-2)
drizzled/schema.cc (+8/-48)
drizzled/schema.h (+6/-6)
drizzled/select_dumpvar.cc (+1/-0)
drizzled/session.cc (+103/-113)
drizzled/session.h (+57/-132)
drizzled/session/property_map.h (+1/-0)
drizzled/signal_handler.cc (+2/-1)
drizzled/sql_base.cc (+3/-13)
drizzled/sql_base.h (+1/-3)
drizzled/sql_delete.cc (+2/-0)
drizzled/sql_error.cc (+10/-14)
drizzled/sql_error.h (+5/-11)
drizzled/sql_insert.cc (+3/-2)
drizzled/sql_lex.cc (+6/-14)
drizzled/sql_lex.h (+3/-3)
drizzled/sql_list.h (+18/-31)
drizzled/sql_load.cc (+1/-0)
drizzled/sql_parse.cc (+11/-18)
drizzled/sql_select.cc (+8/-14)
drizzled/sql_table.cc (+5/-6)
drizzled/sql_update.cc (+3/-2)
drizzled/sql_yacc.yy (+16/-27)
drizzled/statement/flush.cc (+2/-2)
drizzled/statement/release_savepoint.cc (+1/-0)
drizzled/statement/rollback_to_savepoint.cc (+2/-2)
drizzled/statement/savepoint.cc (+2/-2)
drizzled/statement/select.cc (+1/-0)
drizzled/statement/show.cc (+1/-0)
drizzled/statement/start_transaction.cc (+2/-2)
drizzled/statement/update.cc (+2/-2)
drizzled/statistics_variables.h (+1/-2)
drizzled/stored_key.cc (+2/-2)
drizzled/stored_key.h (+2/-2)
drizzled/sys_var.cc (+4/-3)
drizzled/system_variables.h (+0/-2)
drizzled/table.cc (+7/-14)
drizzled/table.h (+2/-3)
drizzled/table/cache.cc (+5/-9)
drizzled/table/concurrent.cc (+4/-8)
drizzled/table/instance.h (+0/-14)
drizzled/table/singular.cc (+19/-32)
drizzled/table/singular.h (+5/-8)
drizzled/table_proto.h (+2/-0)
drizzled/time_functions.cc (+3/-2)
drizzled/transaction_services.cc (+28/-26)
drizzled/transaction_services.h (+2/-2)
drizzled/tztime.cc (+2/-2)
drizzled/unique.cc (+2/-2)
drizzled/user_var_entry.cc (+3/-2)
drizzled/user_var_entry.h (+2/-2)
drizzled/util/storable.h (+6/-9)
plugin/catalog/engine.h (+2/-10)
plugin/compression/uncompress.cc (+1/-1)
plugin/connection_id/connection_id.cc (+1/-0)
plugin/function_engine/cursor.cc (+1/-0)
plugin/haildb/haildb_engine.cc (+2/-0)
plugin/innobase/handler/ha_innodb.cc (+4/-0)
plugin/logging_stats/cumulative_stats.cc (+1/-0)
plugin/logging_stats/logging_stats.cc (+1/-0)
plugin/logging_stats/scoreboard.cc (+1/-0)
plugin/logging_stats/stats_schema.cc (+1/-2)
plugin/memory/ha_heap.cc (+3/-1)
plugin/multi_thread/multi_thread.cc (+1/-0)
plugin/myisam/ha_myisam.cc (+3/-1)
plugin/mysql_protocol/mysql_protocol.cc (+2/-0)
plugin/mysql_protocol/net_serv.cc (+2/-0)
plugin/pbms/src/ha_pbms.cc (+1/-0)
plugin/pbms/src/repository_ms.cc (+1/-0)
plugin/pbms/src/systab_backup_ms.cc (+1/-0)
plugin/pbms/src/systab_cloud_ms.cc (+1/-0)
plugin/pbms/src/systab_dump_ms.cc (+1/-0)
plugin/pbms/src/systab_httpheader_ms.cc (+1/-0)
plugin/pbms/src/systab_variable_ms.cc (+1/-0)
plugin/performance_dictionary/query_usage.h (+3/-1)
plugin/performance_dictionary/session_usage.cc (+3/-3)
plugin/performance_dictionary/session_usage_logger.cc (+2/-9)
plugin/session_dictionary/savepoints.cc (+1/-1)
plugin/session_dictionary/savepoints.h (+2/-0)
plugin/status_dictionary/status.cc (+1/-0)
plugin/user_locks/barrier_storage.h (+1/-1)
plugin/user_locks/create_barrier.cc (+10/-31)
plugin/user_locks/get_lock.cc (+10/-21)
plugin/user_locks/get_locks.cc (+12/-28)
plugin/user_locks/lock_storage.h (+1/-1)
plugin/user_locks/release_barrier.cc (+1/-1)
plugin/user_locks/release_lock.cc (+1/-1)
plugin/user_locks/release_locks.cc (+3/-5)
plugin/user_locks/release_wait.cc (+1/-1)
plugin/utility_functions/catalog.cc (+3/-5)
tests/lib/sys_mgmt/codeTree.py (+2/-0)