Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.1 | monty@narttu.mysql.fi | 2007-01-29 | 1 | -38/+30 |
|\ | |||||
| * | After merge fixes | monty@mysql.com/narttu.mysql.fi | 2007-01-29 | 1 | -8/+5 |
| * | Merge mysql.com:/home/my/mysql-5.0 | monty@narttu.mysql.fi | 2007-01-27 | 1 | -31/+26 |
| |\ | |||||
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | monty@mysql.com/narttu.mysql.fi | 2007-01-22 | 1 | -6/+1 |
| | |\ | |||||
| | | * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | monty@mysql.com/narttu.mysql.fi | 2006-12-15 | 1 | -6/+1 |
| | | |\ | |||||
| | | | * | Fixed compiler warnings detected by option -Wshadow and -Wunused: | monty@mysql.com/narttu.mysql.fi | 2006-12-15 | 1 | -6/+1 |
* | | | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime | malff/marcsql@weblab.(none) | 2007-01-24 | 1 | -0/+22 |
|\ \ \ \ \ | |||||
| * | | | | | Bug#21029 (Dependencies between sql_yacc.cc and dependent headers not detected) | malff/marcsql@weblab.(none) | 2007-01-24 | 1 | -0/+22 |
* | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-24562-merge | malff/marcsql@weblab.(none) | 2007-01-18 | 1 | -1/+24 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Manual merge | malff/marcsql@weblab.(none) | 2007-01-18 | 1 | -1/+24 |
| | |/ / / | |/| | | | |||||
| * | | | | Manual merge. | kostja@bodhi.local | 2007-01-15 | 1 | -22/+25 |
| |\ \ \ \ | |||||
| | * | | | | Post-merge fixes for Bug#4968 "Stored procedure crash if cursor opened | kostja@bodhi.local | 2006-12-12 | 1 | -3/+1 |
| | * | | | | Merge bodhi.local:/opt/local/work/mysql-4.1-4968 | kostja@bodhi.local | 2006-12-12 | 1 | -21/+26 |
| | |\ \ \ \ | |||||
| | | * | | | | A fix and test cases for | kostja@bodhi.local | 2006-12-08 | 1 | -23/+27 |
| | | * | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl | lars/lthalmann@mysql.com/dl145j.mysql.com | 2006-09-20 | 1 | -1/+3 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt | gkodinov/kgeorge@rakia.(none) | 2006-09-05 | 1 | -2/+5 |
| | | |\ \ \ \ \ | |||||
| * | | \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | kostja@bodhi.local | 2007-01-11 | 1 | -114/+298 |
| |\ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime | malff/marcsql@weblab.(none) | 2007-01-12 | 1 | -8/+0 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Bug#22687 (Functions UNIQUE_USERS, GROUP_UNIQUE_USERS) | malff/marcsql@weblab.(none) | 2007-01-11 | 1 | -8/+0 |
* | | | | | | | | | | Bug#25302 (893 reduce/reduce conflicts in parser grammar) | malff/marcsql@weblab.(none) | 2007-01-02 | 1 | -1/+0 |
* | | | | | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base | malff/marcsql@weblab.(none) | 2007-01-02 | 1 | -129/+303 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge cleanup | malff/marcsql@weblab.(none) | 2006-12-12 | 1 | -12/+2 |
| * | | | | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime | malff/marcsql@weblab.(none) | 2006-12-12 | 1 | -114/+298 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime | malff/marcsql@weblab.(none) | 2006-12-11 | 1 | -114/+298 |
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||||
| | | * | | | | | | | Bug#19194 (Right recursion in parser for CASE causes excessive stack usage, | malff/marcsql@weblab.(none) | 2006-12-11 | 1 | -1/+42 |
| | | * | | | | | | | Bug#19194 (Right recursion in parser for CASE causes excessive stack usage, | malff/marcsql@weblab.(none) | 2006-11-17 | 1 | -114/+257 |
| * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1 | kostja@bodhi.local | 2006-12-12 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | No bug number. | malff/marcsql@weblab.(none) | 2006-12-04 | 1 | -3/+3 |
* | | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 | tomas@poseidon. | 2006-12-27 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: ALTE... | mskold/marty@mysql.com/linux.site | 2006-12-19 | 1 | -2/+4 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0 | kent@kent-amd64.(none) | 2006-12-23 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Many files: | kent@mysql.com/kent-amd64.(none) | 2006-12-23 | 1 | -2/+1 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel | df@kahlann.erinye.com | 2006-12-01 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | * | | | | | | | Fixed portability issue in my_thr_init.c (was added in my last push) | monty@mysql.com/narttu.mysql.fi | 2006-11-30 | 1 | -1/+0 |
* | | | | | | | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch | patg@govinda.patg.net | 2006-12-08 | 1 | -0/+84 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | WL# 3031 | patg@govinda.patg.net | 2006-12-08 | 1 | -0/+1 |
| * | | | | | | | | | WL# 3031 | patg@radha.tangent.org | 2006-12-01 | 1 | -0/+83 |
* | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 | pgalbraith@bk-internal.mysql.com | 2006-12-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Additional fix for bug#22369 | andrey@example.com | 2006-12-07 | 1 | -1/+1 |
| * | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 | msvensson@neptunus.(none) | 2006-12-04 | 1 | -15/+4 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | Bug#24736: UDF functions parsed as Stored Functions | malff/marcsql@weblab.(none) | 2006-12-01 | 1 | -15/+4 |
* | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 | baker@bk-internal.mysql.com | 2006-12-06 | 1 | -15/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Apply malff@weblab.(none) fix for bug 24736 directly to | tsmith/tim@siva.hindu.god | 2006-12-04 | 1 | -15/+4 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 | baker@bk-internal.mysql.com | 2006-12-03 | 1 | -44/+44 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | This finishes the work (someone) started to remove FIELD_ types and use the E... | brian@zim.(none) | 2006-12-01 | 1 | -44/+44 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1 | monty@narttu.mysql.fi | 2006-11-30 | 1 | -7/+4 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fixed compiler warnings (Mostly VC++): | monty@mysql.com/narttu.mysql.fi | 2006-11-30 | 1 | -7/+4 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | kostja@bodhi.local | 2006-11-30 | 1 | -3/+4 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 | kroki/tomash@moonlight.intranet | 2006-11-29 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | kostja@bodhi.local | 2006-11-29 | 1 | -8/+30 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | |