summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge abarkov@bk-internal:/home/bk/mysql-5.0unknown2005-10-1347-198/+471
|\
| * type_binary.result, type_binary.test:unknown2005-10-1347-198/+471
* | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-137-27/+2455
|\ \
| * \ Mergeunknown2005-10-137-27/+2455
| |\ \
| | * | mysqlwatch.vcproj:unknown2005-10-112-47/+261
| | * | Many files:unknown2005-10-116-0/+2212
| | * | Makefile.am:unknown2005-10-101-1/+6
| | * | func_group.test:unknown2005-10-091-0/+2
* | | | Manual merge of bug fix #7672unknown2005-10-136-0/+45
|\ \ \ \ | |/ / / |/| | |
| * | | Manual mergedunknown2005-10-136-0/+44
| |\ \ \
| | * | | select.test, sql_select.cc, sql_lex.cc, item.cc:unknown2005-10-134-5/+17
| | * | | Manual merge, fix for bug #7672unknown2005-10-125-0/+31
| | |\ \ \
| | | * | | Fix bug#7672 Unknown column error in order clauseunknown2005-10-096-1/+38
* | | | | | A post-review fix (Bug#12736)unknown2005-10-131-0/+1
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-1310-1/+589
|\ \ \ \ \ \
| * \ \ \ \ \ Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmpunknown2005-10-131-0/+1
| |\ \ \ \ \ \
| | * | | | | | Tweak kill test to avoid spurious test failure on SCO OpenServer. (Bug #12136)unknown2005-09-201-0/+1
| * | | | | | | Mergeunknown2005-10-133-0/+16
| |\ \ \ \ \ \ \
| | * | | | | | | Fix CAST(1.0e+300 TO SIGNED). (Bug #13344)unknown2005-09-223-0/+16
| * | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmpunknown2005-10-133-1/+16
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Handle errors returned by system crypt() in ENCRYPT(). (Bug #13619)unknown2005-10-063-1/+16
| * | | | | | | | | BUG#13343 CREATE|etc TRIGGER|VIEW|USER don't commit the transaction (inconsis...unknown2005-10-133-0/+556
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-138-14/+151
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | A fix and a test case for Bug#12736 "Server crash during a select".unknown2005-10-138-14/+151
* | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-1331-50/+725
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | BUG# 13052unknown2005-10-124-2/+234
| * | | | | | | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0unknown2005-10-1316-44/+326
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-132-2/+3
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | replace port number with string identifier so that it may have different port...unknown2005-10-122-2/+3
| | * | | | | | | | | | | fixes after merge of 4.1.unknown2005-10-135-31/+11
| | * | | | | | | | | | | Building with compile-pentium-valgrind-max (without safemalloc) defines my_fr...unknown2005-10-132-2/+3
| | * | | | | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-125-0/+43
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | * | | | | | | | | | | Merge mysql.com:/home/mysql_src/mysql-4.1unknown2005-10-121-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | To force a restart at the end of test, the option file must be non-empty, it'...unknown2005-10-121-0/+1
| | * | | | | | | | | | | Merge mysql.com:/home/mysql_src/mysql-4.1unknown2005-10-1212-42/+324
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | mergeunknown2005-10-12106-540/+45165
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-123-1/+11
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | sql_yacc.yy:unknown2005-10-123-1/+11
| | | | * | | | | | | | | | | Merge mysql.com:/space/my/mysql-4.1unknown2005-10-111-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | | Fix for BUG#13023: "SQL Thread is up but doesn't move forward". Details in sl...unknown2005-10-128-41/+304
| | | * | | | | | | | | | | | The "exit" command of mysqltest is quite useful when writing tests for 4.1 so...unknown2005-10-051-2/+7
| | | * | | | | | | | | | | | Importing BUILD/compile-pentium64-valgrind-max from 5.0 (unchanged), and spee...unknown2005-10-042-0/+30
| | * | | | | | | | | | | | | slave.cc:unknown2005-10-121-1/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | To help people avoid BUG#2122 "changing hostname confuses master or slave" un...unknown2005-10-111-1/+18
| * | | | | | | | | | | | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0unknown2005-10-125-0/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-132-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | make_binary_distribution.sh:unknown2005-10-122-0/+3
| | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-123-0/+40
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Temporary solution for bug #13969 "Routines which are replicated from masterunknown2005-10-123-0/+40
| * | | | | | | | | | | | | | | Fix of incompatible typesunknown2005-10-121-1/+2
| |/ / / / / / / / / / / / / /