Merge lp://qastaging/~brianaker/drizzle/fix-solaris-header-warnings into lp://qastaging/drizzle/7.0

Proposed by Brian Aker
Status: Merged
Approved by: Brian Aker
Approved revision: no longer in the source branch.
Merged at revision: 2161
Proposed branch: lp://qastaging/~brianaker/drizzle/fix-solaris-header-warnings
Merge into: lp://qastaging/drizzle/7.0
Diff against target: 6339 lines (+2009/-1229)
181 files modified
drizzled/catalog/instance.h (+2/-2)
drizzled/check_stack_overrun.h (+2/-0)
drizzled/copy_field.h (+83/-0)
drizzled/copy_info.h (+74/-0)
drizzled/cursor.cc (+12/-11)
drizzled/cursor.h (+13/-19)
drizzled/db.h (+4/-0)
drizzled/debug.h (+2/-0)
drizzled/display.cc (+5/-3)
drizzled/drizzled.cc (+39/-44)
drizzled/dtcollation.h (+5/-6)
drizzled/field.h (+1/-50)
drizzled/field_conv.cc (+10/-8)
drizzled/function/additive_op.cc (+1/-0)
drizzled/function/cast/boolean.cc (+4/-3)
drizzled/function/cast/boolean.h (+2/-1)
drizzled/function/cast/signed.cc (+4/-2)
drizzled/function/cast/unsigned.cc (+4/-2)
drizzled/function/find_in_set.cc (+1/-0)
drizzled/function/func.cc (+1/-1)
drizzled/function/func.h (+5/-2)
drizzled/function/get_system_var.cc (+2/-0)
drizzled/function/get_system_var.h (+4/-0)
drizzled/function/get_user_var.h (+1/-0)
drizzled/function/locate.cc (+2/-0)
drizzled/function/math/decimal_typecast.h (+1/-0)
drizzled/function/math/int.cc (+1/-0)
drizzled/function/math/int_val.cc (+1/-0)
drizzled/function/math/minus.cc (+1/-0)
drizzled/function/math/mod.cc (+1/-0)
drizzled/function/min_max.cc (+1/-0)
drizzled/function/time/typecast.h (+2/-0)
drizzled/generator.h (+10/-10)
drizzled/generator/schema.cc (+38/-0)
drizzled/generator/schema.h (+5/-38)
drizzled/generator/table.h (+3/-1)
drizzled/global_charset_info.h (+5/-5)
drizzled/ha_data.h (+65/-0)
drizzled/handler_structs.h (+4/-3)
drizzled/hybrid_type_traits.cc (+6/-3)
drizzled/hybrid_type_traits_decimal.cc (+6/-4)
drizzled/hybrid_type_traits_integer.cc (+6/-4)
drizzled/include.am (+14/-0)
drizzled/internal_error_handler.h (+2/-0)
drizzled/item.cc (+38/-0)
drizzled/item.h (+21/-54)
drizzled/item/bin_string.h (+1/-0)
drizzled/item/cache.cc (+4/-2)
drizzled/item/cache.h (+5/-4)
drizzled/item/cache_decimal.h (+1/-0)
drizzled/item/cache_str.cc (+1/-0)
drizzled/item/cmpfunc.cc (+3/-3)
drizzled/item/cmpfunc.h (+2/-1)
drizzled/item/copy_string.cc (+1/-0)
drizzled/item/copy_string.h (+2/-1)
drizzled/item/decimal.cc (+2/-0)
drizzled/item/field.h (+5/-1)
drizzled/item/float.cc (+4/-1)
drizzled/item/hex_string.cc (+3/-1)
drizzled/item/ident.h (+2/-0)
drizzled/item/int.cc (+4/-1)
drizzled/item/null.cc (+2/-1)
drizzled/item/null.h (+2/-1)
drizzled/item/num.h (+2/-1)
drizzled/item/ref_null_helper.cc (+2/-0)
drizzled/item/string.h (+1/-0)
drizzled/item/subselect.cc (+6/-5)
drizzled/item/sum.cc (+2/-2)
drizzled/item/sum.h (+1/-1)
drizzled/item/uint.cc (+2/-0)
drizzled/join.cc (+190/-11)
drizzled/join.h (+11/-168)
drizzled/key.cc (+2/-1)
drizzled/key.h (+1/-1)
drizzled/locking/global.cc (+7/-3)
drizzled/main.cc (+21/-22)
drizzled/memory/root.h (+10/-0)
drizzled/nested_join.h (+3/-1)
drizzled/open_tables_state.h (+3/-0)
drizzled/optimizer/position.cc (+41/-0)
drizzled/optimizer/position.h (+2/-9)
drizzled/optimizer/quick_index_merge_select.h (+2/-1)
drizzled/optimizer/range.cc (+15/-13)
drizzled/optimizer/range.h (+8/-5)
drizzled/optimizer/sum.cc (+1/-0)
drizzled/plugin/client.cc (+4/-1)
drizzled/plugin/client.h (+5/-2)
drizzled/plugin/function.h (+11/-2)
drizzled/plugin/listen.cc (+3/-1)
drizzled/plugin/query_rewrite.h (+0/-1)
drizzled/plugin/storage_engine.cc (+3/-3)
drizzled/plugin/storage_engine.h (+11/-12)
drizzled/plugin/table_function.cc (+5/-4)
drizzled/plugin/table_function.h (+0/-3)
drizzled/pthread_globals.h (+0/-1)
drizzled/query_id.h (+0/-1)
drizzled/records.cc (+8/-6)
drizzled/refresh_version.cc (+35/-0)
drizzled/refresh_version.h (+34/-0)
drizzled/select_result.h (+3/-0)
drizzled/session.cc (+8/-78)
drizzled/session.h (+49/-329)
drizzled/session/cache.cc (+4/-4)
drizzled/session/cache.h (+1/-4)
drizzled/session/property_map.h (+92/-0)
drizzled/session/state.cc (+69/-0)
drizzled/session/state.h (+55/-0)
drizzled/session/table_messages.cc (+105/-0)
drizzled/session/table_messages.h (+57/-0)
drizzled/session/transactions.h (+85/-0)
drizzled/show.cc (+8/-29)
drizzled/show.h (+5/-15)
drizzled/sql_base.cc (+4/-1)
drizzled/sql_lex.cc (+6/-6)
drizzled/sql_load.cc (+2/-0)
drizzled/sql_parse.cc (+2/-2)
drizzled/sql_select.cc (+7/-6)
drizzled/sql_select.h (+4/-10)
drizzled/sql_string.h (+1/-0)
drizzled/sql_table.cc (+1/-0)
drizzled/sql_update.cc (+3/-1)
drizzled/statement/alter_table.cc (+2/-0)
drizzled/statement/create_index.cc (+2/-0)
drizzled/statement/create_schema.cc (+2/-0)
drizzled/statement/create_table.cc (+1/-0)
drizzled/statement/drop_index.cc (+2/-0)
drizzled/statement/flush.cc (+2/-0)
drizzled/statement/rename_table.cc (+1/-0)
drizzled/status_helper.cc (+2/-1)
drizzled/stored_key.cc (+74/-0)
drizzled/stored_key.h (+27/-49)
drizzled/sys_var.cc (+2/-1)
drizzled/system_variables.h (+103/-0)
drizzled/table.cc (+21/-0)
drizzled/table.h (+14/-27)
drizzled/table/instance/base.cc (+9/-0)
drizzled/table/instance/base.h (+1/-6)
drizzled/table/singular.cc (+1/-1)
drizzled/table/unused.cc (+2/-0)
drizzled/table_ident.h (+6/-1)
drizzled/table_proto_write.cc (+2/-0)
drizzled/temporal_interval.h (+26/-27)
drizzled/transaction_services.h (+6/-5)
drizzled/type/decimal.h (+4/-0)
drizzled/tztime.h (+4/-7)
drizzled/util/string.h (+4/-0)
plugin/archive/archive_engine.h (+1/-0)
plugin/ascii/ascii.cc (+2/-0)
plugin/blackhole/ha_blackhole.cc (+11/-7)
plugin/blitzdb/ha_blitz.cc (+2/-0)
plugin/charlength/charlength.cc (+2/-0)
plugin/crc32/crc32udf.cc (+2/-0)
plugin/debug/module.cc (+2/-1)
plugin/haildb/haildb_datadict_dump_func.h (+2/-0)
plugin/hello_world/hello_world.cc (+4/-2)
plugin/hex_functions/hex_functions.cc (+5/-4)
plugin/information_schema_dictionary/domains.cc (+1/-0)
plugin/innobase/handler/ha_innodb.cc (+3/-3)
plugin/math_functions/abs.cc (+2/-0)
plugin/math_functions/ceiling.cc (+1/-0)
plugin/math_functions/floor.cc (+2/-0)
plugin/math_functions/ord.cc (+3/-0)
plugin/md5/md5.cc (+4/-3)
plugin/memory/ha_heap.cc (+2/-1)
plugin/myisam/ha_myisam.cc (+2/-0)
plugin/pbms/src/events_ms.cc (+1/-1)
plugin/reverse_function/reverse_function.cc (+1/-0)
plugin/session_dictionary/processlist.cc (+1/-1)
plugin/show_schema_proto/show_schema_proto.cc (+11/-8)
plugin/signal_handler/signal_handler.cc (+8/-3)
plugin/string_functions/format.cc (+4/-0)
plugin/string_functions/functions.cc (+2/-0)
plugin/string_functions/functions.h (+1/-0)
plugin/string_functions/quote.cc (+2/-0)
plugin/substr_functions/substr_functions.cc (+4/-3)
plugin/tableprototester/tableprototester.cc (+7/-6)
plugin/transaction_log/hexdump_transaction_message.cc (+2/-0)
plugin/transaction_log/print_transaction_message.cc (+2/-0)
plugin/utility_functions/catalog.h (+2/-0)
plugin/utility_functions/functions.cc (+2/-0)
plugin/uuid_function/uuid_function.cc (+5/-2)
To merge this branch: bzr merge lp://qastaging/~brianaker/drizzle/fix-solaris-header-warnings
Reviewer Review Type Date Requested Status
Lee Bieber (community) Needs Fixing
Review via email: mp+49171@code.qastaging.launchpad.net

