lp:~vjsamuel/drizzle/fix-bug-585982

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~drizzle-trunk/drizzle/development at revision 1797

Drizzle Merge Team: Pending requested 2010-09-26

Diff: 30 lines (+3/-3)

1 file modified

drizzled/drizzled.cc (+3/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #585982: default datadir and pid-file location reported by --help incorrect

Critical

Fix Released

Link a bug report

Related blueprints

1777. By Vijay Samuel on 2010-09-26

Merge removed the -h short form for --datadir and replaced safe_mysqld with drizzled in help message of --pid-file

1776. By Monty Taylor on 2010-09-19

Rollup of name change, build bug fixes and Patrick's change to re-enable
that test.

1775. By lbieber <lbieber@orisndriz08> on 2010-09-18

Merge Joe - Rework the rollback to savepoint code in terms of the transaction log

1774. By lbieber <lbieber@orisndriz08> on 2010-09-17

Merge Stewart - remove a bunch of trailing whitespaces
Merge Stewart - fix pbxt test cases to run with pbxt
Merge Stewart - more moving math functions to plugins

1773. By lbieber <lbieber@orisndriz03> on 2010-09-17

Merge Monty - add files that were missing from the tarball

1772. By lbieber <lbieber@orisndriz08> on 2010-09-17

Merge Patrick - add transaction log tests

1771. By lbieber <lbieber@orisndriz08> on 2010-09-17

Merge Stewart - remove the unbalanced my_end() call from drizzledump
Merge Stewart - move math functions into plugin

1770. By lbieber <lbieber@orisndriz08> on 2010-09-16

Merge Brian - IO cleanup

1769. By lbieber <lbieber@orisndriz08> on 2010-09-16

Merge Brian/Monty - Remove the restart required files from embedded (instead have one master.opt file)
Merge Brian - Require --plugin-add in order to have csv, archive, or blackhole running.

1768. By lbieber <lbieber@orisndriz08> on 2010-09-16

Merge Vijay - Added new utf 8 test case for creating tamil tables
Merge Shrews - fix bug 616941 - Selecting transaction_log record that does not exist crashes server