summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
Commit message (Expand)AuthorAgeFilesLines
* Resolving merge conflictsunknown2002-12-121-0/+8
|\
| * Pull conflicts resolutionsunknown2002-11-291-0/+8
| |\
| | * Merged by handsunknown2002-11-071-0/+10
| | |\
| | | * Some code improvementsunknown2002-10-231-3/+3
| | | * Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1unknown2002-10-181-0/+10
| | | |\
| | | | * Huge pullunknown2002-10-071-0/+10
| | | | |\
| | | | | * Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1unknown2002-08-031-0/+9
| | | | | |\
| | | | | | * Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1unknown2002-07-091-1/+3
| | | | | | |\
| | | | | | * \ Resolving of conflicts from pullunknown2002-06-171-0/+9
| | | | | | |\ \
| | | | | | | * | Net->client structures macro addedunknown2002-06-171-0/+9
* | | | | | | | | merge fixunknown2002-12-061-13/+37
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | After merge fixesunknown2002-12-061-11/+16
| * | | | | | | | | Merge with 4.0.6unknown2002-12-051-3/+22
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Copy arguments given to mysql_server_init()unknown2002-12-051-2/+2
| | * | | | | | | | | Removed copying of parameters as this leads to memory leaks in embedded server.unknown2002-12-051-0/+1
| | * | | | | | | | | New multi-table-update codeunknown2002-11-291-1/+19
* | | | | | | | | | | Merge work.mysql.com:/home/bk/mysql-4.1unknown2002-12-051-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Return a warning for DROP DATABASE/TABLE IF EXISTS <non_existing_db/table(s)>unknown2002-12-041-1/+2
| |/ / / / / / / / / /
* | | | | | | | | | | SCRAM Remove spaces from most changed files.unknown2002-12-051-5/+5
* | | | | | | | | | | Merge mysql.com:/home/pz/mysql/mysql-4.1-rootunknown2002-12-041-3/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | mergedunknown2002-12-021-3/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | INSERT ... ON DUPLICATE KEY UPDATE ...unknown2002-12-021-3/+4
| | | |/ / / / / / / / | | |/| | | | | | | |
* | | | | | | | | | | Megrge new changes in...unknown2002-12-011-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | check of using same table for changing and selectunknown2002-11-301-0/+3
| |/ / / / / / / / /
* | | | | | | | | | Merging....unknown2002-11-291-1/+12
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | after review changes in IN/ALL/ANY/SOME (SCRUM)unknown2002-11-271-0/+2
| * | | | | | | | | mergingunknown2002-11-271-20/+20
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge myvenu.com:/home/venu/bk/src-4.1unknown2002-11-261-1/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | select_test.c, insert_test.c:unknown2002-11-261-1/+1
| * | | | | | | | | | | ALL/ANY/SOMEunknown2002-11-071-0/+9
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Correct bug which exposed itself in rpl000017unknown2002-11-291-0/+1
* | | | | | | | | | | Merge mysql.com:/home/pz/mysql/mysql-4.1-rootunknown2002-11-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Reference to field in outer subelect fixedunknown2002-11-241-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge mysql.com:/home/pz/mysql/mysql-4.1-rootunknown2002-11-241-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | protocol mergeunknown2002-11-221-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | protocol fixupsunknown2002-11-221-1/+1
* | | | | | | | | | | Merge....unknown2002-11-241-17/+17
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Fixes after merge with 4.0unknown2002-11-211-1/+0
| * | | | | | | | | | Merge with 4.0unknown2002-11-211-11/+12
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Try to optimize the cache buffer size needed for bulk_insertunknown2002-11-201-1/+2
| | * | | | | | | | | Small improvement to alloc_rootunknown2002-11-161-5/+6
| | * | | | | | | | | Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes.unknown2002-11-071-5/+4
| * | | | | | | | | | Added some compatibility modes (for the future)unknown2002-11-201-0/+5
| | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | removed unused functionunknown2002-11-141-4/+0
| * | | | | | | | | Some code optimisations related to EXPLAIN of derived tables and the unknown2002-11-091-2/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge mysql.com:/home/pz/mysql/mysql-4.1-rootunknown2002-11-061-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Extensions to support this:unknown2002-11-061-1/+1
* | | | | | | | | Merge mysql.com:/home/pz/mysql/mysql-4.1-rootunknown2002-11-051-12/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1unknown2002-11-041-12/+7
| |\ \ \ \ \ \ \ \
| | * | | | | | | | removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion (SCRUM)unknown2002-10-301-12/+7