summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Manual mergeunknown2003-08-264-14/+58
|\
| * set_var.cc, mysqld.cc, handler.cc, set_var.h, handler.h:unknown2003-08-091-5/+12
| * Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2003-08-027-55/+51
| |\
| * | Many files:unknown2003-08-024-18/+46
| * | Conflict resolutionunknown2003-07-166-5/+14
| |\ \
| * | | mi_keycache.c:unknown2003-07-161-0/+2
| * | | Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2003-06-301-7/+14
| |\ \ \
| | * | | Many files:unknown2003-06-301-7/+14
* | | | | mergeunknown2003-08-192-0/+12
|\ \ \ \ \
| * | | | | Implemented UTC_TIME, UTC_DATE and UTC_TIMESTAMP functions (WL#345)unknown2003-08-112-0/+12
| | |_|_|/ | |/| | |
* | | | | After merge fixesunknown2003-08-193-6/+3
* | | | | Merge with 4.0.14unknown2003-08-115-43/+52
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Review of changesets since last pull.unknown2003-08-071-1/+0
| * | | | Fix for service issue with paths having spaces (bug #687)unknown2003-07-231-0/+1
| * | | | Fix forunknown2003-07-081-1/+2
| * | | | Status query on killed mysql connection results in segmentation fault (Bug #738)unknown2003-07-041-4/+0
| * | | | Fix for UNIXWARE 7unknown2003-07-031-0/+8
| * | | | Cleaner implementation if INSERT ... SELECT with same tablesunknown2003-07-032-3/+5
| * | | | Lot's of clean-ups and fixes for 4.0.14.unknown2003-07-021-1/+1
| * | | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-06-176-8/+16
| |\ \ \ \
| | * | | | Many files:unknown2003-06-151-0/+1
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-06-121-2/+2
| | |\ \ \ \
| | | * | | | Changed safemalloc structure to not have to be 8 byte aligned. (Portability p...unknown2003-06-121-2/+2
| | * | | | | typed moved to a proper placeunknown2003-06-121-3/+3
| | |/ / / /
| * | | | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-06-022-3/+11
| |\ \ \ \ \
| * | | | | | several bug fixesunknown2003-05-311-1/+3
* | | | | | | A new separate error message: Unknown collation 'blablabla'unknown2003-07-291-1/+2
* | | | | | | ulong is not portableunknown2003-07-271-6/+6
* | | | | | | Merge bk-internal:/home/bk/mysql-4.1/unknown2003-07-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | now GRANT db.* ... compares patterns correctly to prevent privilege escalationunknown2003-07-221-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | SCRUM - adding client into embedded serverunknown2003-07-232-4/+2
* | | | | | | Another fix for "client code in embedded library"unknown2003-07-211-2/+2
* | | | | | | Including client code into libmysqldunknown2003-07-145-50/+47
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Resolving conflictsunknown2003-07-045-50/+47
| |\ \ \ \ \ \
| | * | | | | | SCRUMunknown2003-07-043-8/+3
| | * | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-06-194-2/+7
| | |\ \ \ \ \ \
| | * | | | | | | SCRUMunknown2003-06-191-32/+3
| | * | | | | | | SCRUMunknown2003-06-182-9/+13
| | * | | | | | | SCRUMunknown2003-06-175-26/+18
| | |\ \ \ \ \ \ \
| | * | | | | | | | SCRUMunknown2003-06-175-10/+32
| | * | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-06-0910-11/+195
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-06-042-5/+11
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | SCRUMunknown2003-06-042-5/+11
* | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-083-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Support for variables with componentsunknown2003-07-063-2/+9
| |/ / / / / / / / / / /
* | | | | | | | | | | | implementation of mysql_stmt_reset client endunknown2003-07-082-0/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-011-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | sql_state.h:unknown2003-07-011-3/+3
* | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-06-271-1/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Added support for structured options (WL task ID 947).unknown2003-06-271-1/+8
| |/ / / / / / / / / /