Merge lp://staging/~brianaker/drizzle/798940 into lp://staging/~drizzle-trunk/drizzle/development

.bzrignore (+1/-0)
drizzled/function/set_user_var.cc (+2/-0)
drizzled/item/boolean.h (+20/-0)
drizzled/item/cmpfunc.cc (+32/-22)
drizzled/item/cmpfunc.h (+7/-4)
drizzled/message.cc (+0/-6)
drizzled/message.h (+0/-1)
drizzled/plugin/storage_engine.h (+5/-0)
drizzled/set_var.cc (+1/-0)
drizzled/signal_handler.cc (+1/-1)
drizzled/sql_string.cc (+2/-2)
drizzled/sql_string.h (+9/-0)
drizzled/sql_yacc.yy (+3/-1)
drizzled/table_proto.cc (+4/-5)
drizzled/util/backtrace.cc (+2/-3)
drizzled/util/backtrace.h (+3/-1)
plugin/debug/module.cc (+1/-1)
plugin/filtered_replicator/tests/r/var_filteredtables.result (+1/-1)
plugin/filtered_replicator/tests/r/var_tableregex.result (+1/-1)
plugin/innobase/tests/r/innodb-autoinc-44030.result (+1/-1)
plugin/innobase/tests/r/innodb-autoinc.result (+12/-12)
plugin/innobase/tests/r/innodb.result (+50/-50)
plugin/innobase/tests/r/innodb_bug51378.result (+11/-11)
plugin/innobase/tests/r/innodb_bug56143.result (+1/-1)
plugin/innobase/tests/r/innodb_mysql.result (+5/-5)
plugin/innobase/tests/r/parser_bug21114_innodb.result (+9/-9)
plugin/memory/ha_heap.cc (+7/-1)
plugin/memory/tests/r/basic.result (+7/-7)
plugin/memory/tests/r/primary_key.result (+1/-1)
plugin/myisam/tests/r/basic.result (+15/-15)
plugin/myisam/tests/r/mix2_myisam.result (+16/-16)
plugin/schema_dictionary/indexes.cc (+1/-31)
plugin/schema_dictionary/tests/r/show.result (+34/-34)
plugin/schema_dictionary/tests/r/show_fields.result (+1/-1)
plugin/storage_engine_api_tester/tests/r/min_index_scan_error.result (+2/-2)
plugin/storage_engine_api_tester/tests/r/txn_log_insert.result (+1/-1)
plugin/storage_engine_api_tester/tests/r/txn_log_rollback_large_stmt.result (+2/-2)
plugin/transaction_log/tests/r/alter.result (+2/-2)
plugin/transaction_log/tests/r/auto_commit.result (+4/-4)
plugin/transaction_log/tests/r/blob.result (+4/-4)
plugin/transaction_log/tests/r/bulk_commit.result (+1/-1)
plugin/transaction_log/tests/r/bulk_rollback.result (+1/-1)
plugin/transaction_log/tests/r/create_select.result (+4/-4)
plugin/transaction_log/tests/r/create_table.result (+4/-4)
plugin/transaction_log/tests/r/ddl_transaction_id.result (+1/-1)
plugin/transaction_log/tests/r/delete.result (+6/-6)
plugin/transaction_log/tests/r/embedded_quotes.result (+1/-1)
plugin/transaction_log/tests/r/information_schema.result (+1/-1)
plugin/transaction_log/tests/r/insert.result (+2/-2)
plugin/transaction_log/tests/r/insert_multi.result (+2/-2)
plugin/transaction_log/tests/r/insert_on_duplicate_update.result (+2/-2)
plugin/transaction_log/tests/r/insert_select.result (+4/-4)
plugin/transaction_log/tests/r/multi_column_primary_key.result (+2/-2)
plugin/transaction_log/tests/r/multi_table.result (+4/-4)
plugin/transaction_log/tests/r/no_modification.result (+2/-2)
plugin/transaction_log/tests/r/null_values.result (+8/-8)
plugin/transaction_log/tests/r/rand.result (+2/-2)
plugin/transaction_log/tests/r/rename.result (+2/-2)
plugin/transaction_log/tests/r/replace.result (+78/-78)
plugin/transaction_log/tests/r/rollback.result (+2/-2)
plugin/transaction_log/tests/r/select_for_update.result (+2/-2)
plugin/transaction_log/tests/r/temp_tables.result (+1/-1)
plugin/transaction_log/tests/r/transaction_log_alter.result (+20/-20)
plugin/transaction_log/tests/r/transaction_log_create.result (+28/-28)
plugin/transaction_log/tests/r/transaction_log_schema.result (+2/-2)
plugin/transaction_log/tests/r/transaction_log_transaction.result (+2/-2)
plugin/transaction_log/tests/r/truncate.result (+1/-1)
plugin/transaction_log/tests/r/update.result (+8/-8)
plugin/utility_functions/tests/r/result_type.result (+2/-2)
plugin/utility_functions/tests/r/typeof.result (+2/-2)
tests/r/alter_table.result (+2/-2)
tests/r/alter_table_rename_plus.result (+4/-4)
tests/r/auto_increment.result (+2/-2)
tests/r/comment_column.result (+16/-16)
tests/r/comment_index.result (+33/-33)
tests/r/comment_table.result (+6/-6)
tests/r/constraints.result (+3/-3)
tests/r/create.result (+294/-294)
tests/r/create_not_windows.result (+1/-1)
tests/r/drizzledump.result (+4/-4)
tests/r/foreign_key.result (+3/-3)
tests/r/information_schema.result (+1/-1)
tests/r/information_schema_inno.result (+6/-6)
tests/r/key.result (+29/-29)
tests/r/null_key.result (+2/-2)
tests/r/range.result (+1/-1)
tests/r/replication_schema_ddl.result (+4/-4)
tests/r/replication_table_ddl.result (+2/-2)
tests/r/show_check.result (+10/-10)
tests/r/show_create_table_basic.result (+1/-1)
tests/r/strict.result (+2/-2)
tests/r/type_blob.result (+3/-3)
tests/r/type_varchar.result (+3/-3)
tests/suite/execute/r/basic.result (+2/-2)
tests/suite/jp/r/alter_utf8.result (+27/-27)
tests/suite/jp/r/enum_utf8.result (+9/-9)
tests/suite/regression/r/622465.result (+1/-1)
tests/suite/regression/r/686197.result (+2/-2)
tests/suite/regression/r/704776.result (+1/-1)
tests/suite/regression/r/798959.result (+18/-0)
tests/suite/regression/t/798959.test (+6/-0)
tests/suite/uuid_type/r/bad_conversions.result (+1/-1)
tests/suite/uuid_type/r/primary_key.result (+1/-1)