summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/bug21868/my50-bug21868msvensson@neptunus.(none)2006-10-195-0/+2213
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Bug#21868 Server crashes if encrypted certificate key providedmsvensson@neptunus.(none)2006-09-255-0/+2213
* | | | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/bug17039/my50-bug17039msvensson@neptunus.(none)2006-10-192-2/+27
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Bug#17039 Cursor with procedure crashes clientmsvensson@neptunus.(none)2006-09-072-2/+27
* | | | | | | | | | | | | Remove extra whitespace in result filemsvensson@neptunus.(none)2006-10-181-6/+6
* | | | | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maintmsvensson@neptunus.(none)2006-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge 192.168.0.4:mysql/mysql-4.1-maintmsvensson@neptunus.(none)2006-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-4.1-maintmsvensson@neptunus.(none)2006-10-1171-4479/+10902
| | |\ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ Merge 192.168.0.4:mysql/mysql-5.0-maintmsvensson@neptunus.(none)2006-10-1826-134/+260
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maintmsvensson@shellback.(none)2006-10-181-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Put the printf of failed ratio on itäs only line, printf was trickedmsvensson@shellback.(none)2006-10-181-2/+3
| * | | | | | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maintmsvensson@shellback.(none)2006-10-183-9/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Don't stop the time in mtr_timer_timeout, that will be done after testcase or...msvensson@shellback.(none)2006-10-181-4/+2
| | * | | | | | | | | | | | | | Remove some junkmsvensson@shellback.(none)2006-10-182-5/+0
| | * | | | | | | | | | | | | | Stop all timers before exiting when --start-and-exit msvensson@shellback.(none)2006-10-181-0/+1
| * | | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@shellback.(none)2006-10-184-89/+100
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maintmsvensson@shellback.(none)2006-10-181-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | Fix bug where a timer was stopped by calling mtr_timer_stop with a "timer" in...msvensson@shellback.(none)2006-10-181-1/+1
| | * | | | | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maintmsvensson@shellback.(none)2006-10-182-60/+71
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | Make --with-ndbcluster only be valid together with --benchmsvensson@shellback.(none)2006-10-182-60/+71
| | * | | | | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maintmsvensson@shellback.(none)2006-10-173-28/+28
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | Remove warningsmsvensson@shellback.(none)2006-10-172-20/+12
| | | * | | | | | | | | | | | | When calculating what features to use for _this_ test run, don't look at test...msvensson@shellback.(none)2006-10-171-0/+2
| | | * | | | | | | | | | | | | Cleanup mtr_timermsvensson@shellback.(none)2006-10-151-8/+14
| | | | |_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-10-174-5/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Fix previous bad patch for Bug#14262.cmiller@zippy.cornsilk.net2006-10-174-5/+6
| | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | Merge naruto.:C:/cpp/bug23010/my50-bug23010Kristofer.Pettersson@naruto.2006-10-172-3/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Bug#23010 _my_b_read() passing illegal file handles to my_seek()Kristofer.Pettersson@naruto.2006-10-092-3/+12
| | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50tsmith/tim@siva.hindu.god2006-10-169-6/+74
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Bug #19764: SHOW commands end up in the slow log as table scanstsmith/tim@siva.hindu.god2006-10-129-6/+74
| * | | | | | | | | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/b4053/50tsmith/tim@siva.hindu.god2006-10-167-22/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/41tsmith/tim@siva.hindu.god2006-09-147-22/+64
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/40tsmith/tim@siva.hindu.god2006-09-146-14/+56
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Bug #4053: too many of "error 1236: 'binlog truncated in the middle of event'...tsmith/tim@siva.hindu.god2006-09-146-14/+56
| | | * | | | | | | | | | | | | Bug #4053: too many of "error 1236: 'binlog truncated in the middle of event'...tsmith/tim@siva.hindu.god2006-09-141-6/+9
* | | | | | | | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/work/my50-workmsvensson@neptunus.(none)2006-10-162-5/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | yassl build fixes for hpux and netwaremsvensson@neptunus.(none)2006-10-162-5/+12
* | | | | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@neptunus.(none)2006-10-161-6/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/work/my50-workmsvensson@neptunus.(none)2006-10-161-6/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Reduce code for SSL_connect and SSL_acceptmsvensson@neptunus.(none)2006-09-281-6/+4
* | | | | | | | | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maintmsvensson@shellback.(none)2006-10-149-45/+126
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1-maintmsvensson@shellback.(none)2006-10-144-20/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | No need to continue in 'mtr_report_test_failed' after timeout detected, retur...msvensson@shellback.(none)2006-10-141-0/+1
| | * | | | | | | | | | | | | | | | | Use char as datatype for the byte that are read with my_fgetc, fixes problem ...msvensson@shellback.(none)2006-10-142-2/+2
| | * | | | | | | | | | | | | | | | | Improving debugging support in 'read_line' functionmsvensson@shellback.(none)2006-10-141-8/+18
| | * | | | | | | | | | | | | | | | | Skip looking for mysql_client_test in 4.1 on windows as it's not built by def...msvensson@shellback.(none)2006-10-141-8/+17
| | * | | | | | | | | | | | | | | | | Look for client bindirs client_release and client_debug before other director...msvensson@shellback.(none)2006-10-131-3/+4
| | * | | | | | | | | | | | | | | | | rpl_empty_master_crash need a master restart so that all log files are deletedmsvensson@shellback.(none)2006-10-131-0/+1
| * | | | | | | | | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maintramil/ram@mysql.com/myoffice.izhnet.ru2006-10-133-1/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Optimize restarts by using --force-restart optionmsvensson@shellback.(none)2006-10-131-1/+1