lp:~brianaker/drizzle/timestamp

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:drizzle/7.0 at revision 2123

Drizzle Developers: Pending requested 2011-01-27

Diff: 711 lines (+144/-120)

18 files modified

drizzled/error.cc (+6/-2)
drizzled/error_t.h (+3/-0)
drizzled/field/date.cc (+4/-3)
drizzled/field/time.cc (+38/-40)
drizzled/function/time/typecast.h (+10/-3)
drizzled/type/time.h (+1/-0)
plugin/transaction_log/tests/r/transaction_log_data_type.result (+4/-4)
plugin/transaction_log/tests/t/transaction_log_data_type.test (+9/-9)
tests/r/func_time.result (+1/-1)
tests/r/select.result (+1/-1)
tests/r/type_date.result (+2/-2)
tests/r/type_datetime.result (+2/-2)
tests/suite/time_type/r/basic.result (+35/-35)
tests/suite/time_type/t/basic.test (+14/-12)
tests/t/func_time.test (+9/-1)
tests/t/select.test (+1/-1)
tests/t/type_date.test (+2/-2)
tests/t/type_datetime.test (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2156. By Brian Aker on 2011-02-11

Merge in field/error work.

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

2151. By Lee Bieber on 2011-02-08

Merge Patrick - 714911: dbqp needs valgrind to work

2150. By Lee Bieber on 2011-02-08

Merge Patrick - 709859: dbqp needs to redirect drizzletest stderr ouput appropriately

2149. By Lee Bieber on 2011-02-07

Merge Andrew - 713347: Cartesian joins actually work
Merge Vijay - write encapsulated join_read_system() function name to abide to coding standards
Merge Patrick - 713802: dbqp needs to fix port management

2148. By Lee Bieber on 2011-02-06

Merge Brian - table error updates
Merge Brian - parser updates
Merge Brian - more catalog work

2147. By Brian Aker on 2011-02-05

Merge in VJ