lp:~mumair/drizzle/trunk-bug-621859-v2
- Get this branch:
- bzr branch lp:~mumair/drizzle/trunk-bug-621859-v2
Branch merges
- Drizzle Merge Team: Pending requested
-
Diff: 3055 lines (+898/-1040)99 files modifiedclient/drizzletest.cc (+0/-1)
drizzled/charset-def.cc (+0/-1)
drizzled/charset.cc (+0/-1)
drizzled/charset.h (+823/-10)
drizzled/charset_info.h (+0/-886)
drizzled/ctype-bin.cc (+1/-1)
drizzled/ctype-mb.cc (+1/-1)
drizzled/ctype-simple.cc (+1/-1)
drizzled/ctype-uca.cc (+1/-1)
drizzled/ctype-uni.cc (+1/-1)
drizzled/ctype-utf8.cc (+1/-1)
drizzled/ctype.cc (+1/-1)
drizzled/dtcollation.cc (+0/-1)
drizzled/field.h (+2/-2)
drizzled/field/blob.h (+1/-1)
drizzled/function/cast/boolean.h (+1/-1)
drizzled/function/cast/signed.cc (+1/-1)
drizzled/function/cast/unsigned.cc (+1/-1)
drizzled/function/find_in_set.cc (+1/-1)
drizzled/function/func.h (+1/-1)
drizzled/function/locate.cc (+1/-1)
drizzled/function/math/int.cc (+1/-1)
drizzled/function/time/typecast.h (+1/-1)
drizzled/global_charset_info.h (+0/-36)
drizzled/identifier/catalog.cc (+1/-1)
drizzled/identifier/schema.cc (+1/-1)
drizzled/include.am (+0/-2)
drizzled/internal/my_access.cc (+1/-1)
drizzled/internal/my_init.cc (+0/-1)
drizzled/internal/my_sys.h (+1/-1)
drizzled/item.h (+1/-1)
drizzled/item/bin_string.h (+1/-1)
drizzled/item/copy_string.h (+1/-1)
drizzled/item/decimal.cc (+1/-1)
drizzled/item/int.cc (+1/-1)
drizzled/item/null.h (+1/-1)
drizzled/item/string.h (+1/-1)
drizzled/item/sum.h (+1/-1)
drizzled/item/uint.cc (+1/-1)
drizzled/message/schema.cc (+1/-1)
drizzled/message/statement_transform.cc (+0/-2)
drizzled/message/table.cc (+1/-2)
drizzled/my_hash.cc (+0/-1)
drizzled/option.cc (+1/-1)
drizzled/parser.h (+0/-1)
drizzled/plugin/schema_engine.cc (+0/-1)
drizzled/plugin/storage_engine.cc (+0/-1)
drizzled/plugin/table_function.cc (+1/-1)
drizzled/schema.cc (+0/-1)
drizzled/session.h (+1/-1)
drizzled/sql_base.cc (+1/-1)
drizzled/sql_locale.cc (+1/-1)
drizzled/sql_parse.cc (+1/-1)
drizzled/sql_string.cc (+0/-2)
drizzled/sql_table.cc (+0/-1)
drizzled/statement/alter_table.cc (+1/-1)
drizzled/strfunc.cc (+1/-2)
drizzled/sys_var.h (+1/-1)
drizzled/table_proto.cc (+0/-1)
drizzled/temporal.cc (+1/-1)
drizzled/time_functions.cc (+1/-1)
drizzled/type/boolean.cc (+1/-2)
drizzled/type/decimal.cc (+1/-1)
drizzled/type/time.cc (+1/-1)
drizzled/typelib.cc (+1/-1)
drizzled/tztime.cc (+1/-1)
drizzled/user_var_entry.cc (+1/-1)
drizzled/xid.cc (+0/-2)
plugin/haildb/datadict_table_message.cc (+1/-1)
plugin/haildb/haildb_engine.cc (+0/-1)
plugin/hex_functions/hex_functions.cc (+1/-1)
plugin/innobase/handler/ha_innodb.cc (+0/-1)
plugin/innobase/handler/handler0alter.cc (+1/-1)
plugin/innobase/include/create_replication.h (+1/-1)
plugin/innobase/xtrabackup/xtrabackup.cc (+0/-2)
plugin/math_functions/ord.cc (+1/-1)
plugin/md5/md5.cc (+0/-1)
plugin/memory/hp_hash.cc (+1/-1)
plugin/myisam/mi_create.cc (+1/-1)
plugin/myisam/mi_key.cc (+1/-1)
plugin/myisam/mi_locking.cc (+1/-1)
plugin/myisam/mi_open.cc (+0/-2)
plugin/myisam/mi_search.cc (+1/-1)
plugin/myisam/mi_unique.cc (+1/-1)
plugin/myisam/my_handler.cc (+1/-1)
plugin/myisam/my_handler.h (+1/-1)
plugin/pbms/src/backup_ms.cc (+1/-1)
plugin/pbms/src/cloud_ms.cc (+1/-1)
plugin/pbms/src/database_ms.cc (+1/-1)
plugin/pbms/src/metadata_ms.h (+1/-1)
plugin/pbms/src/system_table_ms.cc (+1/-1)
plugin/reverse_function/reverse_function.cc (+1/-1)
plugin/schema_engine/schema.cc (+0/-2)
plugin/storage_engine_api_tester/storage_engine_api_tester.cc (+1/-1)
plugin/string_functions/format.cc (+1/-1)
plugin/substr_functions/substr_functions.cc (+1/-1)
plugin/tableprototester/tableprototester.cc (+1/-1)
plugin/utility_functions/catalog.h (+1/-2)
plugin/uuid_function/uuid_function.cc (+1/-1)
Related bugs
Related blueprints
Branch information
Recent revisions
- 2282. By Muhammad Umair <umair@RemoteDesk>
-
Merged charset declarations of global_
charset_ info.h and charset_info.h into charset.h header file. After that I needed to remove global_
charset_ info.h and charset_info.h header declarations from all the drizzle code base. I wrote a script
that search for global_charset_ info.h in all the source code files and replace it with charset.h if that file does not already have charset.h
header declaration otherwise it just remove global_charset_ info.h from that particular file. I wrote a smilar scrpt for replacing charset_info.h
with charset.h. I then restructured charset.h in order to make it more structural. i.e All the extern declarations are consolidated together one
after the other. Similar pattern has been followed for struct declarations and functions in the charset.h header file - 2280. By Lee Bieber
-
Merge Joe - 760367: DATA_DICTIONARY
.CUMULATIVE_ USER_STATS. CONNECTED_ TIME_SEC reports bogus results
Merge Olaf - Refactor Catalog Cache
Merge Olaf - Delete unused functions - 2278. By Lee Bieber
-
Merge Olaf - Refactor Session Cache and Remove table::
Cache:: singleton( )
Merge Olaf - Refactor Thread
Merge Olaf - remove unused functions - 2277. By Lee Bieber
-
Merge Olaf - Refactor Program Options usage
Merge Andrew - 748064: Xtrabackup breaks trunk in GCC 4.6 - 2276. By Lee Bieber
-
Merge Joe - 755201: slave plugin queryForReplica
tionEvents( ) query needs to be ordered
Merge Olaf - Refactor Session
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~drizzle-trunk/drizzle/development