lp:~dedzone/drizzle/ded-rm-my

Branch merges

Propose for merging

No branches dependent on this one.

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

Brian Aker: Needs Fixing on 2010-04-01

Jay Pipes (community): Approve on 2010-03-30

Diff: 8376 lines (+3786/-3786)

48 files modified

client/client_priv.h (+1/-1)
client/drizzle.cc (+2/-2)
client/drizzledump.cc (+2/-2)
client/drizzleimport.cc (+2/-2)
client/drizzleslap.cc (+2/-2)
client/drizzletest.cc (+4/-4)
drizzled/decimal.h (+1/-1)
drizzled/drizzle_time.cc (+1260/-0)
drizzled/drizzle_time.h (+194/-0)
drizzled/drizzled.cc (+5/-5)
drizzled/include.am (+7/-7)
drizzled/item.h (+1/-1)
drizzled/item/sum.h (+1/-1)
drizzled/my_getopt.cc (+0/-1289)
drizzled/my_getopt.h (+0/-97)
drizzled/my_getsystime.cc (+1/-1)
drizzled/my_time.cc (+0/-1260)
drizzled/my_time.h (+0/-194)
drizzled/my_tree.cc (+0/-715)
drizzled/my_tree.h (+0/-92)
drizzled/my_var.h (+0/-41)
drizzled/option.cc (+1289/-0)
drizzled/option.h (+97/-0)
drizzled/plugin.h (+3/-3)
drizzled/plugin/loader.cc (+19/-19)
drizzled/select_dumpvar.h (+3/-3)
drizzled/session.h (+1/-1)
drizzled/set_var.cc (+7/-7)
drizzled/set_var.h (+6/-6)
drizzled/sql_yacc.yy (+1/-1)
drizzled/time_functions.h (+1/-1)
drizzled/tree.cc (+715/-0)
drizzled/tree.h (+92/-0)
drizzled/unique.h (+1/-1)
drizzled/uniques.cc (+1/-1)
drizzled/var.h (+41/-0)
extra/my_print_defaults.cc (+3/-3)
plugin/archive/archive_performance.cc (+1/-1)
plugin/archive/archive_reader.cc (+4/-4)
plugin/archive/archive_test.cc (+1/-1)
plugin/archive/concurrency_test.cc (+1/-1)
plugin/heap/heap.h (+1/-1)
plugin/heap/heap_priv.h (+1/-1)
plugin/myisam/ha_myisam.cc (+5/-5)
plugin/myisam/mi_check.cc (+1/-1)
plugin/myisam/myisam_priv.h (+1/-1)
support-files/drizzle.spec.in (+4/-4)
tests/resolve_stack_dump.cc (+3/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1415. By Djellel E. Difallah <ded@ubuntu> on 2010-04-02

merge to trunk

1414. By Djellel E. Difallah <ded@ubuntu> on 2010-03-30

update references to old my_'s

1413. By Djellel E. Difallah <ded@ubuntu> on 2010-03-28

fix

1412. By Djellel E. Difallah <ded@ubuntu> on 2010-03-27

removed my_decimal h/cc and it's references

1411. By Djellel E. Difallah <ded@ubuntu> on 2010-03-27

merge my_decimal and decimal

1410. By Brian Aker <email address hidden> on 2010-03-26

Correct output, preserve indention.

1409. By Brian Aker <email address hidden> on 2010-03-26

MErge Eric.

1408. By Brian Aker <email address hidden> on 2010-03-26

Merge Monty

1407. By Brian Aker <email address hidden> on 2010-03-26

Merge Siddharth, ran formatting across it.

Someone really should take these programs apart and clean them up.

1406. By Brian Aker <email address hidden> on 2010-03-26

Merge Andrew