lp:~linuxjedi/drizzle/trunk-bug-723653

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:drizzle/7.0 at revision 2197

Drizzle Developers: Pending requested 2011-02-23

Diff: 3009 lines (+980/-707)

44 files modified

docs/_static/basic.css (+2/-1)
docs/analyze.rst (+3/-1)
docs/barriers.rst (+11/-9)
docs/boolean_data_type.rst (+11/-10)
docs/clients/drizzleadmin.rst (+3/-0)
docs/clients/drizzledump.rst (+183/-161)
docs/commit.rst (+6/-2)
docs/configuration.rst (+6/-2)
docs/create_index.rst (+8/-4)
docs/create_schema.rst (+15/-5)
docs/create_table.rst (+42/-23)
docs/date_time_data_types.rst (+2/-1)
docs/delete.rst (+3/-1)
docs/drop_index.rst (+3/-1)
docs/drop_table.rst (+3/-1)
docs/flush.rst (+6/-4)
docs/functions/aggregatefunctions.rst (+4/-1)
docs/functions/control_flow.rst (+9/-9)
docs/functions/current_time_functions.rst (+11/-9)
docs/functions/extract_date_functions.rst (+35/-15)
docs/functions/logical.rst (+31/-13)
docs/functions/mathematical.rst (+15/-15)
docs/functions/string/comparative.rst (+18/-8)
docs/functions/string/conversion.rst (+74/-54)
docs/functions/string/length.rst (+15/-10)
docs/functions/string/modification.rst (+26/-12)
docs/functions/string/other.rst (+12/-4)
docs/functions/string/position.rst (+10/-4)
docs/insert.rst (+14/-6)
docs/installing/ubuntu.rst (+1/-1)
docs/join.rst (+8/-5)
docs/libdrizzle/constants.rst (+59/-59)
docs/locks.rst (+15/-13)
docs/numeric_data_types.rst (+8/-4)
docs/options.rst (+146/-127)
docs/rename.rst (+2/-1)
docs/resources/ascii_chart.rst (+98/-98)
docs/start_transaction.rst (+3/-1)
docs/testing/dbqp.rst (+27/-8)
docs/testing/test-run.rst (+20/-0)
docs/transactional.rst (+3/-1)
docs/variables.rst (+3/-1)
plugin/haildb/docs/index.rst (+3/-1)
plugin/innobase/docs/index.rst (+3/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #723653: Docs day first pass fixes

Medium

Fix Released

Link a bug report

Related blueprints

2201. By Andrew Hutchings on 2011-02-23

Merged trunk into branch (fix conflict)

2200. By Andrew Hutchings on 2011-02-23

Fix libdrizzle constants docs for index

2199. By Andrew Hutchings on 2011-02-23

Fix options indexing

2198. By Andrew Hutchings on 2011-02-23

A few more minor fixups

2197. By Andrew Hutchings on 2011-02-23

Markup fixes

2196. By Andrew Hutchings on 2011-02-23

Fix SQL markup

2195. By Andrew Hutchings on 2011-02-23

Port my drizzledump docs fixes from another branch which I thought were merged

2194. By Lee Bieber on 2011-02-23

Merge Andrew - 723389: ORDER BY on sys_replication_log table causes InnoDB crash
Merge Marisa - documentation updates

2193. By Brian Aker on 2011-02-22

Rollup changes in build.

2192. By Lee Bieber on 2011-02-22

Merge Patrick - 722884: mysql_protocol.prototest is taking too long to execute