summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* BUG#16420: Events: timestamps become UTCunknown2007-03-1610-284/+471
* Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2007-03-158-86/+154
|\
| * Fix for BUG#735 "Prepared Statements: there is no support for Queryunknown2007-03-095-24/+92
| * manual mergeunknown2007-03-096-63/+63
| |\
| | * Mechanical class renaming:unknown2007-01-306-63/+63
* | | Manual merge from 5.0-runtime to 5.1-runtimeunknown2007-03-142-6/+6
* | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtimeunknown2007-03-1414-96/+185
|\ \ \
| * \ \ Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimeunknown2007-03-145-62/+136
| |\ \ \
| | * | | Bug#26503 (Illegal SQL exception handler code causes the server to crash)unknown2007-03-145-62/+136
| * | | | Fix typo.unknown2007-03-091-1/+1
| * | | | Polishing: use constants instead of magic numbers.unknown2007-03-0912-48/+63
| |/ / /
| * | | Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0unknown2007-03-081-3/+8
| |\ \ \
| * | | | Fix -ansi -pedantic warning (can't cast a pointer to function unknown2007-03-082-3/+3
* | | | | Fix the bug introduced with the push of the fix for bug#18326: Do notunknown2007-03-131-1/+8
* | | | | Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1unknown2007-03-091-21/+21
|\ \ \ \ \
| * | | | | Resolve one shift/reduce conflict introduced with the push of the fixunknown2007-03-091-21/+21
| | |_|/ / | |/| | |
* | | | | Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1unknown2007-03-0922-347/+272
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | BUG#9953: CONVERT_TZ requires mysql.time_zone_name to be lockedunknown2007-03-0922-347/+272
* | | | | Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0-bug20492unknown2007-03-081-3/+8
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | BUG#20492: Subsequent calls to stored procedure yield incorrect resultunknown2006-09-071-3/+8
* | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtimeunknown2007-03-072-28/+19
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Bug 8407, post review cleanup: use instr::get_cont_dest() to get the instructionunknown2007-03-072-28/+19
* | | | | Cleanup: removed unused variable that produced a warning.unknown2007-03-071-1/+0
* | | | | Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1unknown2007-03-071-56/+50
|\ \ \ \ \
| * | | | | BUG#18326: Do not lock table for writing during prepare of statementunknown2007-03-071-56/+50
* | | | | | A post merge fix.unknown2007-03-072-26/+16
* | | | | | Merge bodhi.local:/opt/local/work/mysql-5.0-runtimeunknown2007-03-071-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | A fix for the windows build (harmless warning).unknown2007-03-071-1/+1
* | | | | | Merge bodhi.local:/opt/local/work/mysql-5.0-26750unknown2007-03-0710-483/+582
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtimeunknown2007-03-0710-425/+523
| |\ \ \ \ \
| | * | | | | A fix for Bug#26750 "valgrind leak in sp_head" (and post-reviewunknown2007-03-0710-425/+524
| * | | | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimeunknown2007-03-0610-20/+270
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
* | | | | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2007-03-0610-20/+271
|\ \ \ \ \ \ \
| * | | | | | | Manual mergeunknown2007-03-061-0/+68
| * | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-8407_bunknown2007-03-069-21/+204
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Bug#8407 (Stored functions/triggers ignore exception handler)unknown2007-03-0510-21/+271
* | | | | | | | Post-merge fixes.unknown2007-03-061-2/+2
* | | | | | | | Merge bodhi.local:/opt/local/work/mysql-5.0-runtimeunknown2007-03-062-24/+133
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | Freeze the number of conflicts. We should not introduce any moreunknown2007-03-021-0/+5
| * | | | | | Rename a macro to better reflect the action taken.unknown2007-03-021-19/+19
| * | | | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimeunknown2007-03-011-0/+4
| |\ \ \ \ \ \
| | * | | | | | Bug#26093 (SELECT BENCHMARK() for SELECT statements does not produce validunknown2007-03-011-0/+4
| * | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-baseunknown2007-03-0112-51/+459
| |\ \ \ \ \ \ \
| | * | | | | | | Add more comments to open_table and open_tables. No real changes.unknown2007-02-281-5/+111
| | * | | | | | | Merge kpdesk.mysql.com:/home/thek/dev/bug23240/my50-bug23240unknown2007-02-192-2/+2
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-baseunknown2007-02-169-44/+346
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| * | | | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0unknown2007-03-015-15/+32
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.0unknown2007-03-017-15/+36
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Disabled compiler warnings.unknown2007-03-011-1/+3
| | | * | | | | | | | | Fixed compiler warnings.unknown2007-02-287-16/+35