Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint | cmiller@zippy.cornsilk.net | 2006-09-05 | 2 | -0/+49 |
|\ | |||||
| * | Merge mysql.com:/usr/home/bar/mysql-4.1 | bar@mysql.com/bar.intranet.mysql.r18.ru | 2006-08-16 | 2 | -0/+49 |
| |\ | |||||
| | * | Bug#9509: Optimizer: wrong result after AND with latin1_german2_ci comparisons | bar@mysql.com | 2006-04-20 | 2 | -0/+49 |
* | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint | cmiller@zippy.cornsilk.net | 2006-09-05 | 1 | -0/+13 |
|\ \ \ | |||||
| * | | | Make the heap_btree test repeatable. | ramil/ram@mysql.com/myoffice.izhnet.ru | 2006-08-14 | 2 | -10/+10 |
| * | | | mysqld --collation-server=xxx --character-set-server=yyy | bar@mysql.com/bar.intranet.mysql.r18.ru | 2006-08-11 | 3 | -1/+9 |
| |/ / | |||||
* | | | Fix bad manual merge. | cmiller@zippy.cornsilk.net | 2006-09-05 | 1 | -313/+0 |
* | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint | cmiller@zippy.cornsilk.net | 2006-09-05 | 2 | -4/+5 |
|\ \ \ | |||||
| * \ \ | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 | msvensson@shellback.(none) | 2006-08-31 | 32 | -337/+1747 |
| |\ \ \ | |||||
| * | | | | Disable testing of "encrypt" in ctype_ucs.test | msvensson@shellback.(none) | 2006-08-31 | 2 | -4/+5 |
| * | | | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/g50 | tsmith@maint2.mysql.com | 2006-08-31 | 26 | -46/+571 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint | cmiller@zippy.cornsilk.net | 2006-09-05 | 4 | -77/+0 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | kostja@bodhi.local | 2006-08-31 | 32 | -337/+1747 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 | rburnett@bk-internal.mysql.com | 2006-08-29 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 | rburnett@bk-internal.mysql.com | 2006-08-28 | 1 | -0/+1 |
| | |\ \ \ \ \ | |||||
* | | \ \ \ \ \ | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint | cmiller@zippy.cornsilk.net | 2006-09-05 | 3 | -52/+56 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Post-merge fixes. | kostja@bodhi.local | 2006-08-30 | 3 | -52/+55 |
| * | | | | | | | Remove the fix for Bug#10668 "CREATE USER does not enforce username | kostja@bodhi.local | 2006-08-30 | 2 | -3/+5 |
* | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint | cmiller@zippy.cornsilk.net | 2006-09-05 | 4 | -81/+317 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | kostja@bodhi.local | 2006-08-30 | 32 | -334/+1739 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-5.0 | timour/tkatchaounov@dl145s.mysql.com | 2006-08-28 | 2 | -0/+22 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint | cmiller@zippy.cornsilk.net | 2006-09-05 | 6 | -0/+150 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix for BUG#16899: Possible buffer overflow in handling of DEFINER-clause | anozdrin/alik@alik. | 2006-08-24 | 8 | -0/+193 |
* | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint | cmiller@zippy.cornsilk.net | 2006-09-05 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 | rburnett@bk-internal.mysql.com | 2006-08-21 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge mysql.com:/home/hf/work/mysql-4.1.15440 | holyfoot/hf@mysql.com/deer.(none) | 2006-08-20 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Bug #15440 (handler.test hangs in embedded mode) | holyfoot/hf@mysql.com/deer.(none) | 2006-07-25 | 1 | -0/+1 |
* | | | | | | | | | | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/g51 | tsmith@maint2.mysql.com | 2006-09-04 | 28 | -689/+1023 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | mysql-test-run.pl: | cmiller@maint1.mysql.com | 2006-09-02 | 1 | -1/+1 |
| * | | | | | | | | | | | Merge maint1.mysql.com:/data/localhome/cmiller/mtr_reorder/my51-mtr_reorder | cmiller@maint1.mysql.com | 2006-09-01 | 1 | -27/+31 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge maint1.mysql.com:/data/localhome/cmiller/mtr_reorder/my50-mtr_reorder | cmiller@maint1.mysql.com | 2006-09-01 | 1 | -27/+31 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | mtr_cases.pl: | cmiller@maint1.mysql.com | 2006-09-01 | 1 | -27/+31 |
| * | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.1-new-maint | msvensson@neptunus.(none) | 2006-09-01 | 8 | -98/+110 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Turn on reorder as default. | msvensson@neptunus.(none) | 2006-09-01 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | Move test that requires innodb to "mysql_innodb" | msvensson@neptunus.(none) | 2006-09-01 | 4 | -82/+83 |
| | * | | | | | | | | | | | | | Turn off reorder as default | msvensson@neptunus.(none) | 2006-09-01 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mtr/my51-mtr | msvensson@shellback.(none) | 2006-09-01 | 1 | -1/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge shellback.(none):/home/msvensson/mysql/mtr/my50-mtr | msvensson@shellback.(none) | 2006-09-01 | 1 | -1/+5 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge shellback.(none):/home/msvensson/mysql/mtr/my41-mtr | msvensson@shellback.(none) | 2006-09-01 | 1 | -1/+6 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | Add target to make "mtr", shortcut for running test suite | msvensson@shellback.(none) | 2006-09-01 | 1 | -1/+6 |
| | * | | | | | | | | | | | | | | | Use "--skip-innodb" if running with testcases that does not need innodb | msvensson@shellback.(none) | 2006-09-01 | 2 | -13/+5 |
| | * | | | | | | | | | | | | | | | Only install the first masters db and copy it for the other | msvensson@shellback.(none) | 2006-08-31 | 2 | -2/+17 |
| | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Fix results of mysqldump test after messy merge | jimw@rama.(none) | 2006-08-31 | 1 | -138/+170 |
| * | | | | | | | | | | | | | | | Merge rama.(none):/home/jimw/my/mysql-5.0-clean | jimw@rama.(none) | 2006-08-31 | 2 | -89/+100 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Restore bug fix lost in merge of client/mysqldump.c, and clean up mysqldump.test | jimw@rama.(none) | 2006-08-31 | 2 | -545/+248 |
| | * | | | | | | | | | | | | | | Resolve conflicts | jimw@rama.(none) | 2006-08-31 | 2 | -0/+342 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | Bug #21288: mysqldump segmentation fault when using --where | jimw@rama.(none) | 2006-08-17 | 2 | -0/+35 |
| * | | | | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.1-new-maint | msvensson@shellback.(none) | 2006-08-31 | 2 | -68/+99 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | Bug#21721 Test suite does not start with NDB, hangs forever; problem around "... | msvensson@shellback.(none) | 2006-08-31 | 1 | -4/+20 |
| | * | | | | | | | | | | | | | | | | Add check in 'spawn_impl' that we are not trying to span when the path to the... | msvensson@shellback.(none) | 2006-08-31 | 1 | -0/+2 |