summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-builddf@pippilotta.erinye.com2007-06-132-2/+2
|\
| * Merge trift2.:/MySQL/M41/tmp-4.1joerg@trift2.2007-06-132-2/+2
| |\
| | * sql/item_func.ccjoerg@trift2.2007-06-131-1/+1
| | * Add a cast, needed by some platforms.joerg@trift2.2007-06-081-1/+1
| | * Do not use the "thd" pointer to identify a thread in the embedded lib,joerg@trift2.2007-06-071-1/+1
* | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1df@pippilotta.erinye.com2007-06-131-21/+35
|\ \ \ | |/ / |/| |
| * | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commitdf@pippilotta.erinye.com2007-06-131-21/+35
| |\ \
| | * | BK changes fordf@pippilotta.erinye.com2007-06-131-21/+35
* | | | Merge trift2.:/MySQL/M41/bug23504-4.1joerg@trift2.2007-06-0727-20/+27
|\ \ \ \ | | |_|/ | |/| |
| * | | netware/*.def : Allocate 128K stack for all executables (bug#23504)joerg@trift2.2007-06-0727-20/+27
* | | | Merge trift2.:/MySQL/M41/mysql-4.1joerg@trift2.2007-06-065-38/+376
|\ \ \ \ | | |/ / | |/| |
| * | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1tsmith@quadxeon.mysql.com2007-06-061-2/+2
| |\ \ \
| * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maintiggy@amd64.(none)2007-06-041-1/+1
| |\ \ \ \
| | * | | | Bug#24400 Source files for Server: Visual Studio Workspace contains a small c...iggy@amd64.(none)2007-05-161-1/+1
| * | | | | Move code after variable delcarationmsvensson@pilot.(none)2007-06-011-1/+1
| * | | | | Merge pilot.(none):/data/msvensson/mysql/bug28497/my41-bug28497-query_get_valuemsvensson@pilot.(none)2007-06-013-34/+365
| |\ \ \ \ \
| | * | | | | Bug#28497 wait_for_slave_to_stop can cause random replication mysql-test fail...msvensson@pilot.(none)2007-06-013-34/+365
| * | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41tsmith@quadxeon.mysql.com2007-05-301-3/+10
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge bk-internal:/home/bk/mysql-4.1-maintmsvensson@shellback.(none)2007-05-231-3/+10
| | |\ \ \ \ \
| | | * | | | | Bug#27396 Wrong check for root priveledgemsvensson@shellback.(none)2007-05-231-3/+10
* | | | | | | | Merge trift2.:/MySQL/M41/mysql-4.1joerg@trift2.2007-06-061-2/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | / / | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Raise version number after cloning 4.1.23joerg/mysqldev@mysql.com/production.mysql.com2007-06-061-2/+2
| |/ / / / /
* | | | | | Makefile.am, configure.in:kent@mysql.com/kent-amd64.(none)2007-05-302-1/+8
|/ / / / /
* | | | | Merge mysql.com:/home/svoj/devel/bk/mysql-4.1svoj@mysql.com/june.mysql.com2007-05-236-11/+35
|\ \ \ \ \
| * | | | | Addition to fix forsvoj@mysql.com/june.mysql.com2007-05-171-1/+1
| * | | | | Addition to fix forsvoj@mysql.com/june.mysql.com2007-05-171-1/+1
| * | | | | BUG#25712 - insert delayed and check table run together report crashedsvoj@mysql.com/april.(none)2007-05-162-8/+20
| * | | | | BUG#27998 - mysqld crashed when executing INSERT DELAYEDsvoj@mysql.com/june.mysql.com2007-04-283-2/+14
* | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1tomas@whalegate.ndb.mysql.com2007-05-226-34/+103
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1tomas@whalegate.ndb.mysql.com2007-05-216-34/+103
| |\ \ \ \ \
| | * \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/41-workjonas@perch.ndb.mysql.com2007-05-181-1/+1
| | |\ \ \ \ \
| | | * | | | | ndb - bug#28443jonas@perch.ndb.mysql.com2007-05-181-1/+1
| | * | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/41-workjonas@perch.ndb.mysql.com2007-05-181-16/+18
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | ndb - bug#28443jonas@perch.ndb.mysql.com2007-05-181-16/+18
| | * | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/41-workjonas@perch.ndb.mysql.com2007-05-186-18/+85
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | ndb - bug#28443jonas@perch.ndb.mysql.com2007-05-186-18/+85
* | | | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41tsmith@quadxeon.mysql.com2007-05-216-0/+97
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/hfmain.(none)2007-05-186-0/+97
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed bug #28272: crash that occurs when running an EXPLAIN commandigor@olga.mysql.com2007-05-143-0/+52
| | * | | | | | | Fixed bug #27937: crash for the the second execution of a preparedigor@olga.mysql.com2007-05-143-0/+45
| | |/ / / / / /
| * | | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build-workdf@pippilotta.erinye.com2007-05-165-2/+107
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-builddf@pippilotta.erinye.com2007-05-147-6/+98
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-builddf@pippilotta.erinye.com2007-05-041-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-builddf@pippilotta.erinye.com2007-05-0213-32/+307
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-builddf@pippilotta.erinye.com2007-04-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-builddf@pippilotta.erinye.com2007-04-270-0/+0
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-builddf@pippilotta.erinye.com2007-04-245-8/+180
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-builddf@pippilotta.erinye.com2007-04-202-68/+68
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-builddf@pippilotta.erinye.com2007-04-170-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-builddf@pippilotta.erinye.com2007-04-115-635/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \