summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
* post merge fixesunknown2004-09-101-0/+2
* After merge fixes of merge with 4.1 that included the new arena code.unknown2004-09-091-0/+4
* Merge with 4.1unknown2004-09-061-44/+72
|\
| * Change Item_arena::state to enumunknown2004-08-311-4/+4
| * Merge: manual resolveunknown2004-08-241-3/+19
| |\
| | * Fix for Bug#5034 "prepared "select 1 into @arg15", second unknown2004-08-241-3/+19
| * | Fix to compile with msvc: converted static const int Item_arena::* to enum me...unknown2004-08-241-4/+8
| |/
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-08-211-68/+60
| |\
| | * Fix for bug#4912 "mysqld crashs in case a statement is executedunknown2004-08-211-68/+60
| * | mergedunknown2004-08-201-2/+2
| |\ \
| | * | Making FLUSH TABLES WITH READ LOCK block COMMITs of existing transactions,unknown2004-08-201-2/+2
| * | | mergedunknown2004-08-201-1/+0
| |\ \ \
| | * | | sql_class.h:unknown2004-08-201-1/+0
| * | | | mergedunknown2004-08-201-1/+1
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | cosmetic changeunknown2004-08-191-1/+1
| | * | Fix for BUG#4971 "CREATE TABLE ... TYPE=HEAP SELECT ... stops slave (wrong DE...unknown2004-08-191-0/+21
| * | | (manual port from 4.0 - was needed)unknown2004-08-191-0/+21
| | |/ | |/|
| * | manually mergedunknown2004-08-181-0/+13
| |\ \ | | |/
| | * Fix for:unknown2004-07-311-6/+10
| | * removing assertion (will be moved to 4.1) for non-debug to compileunknown2004-07-311-1/+9
| | * Avoiding a theoretically possible crash (pthread_mutex_lock(0)) which could (...unknown2004-07-301-0/+1
* | | Port of cursors to be pushed into 5.0 tree:unknown2004-08-031-12/+14
* | | VIEWunknown2004-07-161-14/+19
* | | Merge with 4.1.3-betaunknown2004-07-071-11/+38
|\ \ \ | |/ /
| * | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1unknown2004-06-231-0/+2
| |\ \
| | * | Robustness feature.unknown2004-06-201-0/+2
| * | | Fix for bug#4236 "Server crash on attempt to execute non-preparedunknown2004-06-221-1/+1
| |/ /
| * | WL#1264 "Per-thread time zone support infrastructure".unknown2004-06-181-0/+3
| * | Mergedunknown2004-06-071-9/+29
| |\ \
| | * \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-06-041-1/+1
| | |\ \
| | * \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-06-031-9/+29
| | |\ \ \
| | | * \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-06-011-9/+29
| | | |\ \ \
| | | | * \ \ Manually merged, requirees more mergingunknown2004-05-251-0/+4
| | | | |\ \ \
| | | | * \ \ \ Mergeunknown2004-05-241-1/+1
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-05-211-9/+29
| | | | |\ \ \ \ \
| | | | | * | | | | WL#1622 "SQL Syntax for Prepared Statements": Post-review fixes (1 of 2)unknown2004-05-211-2/+7
| | | | | * | | | | Trivial manual mergeunknown2004-05-151-7/+22
| | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-04-281-2/+6
| | | | | | |\ \ \ \ \
| | | | | | * | | | | | WL#1622 "SQL Syntax for Prepared Statements": post-review fixes:unknown2004-04-131-21/+22
| | | | | | * | | | | | Mergeunknown2004-04-081-0/+14
| | | | | | |\ \ \ \ \ \
| | | | | | | * \ \ \ \ \ Post-merge fixesunknown2004-04-051-0/+14
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * | | | | | Many files:unknown2004-04-051-0/+14
| * | | | | | | | | | | | | Portability fixes (and a typo after last merge)unknown2004-06-041-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1unknown2004-06-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Implementation of WL#1824 "Add replication of character set variables in 4.1",unknown2004-06-031-1/+1
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge with 4.0 to get fixes for netwareunknown2004-06-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | * | | | | | | | | | Changed --log-warnings to be integer instead of boolean. Given --skip-log-war...unknown2004-06-011-1/+1
| * | | | | | | | | | | Proposed fix for bug #3412 (embedded server: prepared statement returnsunknown2004-05-281-0/+2
| | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Changed prototype of killed_ptr() to make it more portableunknown2004-05-261-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merging 4.1 to 5.0.unknown2004-05-261-6/+31
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /