summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-11-2626-88/+250
|\
| * added error code message for 897tomas@poseidon.ndb.mysql.com2004-11-261-1/+2
| * Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-11-264-59/+81
| |\
| | * cleaned up code a bittomas@poseidon.ndb.mysql.com2004-11-264-59/+81
| * | ha_innodb.cc:heikki@hundin.mysql.fi2004-11-261-0/+3
| * | Many files:heikki@hundin.mysql.fi2004-11-2611-16/+90
| |/
| * Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-11-252-4/+8
| |\
| | * moved default setting to config.ini to MgmtSrvrtomas@poseidon.ndb.mysql.com2004-11-252-4/+8
| * | Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-4.1mats@mysql.com2004-11-257-8/+66
| |\ \
| | * \ Mergemats@mysql.com2004-11-257-8/+66
| | |\ \
| | | * \ Merge mysql.com:/space/bkroot/mysql-4.0mats@mysql.com2004-11-257-7/+66
| | | |\ \
| | | | * | Fix for Bug#6148. Only rewind read position in binary log when themats@mysql.com2004-11-256-7/+65
* | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2004-11-261-1/+1
|\ \ \ \ \ \
| * | | | | | fixed redifinition of variablebell@sanja.is.com.ua2004-11-261-1/+1
* | | | | | | Merge mysql.com:/home/mydev/mysql-5.0ingo@mysql.com2004-11-262-11/+12
|\ \ \ \ \ \ \
| * | | | | | | Changed test to remove node name from output.ingo@mysql.com2004-11-262-11/+12
| |/ / / / / /
* | | | | | | Portability fix: we had problems with -1.1E-38, -2.2E-308 values ram@gw.mysql.r18.ru2004-11-262-12/+12
|/ / / / / /
* | | | | | Merge mysql.com:/home/mydev/mysql-5.0ingo@mysql.com2004-11-251-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0petr@mysql.com2004-11-261-1/+1
| |\ \ \ \ \ \
| | * | | | | | Fix for the unixware: non-posix sigwaitpetr@mysql.com2004-11-251-1/+1
* | | | | | | | Merge mysql.com:/home/mydev/mysql-5.0ingo@mysql.com2004-11-2535-216/+1169
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | WL#2050 - CREATE USER and DROP USER and RENAME USERingo@mysql.com2004-11-2535-216/+1169
| |/ / / / / /
* | | | | | | Merge mysql.com:/usr/local/bk/mysql-5.0pem@mysql.com2004-11-255-25/+69
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fixed BUG#6807: Stored procedure crash if CREATE PROCEDURE ... KILL QUERYpem@mysql.comhem.se2004-11-255-25/+69
* | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-11-2512-90/+111
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ram@gw.mysql.r18.ru2004-11-253-10/+14
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ram@gw.mysql.r18.ru2004-11-253-10/+14
| | |\ \ \ \
| | | * | | | A fix (bug #6441: Aggregate UDF in multi-table query crashes MySQL when retur...ram@gw.mysql.r18.ru2004-11-063-10/+14
| * | | | | | table.cc:bar@mysql.com2004-11-251-1/+20
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-11-254-67/+50
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-11-253-51/+33
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | ndb/src/common/logger/LogHandler.cpptomas@poseidon.ndb.mysql.com2004-11-253-51/+33
| | * | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2004-11-251-16/+17
| | |\ \ \ \ \
| | | * \ \ \ \ Merge mysql.com:/home/jonas/src/mysql-4.1-fixjoreland@mysql.com2004-11-251-16/+17
| | | |\ \ \ \ \
| | | | * | | | | bug#6775 - ndb - fix bug introduced by bug fix joreland@mysql.com2004-11-251-16/+17
| * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-11-244-12/+27
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | bug#6784serg@serg.mylan2004-11-243-10/+25
| | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-11-241-2/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | harmless "buffer overflow" fixedserg@serg.mylan2004-11-241-2/+2
* | | | | | | | | | do not leave sql command uninitialized, because it used for detection need of...bell@sanja.is.com.ua2004-11-251-1/+1
* | | | | | | | | | spelling fixed/comments added (postreview fixes)bell@sanja.is.com.ua2004-11-258-7/+11
* | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2004-11-25157-2846/+2601
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0guilhem@mysql.com2004-11-251-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | sql_select.cc:guilhem@mysql.com2004-11-251-1/+1
| * | | | | | | | | | | lowercase_table3.result:heikki@hundin.mysql.fi2004-11-251-1/+1
| * | | | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0brian@avenger.(none)2004-11-2473-761/+1173
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merging 4.1 to 5.0brian@avenger.(none)2004-11-2473-761/+1173
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | configure.in:heikki@hundin.mysql.fi2004-11-241-0/+3
| | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-11-241-1/+2
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | added explanation of error code 4335tomas@poseidon.ndb.mysql.com2004-11-241-1/+2
| | | | | |/ / / / / / / | | | | |/| | | | | | |