summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 4.1 to 5.0pem@mysql.com2003-12-011-173/+175
|\
| * Portability fixes (for binary build)monty@mysql.com2003-12-011-30/+47
| * Merge mysql.com:/my/mysql-4.0 into mysql.com:/my/mysql-4.1monty@mysql.com2003-11-261-2/+2
| |\
| | * Added compilation comment to 'show variables'monty@mysql.com2003-11-261-2/+2
| * | Fixed compiler warnings from Intel compiler in Win64monty@mysql.com2003-11-231-119/+105
| * | Merge key cache structures to onemonty@mysql.com2003-11-201-22/+21
* | | Merging 4.1->5.0.pem@mysql.com2003-11-191-16/+70
|\ \ \ | |/ / |/| |
| * | Merging 4.1->5.0pem@mysql.com2003-10-221-16/+70
| |\ \
| | * | WL#1265: Fix proper ALTER/DROP support in the SP cache.pem@mysql.comhem.se2003-10-211-0/+2
| | * | Merging 4.1 -> 5.0pem@mysql.com2003-09-241-16/+68
| | |\ \
| | | * | Implemented SP CONDITIONs and HANDLERs, with the extension of handlingpem@mysql.telia.com2003-09-161-0/+5
| | | * | Post-merge fixes.pem@mysql.telia.com2003-08-261-1/+0
| | | * | Merge 4.1 into 5.0pem@mysql.com2003-08-261-15/+63
| | | |\ \
| | | | * | Merging 4.1 into 5.0 (second pass; post-merge fixes).pem@mysql.telia.com2003-07-091-2/+12
| | | | * | Merge 4.1 into 5.0 (first pass).pem@mysql.telia.com2003-07-081-23/+61
| | | | |\ \
| | | | | * | rlyon-5.0.0-alpha.patchgreg@mysql.com[greg]2003-05-291-5/+4
| | | | | * | made lex a pointer in THDvva@eagle.mysql.r18.ru2003-05-051-2/+2
| | | | | * | Merged 4.1 to 5.0.pem@mysql.com2003-04-291-12/+59
| | | | | |\ \
| | | | | | * \ Post post-merge fix.pem@mysql.com2003-04-171-1/+12
| | | | | | |\ \
| | | | | | | * \ Merged 4.1 into 5.0.pem@mysql.com2003-04-161-1/+12
| | | | | | | |\ \
| | | | | | * | \ \ Merginghf@deer.mysql.r18.ru2003-04-081-3/+3
| | | | | | |\ \ \ \ | | | | | | | |/ / / | | | | | | |/| | |
| | | | | | | * | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0hf@genie.(none)2003-03-311-3/+3
| | | | | | | |\ \ \
| | | | | | | | * | | SCRUMhf@genie.(none)2003-03-311-3/+3
| | | | | | * | | | | Merging 4.1 to 5.0.pem@mysql.com2003-04-041-9/+56
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | Deprecated the update log (Sprint task #792). Now --log-updateguilhem@mysql.com2003-04-021-9/+56
| | | | | | | |/ / / /
* | | | | | | | | | | mergemonty@mashka.mysql.fi2003-11-181-39/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTSmonty@mashka.mysql.fi2003-11-181-39/+32
* | | | | | | | | | | | Fixed minor compiler errors encountered during pre-final builds.greg@mysql.com2003-11-121-2/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge with 4.0monty@narttu.mysql.fi2003-11-041-8/+17
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Safety fix for adding service name to search config groupsmonty@narttu.mysql.fi2003-10-301-1/+2
| * | | | | | | | | | Change back service name to MySQLmonty@narttu.mysql.fi2003-10-301-3/+9
| * | | | | | | | | | Fix for problem of installing MySQL as a service withmonty@narttu.mysql.fi2003-10-281-6/+8
* | | | | | | | | | | Mergemonty@narttu.mysql.fi2003-11-031-59/+69
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Simplified 'wrong xxx name' error messages by introducing 'general' ER_WRONG_...monty@narttu.mysql.fi2003-11-031-59/+68
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | after review fixbell@sanja.is.com.ua2003-11-031-0/+8
* | | | | | | | | | | Cleanups (comments and compiler warnings)monty@mysql.com2003-11-021-1/+1
* | | | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1/serg@serg.mylan2003-10-311-29/+69
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Mergeigor@rurik.mysql.com2003-10-301-29/+69
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Manual merge after improving concurrency for key cache reassignmentigor@rurik.mysql.com2003-10-011-29/+69
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Manual mergeigor@rurik.mysql.com2003-08-261-29/+69
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | set_var.cc, mysqld.cc, handler.cc, set_var.h, handler.h:igor@rurik.mysql.com2003-08-091-9/+28
| | | | * | | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2003-08-021-11/+25
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Many files:igor@rurik.mysql.com2003-08-021-24/+49
| | | | * | | | | | | | | | Conflict resolutionigor@rurik.mysql.com2003-07-161-28/+61
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2003-06-301-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | mysqld.cc, handler.cc:igor@rurik.mysql.com2003-06-301-1/+1
* | | | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1/serg@serg.mylan2003-10-231-5/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1hf@deer.(none)2003-10-211-5/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fix for Windows bug reported throuhg Miguelhf@deer.(none)2003-10-211-5/+10
* | | | | | | | | | | | | | | | | query expansion for fulltext searchserg@serg.mylan2003-10-231-5/+5