summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-4.1konstantin@mysql.com2004-10-221-0/+2
|\
| * A fix and test case for Bug#6050 "EXECUTE stmt reports ambiguous field konstantin@mysql.com2004-10-221-0/+2
* | Manual merge.konstantin@mysql.com2004-10-211-17/+28
|\ \ | |/ |/|
| * A fix and test case for bug#6059 "mysql_stmt_field_count returns konstantin@mysql.com2004-10-211-17/+28
* | Merge with 4.0monty@mysql.com2004-10-201-0/+3
|\ \ | |/ |/|
| * Code cleanups (done during review of new code)monty@mysql.com2004-10-201-1/+1
| * Added startup option and settable session variablemarko@hundin.mysql.fi2004-10-131-0/+3
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.1konstantin@mysql.com2004-10-141-6/+6
|\ \
| * | A fix and test case for Bug#5985 ""prepare stmt from "select rand(?)" konstantin@mysql.com2004-10-141-6/+6
* | | Move Heikki's comment about thd->query comment to proper place konstantin@mysql.com2004-10-131-18/+17
|/ /
* | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ram@gw.mysql.r18.ru2004-10-101-1/+3
|\ \
| * | Blob support for the group_concat() function.ram@gw.mysql.r18.ru2004-10-101-1/+3
* | | A small simplification: perform two actions at once, register akonstantin@mysql.com2004-10-101-4/+5
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1konstantin@mysql.com2004-10-081-0/+31
|\ \ \ | |/ / |/| |
| * | A fix for Bug#5748 "Prepared statement with BETWEEN and bigint values konstantin@mysql.com2004-10-081-0/+31
* | | Merge with 4.0 for 4.1 releasemonty@mysql.com2004-10-061-0/+1
|\ \ \ | |/ / |/| / | |/
| * Merge mysql.com:/home/mydev/mysql-4.0ingo@mysql.com2004-10-051-0/+1
| |\
| | * BUG#4286 - HANDLER tables are closed by FLUSH TABLE(S).ingo@mysql.com2004-09-241-0/+1
* | | A couple of typos fixed.konstantin@mysql.com2004-10-041-2/+0
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1dlenev@mysql.com2004-09-231-2/+14
|\ \ \
| * | | Implementation of Monty's idea about clear_alloc_root() optimization and clea...dlenev@brandersnatch.localdomain2004-09-231-2/+14
* | | | A fix and test case for Bug#5315 "mysql_change_user() doesn't freekonstantin@mysql.com2004-09-221-3/+10
|/ / /
* | | moved all ndb thread specific data into new placeholdertomas@poseidon.(none)2004-09-141-2/+1
* | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tulin@build.mysql.com2004-09-091-21/+0
|\ \ \
| * \ \ mergedserg@serg.mylan2004-09-071-21/+0
| |\ \ \ | | |/ /
| | * | Replacing class Disable_binlog by macros. Patch already approved by Monty.guilhem@mysql.com2004-09-061-21/+0
| | |/
* | | renamed ha_recovery_logging to ha_enable_transactiontomas@poseidon.(none)2004-09-031-0/+1
|/ /
* | Change Item_arena::state to enumsergefp@mysql.com2004-08-311-4/+4
* | 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
|\ \