lp:~mordred/drizzle/split-session-header

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:drizzle/7.0

Drizzle Developers: Pending requested 2011-02-12

Diff: 1205 lines (+455/-118) (has conflicts)

48 files modified

drizzled/base.h (+1/-1)
drizzled/common.h (+0/-1)
drizzled/copy_info.h (+121/-0)
drizzled/daemon.cc (+5/-0)
drizzled/definitions.h (+1/-4)
drizzled/filesort.cc (+1/-0)
drizzled/function/get_user_var.cc (+1/-0)
drizzled/function/set_user_var.cc (+1/-0)
drizzled/function/user_var_as_out_param.cc (+1/-0)
drizzled/identifier/catalog.cc (+1/-0)
drizzled/identifier/schema.cc (+1/-0)
drizzled/include.am (+6/-1)
drizzled/item/subselect.cc (+7/-0)
drizzled/item/sum.cc (+2/-0)
drizzled/join.h (+1/-0)
drizzled/lex_column.h (+2/-0)
drizzled/main.cc (+19/-16)
drizzled/module/loader.cc (+0/-2)
drizzled/optimizer/quick_index_merge_select.cc (+1/-0)
drizzled/optimizer/range.cc (+1/-0)
drizzled/select_create.h (+2/-0)
drizzled/select_dump.h (+2/-0)
drizzled/select_dumpvar.h (+1/-0)
drizzled/select_singlerow_subselect.h (+2/-0)
drizzled/session.cc (+17/-0)
drizzled/session.h (+30/-89)
drizzled/set_var.cc (+2/-0)
drizzled/set_var.h (+0/-1)
drizzled/show.cc (+2/-0)
drizzled/sort_field.h (+70/-0)
drizzled/sql_derived.cc (+1/-0)
drizzled/sql_insert.cc (+2/-0)
drizzled/sql_lex.h (+1/-0)
drizzled/sql_parse.cc (+1/-0)
drizzled/sql_select.cc (+1/-0)
drizzled/sql_union.cc (+1/-0)
drizzled/sql_yacc.yy (+6/-0)
drizzled/statement/create_table.cc (+5/-0)
drizzled/statement/insert_select.cc (+1/-0)
drizzled/statement/replace_select.cc (+2/-0)
drizzled/sys_var.h (+1/-1)
drizzled/system_variables.h (+115/-0)
drizzled/unique.cc (+1/-0)
drizzled/user_var_entry.cc (+1/-0)
drizzled/user_var_entry.h (+10/-1)
plugin/logging_stats/user_commands.cc (+1/-0)
plugin/mysql_protocol/mysql_protocol.cc (+3/-1)
plugin/session_dictionary/variables.cc (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2161. By Monty Taylor on 2011-02-12

Split apart session.h into smaller headers, which also removed the need for
us to have include statements in the middle of the file. While I was at it,
I converted daemon.c to c++.

2160. By Monty Taylor on 2011-02-11

Be consistent about include usage.

2159. By Monty Taylor on 2011-02-11

Actually distribute the pc files.

2158. By Monty Taylor on 2011-02-11

Provide pkg-config files and also stick drizzle plugin files in a place
where we don't conflict with our tree.

2157. By Lee Bieber on 2011-02-11

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

2156. By Lee Bieber on 2011-02-11

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

2155. By Lee Bieber on 2011-02-10

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

2154. By Lee Bieber on 2011-02-10

Merge Brian - more parser rework

2153. By Lee Bieber on 2011-02-09

Merge Monty - Don't die on warnings in tarballs
Merge Olaf - TYPELIB instances need to be replaced with some STL or Boost datastructure
Merge Vijay - 715312: make test-dbqp should also run 'check'

2152. By Lee Bieber on 2011-02-09

Merge Lee - update valgrind suppressions on 32bit machines
Merge Olaf - macro functions should be c++ template functions
Merge Lee - 714638: [user_locks plugin] Compilation aborts on FreeBSD 8.1 after complaining about overloaded abs function