summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* Merge rama.(none):/home/jimw/my/tmp_mergejimw@rama.(none)2006-07-283-19/+18
|\
| * mergingholyfoot/hf@mysql.com/deer.(none)2006-07-182-16/+1
| * Merge mysql.com:/home/hf/work/mysql-4.1.mrgholyfoot/hf@mysql.com/deer.(none)2006-07-183-16/+30
| |\
| | * Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/deer.(none)2006-07-133-31/+37
| | |\
| | | * bug #16017 (memory leaks in embedded server)holyfoot@deer.(none)2006-06-013-31/+37
* | | | Add sql_locale.cc to cmake scripts.kostja@bodhi.local2006-07-281-2/+3
* | | | Merge bodhi.local:/opt/local/work/tmp_mergekostja@bodhi.local2006-07-261-1/+1
|\ \ \ \ | |/ / /
| * | | Merge bodhi.local:/opt/local/work/tmp_mergekostja@bodhi.local2006-07-081-1/+1
| |\ \ \ | | |/ /
| | * | WL#2928 Date Translation NREbar@mysql.com2006-07-041-1/+1
| * | | mergingholyfoot@mysql.com2006-06-262-45/+10
| |\ \ \ | | |/ /
* | | | Fix windows build of libmysqld. Curious why pushbuild did notandrey@lmy004.2006-07-181-1/+1
* | | | Merge chilla.local:/home/mydev/mysql-5.0-ateamingo@chilla.local2006-07-062-45/+10
|\ \ \ \
| * \ \ \ Merge mysql.com:/home/mydev/mysql-4.1-bug14400ingo@mysql.com2006-07-052-45/+10
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | bug #20318 (ctype_ucs2_def test fails with embedded)holyfoot@deer.(none)2006-06-192-45/+10
| | |/
| | * Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-12-271-0/+0
| * | Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_initmsvensson@shellback.(none)2006-05-312-3/+3
| * | Backport fix for mysql client not using SSl library directlymsvensson@neptunus.(none)2006-04-221-0/+1
* | | manual mergeandrey@lmy004.2006-06-202-2/+2
|\ \ \
| * | | Reorganize, physically the events codeandrey@lmy004.2006-06-082-2/+2
* | | | Re-apply missing changeset, orignally pushed by elliotmonty@mysql.com2006-06-062-2/+2
|/ / /
* | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-newrburnett@bk-internal.mysql.com2006-05-231-1/+1
|\ \ \
| * \ \ manual mergedandrey@lmy004.2006-05-221-1/+1
| |\ \ \
| | * | | fix for bug #17619 Scheduler race conditionsandrey@lmy004.2006-05-221-1/+1
* | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-newrburnett@bk-internal.mysql.com2006-05-221-5/+5
|\ \ \ \ \ | |/ / / /
| * | | | Makefile.am:kent@mysql.com2006-05-201-5/+5
* | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-newrburnett@bk-internal.mysql.com2006-05-171-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | patch to get archive test working on Windows.reggie@big_geek.2006-05-151-1/+1
* | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-newtomas@poseidon.ndb.mysql.com2006-05-151-4/+7
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | libmysqld/Makefile.am : Another undetected typo ...joerg@mysql.com2006-05-091-1/+1
| * | | libmysqld/Makefile.am : Silly typo: Lacking a trailing semicolon after sh...joerg@mysql.com2006-05-091-1/+1
| * | | libmysqld/Makefile.am : Workaround against the empty variable "$sqlstorage...joerg@mysql.com2006-05-081-4/+7
* | | | performing a set of bk mv on each CMakeLists.txt file to try and restore the ...reggie@big_geek.2006-05-112-0/+0
|/ / /
* | | Merge xiphis.org:/home/antony/work2/wl3201.3acurtis@xiphis.org2006-04-241-15/+9
|\ \ \
| * | | WL#3201acurtis@xiphis.org2006-04-131-15/+9
* | | | Fix compilation failure when compiling with BUILD/compile-pentium-debug-maxmonty@mysql.com2006-04-191-2/+5
* | | | Auto mergedserg@serg.mylan2006-04-121-2/+8
|\ \ \ \
| * | | | fixes for 'make dist' and 'make distcheck'serg@serg.mylan2006-04-121-2/+8
* | | | | Add 'mysql_get_ssl_cipher' list of functions to export from libmysqldmsvensson@neptunus.(none)2006-04-111-0/+1
| |/ / / |/| | |
* | | | Merge 192.168.0.10:mysql/mysql-5.1msvensson@shellback.2006-04-111-2/+0
|\ \ \ \
| * | | | Remove unused variables and labelmsvensson@shellback.2006-04-101-2/+0
| |/ / /
* | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-newkent@mysql.com2006-04-111-1/+1
|\ \ \ \
| * \ \ \ Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release.old03kent@mysql.com2006-04-081-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Makefile.am:kent@mysql.com2006-03-251-1/+1
* | | | | fix cmake generation errorreggie@big_geek.2006-04-101-2/+8
|/ / / /
* | | | Makefile.am:kent@mysql.com2006-04-051-1/+5
* | | | Missing file in last commit.knielsen@mysql.com2006-04-031-0/+11
* | | | Add embedded server build to the CMake build files.knielsen@mysql.com2006-04-033-1/+88
* | | | Some changes to make it possible to build for Windows with CMake fromknielsen@mysql.com2006-03-241-0/+1
|/ / /
* | | mergedserg@serg.mylan2006-03-061-32/+22
|\ \ \ | |/ /
| * | compilation fixesserg@serg.mylan2006-03-061-29/+22