Description of the change

Fixes the header issues that we ran into on Solaris (ie out of order issue was causing us weird compile issues).

To post a comment you must log in.
2155. By Lee Bieber

Merge Patrick - 715885: dbqp needs to return non-zero if tests fail
Merge Stewart - 715539: (get|set)_session_proc_info() still exists
Merge Stewart - 715575: misc session_foo() functions exist - should be methods in Session
Merge Stewart - 712843: SAVEPOINT after rollback due to deadlock with autocommit=off in transaction will call startTransaction with an existing transaction where one shouldn't exist

Revision history for this message
Lee Bieber (kalebral-deactivatedaccount) wrote :
review: Needs Fixing
2156. By Lee Bieber

Merge Stewart - moves mark_transaction_to_rollback to be a method in Session
Merge Vijay - 715789: test-drizzle, test-jp etc dont run check
Merge Stewart - 565053: Fork to background

2157. By Lee Bieber

Merge Stewart - add higher precision timer in the drizzle command line client.

2158. By Lee Bieber

Merge Stewart - 716848: drizzleimport displays wrong program_name
Merge Stewart - update README file
Merge Andrew and Joe - Exposes the InnoDB SYS_REPLICATION_LOG to data_dictionary so that it is fast and fixes many issues we have been having

2159. By Lee Bieber

Merge Stewart - 716852: drizzle --prompt doesn't work
Merge Stewart - 716850: day and month names aren't i8n'd in drizzle.cc
Merge Stewart - updates to SEAPITester

2160. By Lee Bieber

Merge Brian - fixes for union

2161. By Brian Aker

Merge in solaris tree.

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