summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintunknown2007-03-1912-317/+50
|\
| * Bug#20166 mysql-test-run.pl does not test system privilege tables creationunknown2007-03-169-109/+49
| * Merge bk-internal:/home/bk/mysql-5.0-maintunknown2007-03-163-0/+28
| |\
| | * Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-03-153-0/+28
| | |\
| * | | Remove test/udf_test and test/udf_test.res, since udf's are nowadaysunknown2007-03-153-209/+1
* | | | Merge bk-internal:/home/bk/mysql-5.1-new-maintunknown2007-03-193-10/+38
|\ \ \ \
| * \ \ \ Merge mysql.com:/home/ram/work/b24558/b24558.5.0unknown2007-03-153-10/+38
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fix for bug #24558: Increasing decimal column length causes data lossunknown2007-03-153-0/+28
* | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintunknown2007-03-151-84/+55
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Pass pointer to current mysqld to mysqld_arguments in order to make theunknown2007-03-151-83/+55
| | |_|/ | |/| |
* | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintunknown2007-03-150-0/+0
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Merge naruto.:C:/cpp/bug25042/my50-bug25042unknown2007-03-092-43/+122
| |\ \
| * \ \ Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maintunknown2007-03-09491-9738/+12060
| |\ \ \ | | | |/ | | |/|
| * | | Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maintunknown2007-02-21299-836/+721009
| |\ \ \
| * \ \ \ Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maintunknown2007-02-1297-4556/+2475
| |\ \ \ \
| * \ \ \ \ Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maintunknown2007-02-02234-3025/+5662
| |\ \ \ \ \
| * \ \ \ \ \ Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maintunknown2007-01-260-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge naruto.:C:/cpp/mysql-4.1-maintunknown2007-01-110-0/+0
| | |\ \ \ \ \ \
* | | | | | | | | Fix for BUG#26971 "BUILD/check-cpu does not recognize Intel Core 2unknown2007-03-091-2/+3
* | | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-03-091-32/+37
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Implementing the feature at BUG#26964 "option --no-beep for mysqladmin".unknown2007-03-091-32/+37
* | | | | | | | | | rpl_ssl.result, rpl_ssl.test:unknown2007-03-082-6/+6
* | | | | | | | | | The most recent push into mysql-5.1 from mysql-5.2 was a mistake.unknown2007-03-082-2/+1
* | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2007-03-082-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update version to 5.2.0-alpha - new 5.2 treeunknown2007-02-282-1/+2
* | | | | | | | | | | Update result for 5.1unknown2007-03-081-4/+4
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintunknown2007-03-081-7/+20
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintunknown2007-03-081-7/+20
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bug #26792 Add DBX debugger support to mysql-test-run.plunknown2007-03-051-6/+20
* | | | | | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintunknown2007-03-081-4/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-maintunknown2007-03-08102-794/+3153
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix VC++ warning, "conversion from ha_checksum to char"unknown2007-03-051-1/+1
| * | | | | | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/bug21781/my50-bug21781unknown2007-03-0517-2199/+177
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge 192.168.0.10:mysql/my50-m-bug18431unknown2007-03-031-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Remove strange commentunknown2006-07-231-4/+0
| * | | | | | | | | | | | | Add hint about using --help to see what options are availableunknown2007-03-021-0/+1
* | | | | | | | | | | | | | Fix 6 warnings from win64, where one is a potential bug.unknown2007-03-083-6/+7
* | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.1-new-maintunknown2007-03-0817-2200/+178
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pilot.blaudden:/home/msvensson/mysql/bug21781/my50-bug21781unknown2007-03-052-2178/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Remove ssl_des.test and ssl_des.resultunknown2007-03-052-2178/+0
| * | | | | | | | | | | | | | Bitkeeper magicunknown2007-03-050-0/+0
| * | | | | | | | | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/bug21781/my50-bug21781unknown2007-03-0516-23/+179
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Bug#21781 Replication slave io thread hangsunknown2007-03-052-0/+153
| | * | | | | | | | | | | | | Add "have_ssl" as synonym for "have_openssl"unknown2007-03-0514-22/+25
* | | | | | | | | | | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50unknown2007-03-081-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | comp_err.c: return ha_checksum from checksum_format_specifier() - more corre...unknown2007-03-081-2/+2
* | | | | | | | | | | | | | | Fix bad merge of mysql_upgrade.c; return to version 1.27 of the file, as afte...unknown2007-03-081-10/+5
* | | | | | | | | | | | | | | Merge mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-maintunknown2007-03-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-ndbunknown2007-03-0813-31/+92
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge poseidon.mysql.com:/home/tomas/mysql-5.0unknown2007-03-0813-31/+92
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \