summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-newjani@ua141d10.elisa.omakaista.fi2006-06-012-39/+41
|\
| * Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0jani@a193-229-222-105.elisa-laajakaista.fi2006-05-302-39/+41
| |\
| | * Merge mysql.com:/usr/home/ram/work/mysql-4.1ramil@mysql.com2006-05-301-0/+17
| | |\
| | | * Fix for bug #18351: mysqlbinlog does not set default charset?ramil@mysql.com2006-05-041-0/+17
| | * | after merge fix.ramil@mysql.com2006-05-291-1/+2
| | * | manual mergeramil@mysql.com2006-05-291-40/+24
| | * | Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfixknielsen@mysql.com2006-05-151-2/+4
| | |\ \
* | | | | classes that are compiled conditionally in log_event.cc must be defined condi...serg@serg.mylan2006-05-311-15/+0
* | | | | Incompatible ftparser plugin API change.serg@serg.mylan2006-05-281-7/+7
|/ / / /
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newanozdrin@mysql.com2006-05-221-2/+2
|\ \ \ \
| * | | | This is an implementation of two WL items:anozdrin@mysql.com2006-05-181-2/+2
* | | | | Mergekent@mysql.com2006-05-171-1/+0
|\ \ \ \ \
| * | | | | Porting fix of Bug#19564 from 5.0/5.1 trees.cmiller@zippy.(none)2006-05-151-2/+1
* | | | | | Merge bk-internal:/home/bk/mysql-5.1-newknielsen@mysql.com2006-05-171-2/+4
|\ \ \ \ \ \
| * \ \ \ \ \ Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfixknielsen@mysql.com2006-05-161-2/+4
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Fix two Valgrind memory leak warnings.knielsen@mysql.com2006-05-151-2/+4
* | | | | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0tomas@poseidon.ndb.mysql.com2006-05-161-1/+9
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.(none)2006-05-111-1/+9
| |\ \ \ \ \ \
| | * | | | | | BUG#16803 "ln -s /dev/null .mysql_history" doesn't work!msvensson@neptunus.(none)2006-05-091-1/+9
* | | | | | | | Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_mergecmiller@zippy.(none)2006-05-151-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Bug#19564: mysql displays NULL instead of spacecmiller@zippy.(none)2006-05-091-1/+1
| |/ / / / / /
* | | | | | | Removed double enum value.jani@a193-229-222-105.elisa-laajakaista.fi2006-05-161-1/+0
* | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-newjani@a193-229-222-105.elisa-laajakaista.fi2006-05-122-2/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1-mdmsvensson@neptunus.(none)2006-05-127-15/+39
| |\ \ \ \ \ \
| | * | | | | | Fix after merge 5.0->5.1msvensson@neptunus.(none)2006-05-121-1/+1
| | * | | | | | Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_mergemsvensson@neptunus.(none)2006-05-127-15/+39
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | / / / | | | |_|/ / / | | |/| | | |
| * | | | | | Rename cmakelists.txt -> CMakeLists.txtmsvensson@neptunus.(none)2006-05-121-1/+1
* | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-newjani@a193-229-222-105.elisa-laajakaista.fi2006-05-121-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | performing a set of bk mv on each CMakeLists.txt file to try and restore the ...reggie@big_geek.2006-05-111-0/+0
| |/ / / / /
* | | | | | Some fixes that were not done in original merge, compilation revealed.jani@a193-229-222-105.elisa-laajakaista.fi2006-05-111-1/+1
* | | | | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0jani@ua141d10.elisa.omakaista.fi2006-05-098-14/+54
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-05-097-15/+39
| |\ \ \ \
| | * | | | Move "max-connect-retries" option to get alpabetichal ordermsvensson@neptunus.(none)2006-05-031-4/+4
| | * | | | Add support for specifyihng the number of reconnec retries oin the command linemsvensson@neptunus.(none)2006-05-031-14/+19
| | * | | | Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@neptunus.(none)2006-04-287-2/+21
| | |\ \ \ \
| | | * \ \ \ Merge neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208msvensson@neptunus.(none)2006-04-267-2/+21
| | | |\ \ \ \
| | | | * | | | Bug#17208 SSL: client does not verify server certificatemsvensson@neptunus.(none)2006-04-187-2/+21
| | | | |/ / /
* | | | | | | After merge fixesmonty@mysql.com2006-05-041-8/+11
* | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-wl2852jimw@mysql.com2006-05-031-6/+52
|\ \ \ \ \ \ \
| * | | | | | | In the command-line client, try to abort the current query by issuing ajimw@mysql.com2005-10-051-6/+53
* | | | | | | | Merge mysql.com:/home/dlenev/mysql-5.0-bg11081dlenev@mysql.com2006-05-021-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0holyfoot@mysql.com2006-05-021-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Win build fixholyfoot@deer.(none)2006-05-021-1/+1
* | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-cleanjimw@mysql.com2006-05-012-6/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge bk-internal:/home/bk/mysql-5.0jimw@mysql.com2006-05-011-2/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fix for Win buildholyfoot@deer.(none)2006-05-011-2/+4
| * | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-18312jimw@mysql.com2006-05-011-4/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Bug #18312: mysqltest: --sleep=0 doesn't disable sleepjimw@mysql.com2006-04-211-4/+5
| * | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0holyfoot@mysql.com2006-04-282-1/+405
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | bug #18115 (mysql_upgrade on Windows)holyfoot@deer.(none)2006-04-282-1/+405
View Lorry Controller Status