lp:~mordred/drizzle/drizzled-as-lib

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~drizzle-trunk/drizzle/development

Eric Day: Pending requested 2010-04-16

Brian Aker: Pending requested 2010-04-16

Diff: 3341 lines (+1195/-1142)

44 files modified

Makefile.am (+2/-1)
drizzled/cursor.cc (+24/-0)
drizzled/cursor.h (+9/-6)
drizzled/data_home.h (+5/-3)
drizzled/drizzled.cc (+45/-484)
drizzled/drizzled.h (+65/-0)
drizzled/function/str/load_file.cc (+1/-1)
drizzled/include.am (+353/-341)
drizzled/internal/include.am (+2/-1)
drizzled/internal/my_pthread.h (+0/-24)
drizzled/main.cc (+328/-0)
drizzled/message/include.am (+4/-3)
drizzled/optimizer/range.cc (+0/-181)
drizzled/pthread_globals.h (+1/-0)
drizzled/schema_identifier.cc (+1/-1)
drizzled/session.cc (+4/-5)
drizzled/session_list.cc (+1/-1)
drizzled/set_var.cc (+1/-1)
drizzled/signal_handler.cc (+212/-0)
drizzled/signal_handler.h (+55/-0)
drizzled/sql_base.cc (+1/-2)
drizzled/sql_load.cc (+3/-3)
drizzled/sql_table.cc (+1/-6)
drizzled/sql_table.h (+0/-4)
drizzled/stacktrace.cc (+11/-2)
drizzled/stacktrace.h (+0/-4)
drizzled/statement/alter_table.cc (+5/-5)
drizzled/statement/rename_table.cc (+1/-1)
drizzled/table.cc (+0/-26)
drizzled/table_identifier.cc (+3/-4)
extra/include.am (+1/-4)
plugin/archive/ha_archive.cc (+2/-11)
plugin/archive/ha_archive.h (+0/-4)
plugin/innobase/handler/ha_innodb.cc (+1/-1)
plugin/myisam/plugin.ini (+1/-1)
plugin/pbxt/src/ha_pbxt.h (+5/-5)
plugin/pbxt/src/myxt_xt.cc (+1/-1)
plugin/pbxt/src/table_xt.cc (+8/-0)
plugin/pbxt/src/xt_defs.h (+1/-1)
plugin/schema_engine/schema.cc (+2/-2)
plugin/signal_handler/signal_handler.cc (+2/-1)
support-files/drizzle.spec.in (+6/-0)
tests/test-run.pl (+3/-1)
tests/valgrind.supp (+24/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1478. By Monty Taylor on 2010-04-19

We need to launch drizzled via libtool now.

1477. By Monty Taylor on 2010-04-19

Merged up with build.

1476. By Monty Taylor on 2010-04-16

Fixed a symbol oops.

1475. By Monty Taylor on 2010-04-16

Merged trunk.

1474. By Monty Taylor on 2010-04-16

Added a missing file.

1473. By Monty Taylor on 2010-04-16

Merged in old drizzled-as-lib patch.

1472. By Monty Taylor on 2010-04-16

Latest pandora-build. Moves the lint check to only run distcheck.

1471. By Brian Aker <brian@gaz> on 2010-04-14

Merge Monty

1470. By Brian Aker <brian@gaz> on 2010-04-14

Merge of Monty

1469. By Brian Aker <brian@gaz> on 2010-04-14

Stored.