summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
* Merge: manual resolvekonstantin@mysql.com2004-08-241-3/+19
|\
| * Fix for Bug#5034 "prepared "select 1 into @arg15", second konstantin@mysql.com2004-08-241-3/+19
* | Fix to compile with msvc: converted static const int Item_arena::* to enum me...sergefp@mysql.com2004-08-241-4/+8
|/
* Merge bk-internal.mysql.com:/home/bk/mysql-4.1konstantin@mysql.com2004-08-211-68/+60
|\
| * Fix for bug#4912 "mysqld crashs in case a statement is executedkonstantin@mysql.com2004-08-211-68/+60
* | mergedserg@serg.mylan2004-08-201-2/+2
|\ \
| * | Making FLUSH TABLES WITH READ LOCK block COMMITs of existing transactions,guilhem@mysql.com2004-08-201-2/+2
* | | mergedserg@serg.mylan2004-08-201-1/+0
|\ \ \
| * | | sql_class.h:guilhem@mysql.com2004-08-201-1/+0
* | | | mergedserg@serg.mylan2004-08-201-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | cosmetic changeguilhem@mysql.com2004-08-191-1/+1
| * | Fix for BUG#4971 "CREATE TABLE ... TYPE=HEAP SELECT ... stops slave (wrong DE...guilhem@mysql.com2004-08-191-0/+21
* | | (manual port from 4.0 - was needed)guilhem@mysql.com2004-08-191-0/+21
| |/ |/|
* | manually mergedserg@serg.mylan2004-08-181-0/+13
|\ \ | |/
| * Fix for:guilhem@mysql.com2004-07-311-6/+10
| * removing assertion (will be moved to 4.1) for non-debug to compileguilhem@mysql.com2004-07-311-1/+9
| * Avoiding a theoretically possible crash (pthread_mutex_lock(0)) which could (...guilhem@mysql.com2004-07-301-0/+1
* | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1guilhem@mysql.com2004-06-231-0/+2
|\ \
| * | Robustness feature.guilhem@mysql.com2004-06-201-0/+2
* | | Fix for bug#4236 "Server crash on attempt to execute non-preparedkonstantin@mysql.com2004-06-221-1/+1
|/ /
* | WL#1264 "Per-thread time zone support infrastructure".dlenev@brandersnatch.localdomain2004-06-181-0/+3
* | Mergedsergefp@mysql.com2004-06-071-9/+29
|\ \
| * \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-06-041-1/+1
| |\ \
| * \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-06-031-9/+29
| |\ \ \
| | * \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-06-011-9/+29
| | |\ \ \
| | | * \ \ Manually merged, requirees more mergingsergefp@mysql.com2004-05-251-0/+4
| | | |\ \ \
| | | * \ \ \ Mergesergefp@mysql.com2004-05-241-1/+1
| | | |\ \ \ \
| | | * \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-05-211-9/+29
| | | |\ \ \ \ \
| | | | * | | | | WL#1622 "SQL Syntax for Prepared Statements": Post-review fixes (1 of 2)sergefp@mysql.com2004-05-211-2/+7
| | | | * | | | | Trivial manual mergesergefp@mysql.com2004-05-151-7/+22
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-04-281-2/+6
| | | | | |\ \ \ \ \
| | | | | * | | | | | WL#1622 "SQL Syntax for Prepared Statements": post-review fixes:sergefp@mysql.com2004-04-131-21/+22
| | | | | * | | | | | Mergesergefp@mysql.com2004-04-081-0/+14
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ Post-merge fixessergefp@mysql.com2004-04-051-0/+14
| | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | Many files:sergefp@mysql.com2004-04-051-0/+14
* | | | | | | | | | | | | Portability fixes (and a typo after last merge)monty@mysql.com2004-06-041-1/+1
| |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1guilhem@mysql.com2004-06-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Implementation of WL#1824 "Add replication of character set variables in 4.1",guilhem@mysql.com2004-06-031-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge with 4.0 to get fixes for netwaremonty@mysql.com2004-06-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Changed --log-warnings to be integer instead of boolean. Given --skip-log-war...jani@a80-186-24-72.elisa-laajakaista.fi2004-06-011-1/+1
* | | | | | | | | | | Proposed fix for bug #3412 (embedded server: prepared statement returnshf@deer.(none)2004-05-281-0/+2
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Changed prototype of killed_ptr() to make it more portablemonty@mysql.com2004-05-261-1/+1
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Support for character set conversion in binary protocol: another gokonstantin@mysql.com2004-05-251-0/+4
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-05-241-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Merge with 4.0, mainly to get changes to windows project filesmonty@mysql.com2004-05-201-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fix for BUG33649: Post-review fixes sergefp@mysql.com2004-05-191-1/+1
* | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-05-191-1/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge with 4.0.20monty@mysql.com2004-05-171-1/+18
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | / / / / / | | |/ / / / / | |/| | | | |
| | * | | | | Many files:heikki@hundin.mysql.fi2004-05-141-1/+18
* | | | | | | after review changesbell@sanja.is.com.ua2004-05-191-1/+1
View Lorry Controller Status