summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
* BUG#6034 - Error code 124: Wrong medium type.ingo@mysql.com2005-01-191-0/+2
* When we warn that --log-bin alone is dangerous, we give a suggestion.guilhem@mysql.com2005-01-161-0/+1
* Merge mysql.com:/home/kostja/work/mysql-4.1-7428konstantin@mysql.com2005-01-111-2/+2
|\
| * A fix for linking failure of MySQL client when linking with imap librarieskonstantin@mysql.com2005-01-111-2/+2
* | After merge fixesmonty@mysql.com2005-01-041-2/+1
* | Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEYmonty@mysql.com2005-01-031-8/+8
|\ \
| * | Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flagmonty@mysql.com2004-12-311-9/+12
| |/
* | Merge with global treemonty@mysql.com2004-12-311-4/+6
|\ \
| * | After merge fixesmonty@mysql.com2004-12-311-1/+1
| * | Merge with 4.1monty@mishka.local2004-12-221-3/+5
| |\ \ | | |/
| | * WL#2274 - INSERT..SELECT..UPDATEacurtis@pcgem.rdg.cyberkinetica.com2004-12-131-0/+10
* | | WL#2126 - Multi_read_range.ingo@mysql.com2004-12-231-0/+1
|/ /
* | Merge with 4.1monty@mysql.com2004-12-061-2/+10
|\ \ | |/
| * Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-12-031-1/+9
| |\
| | * Mergejimw@mysql.com2004-12-031-1/+2
| | |\
| | | * sql/sql_class.hserg@serg.mylan2004-12-031-1/+2
| | * | Manual fixes to merge of fix for Bug #6682 to 4.1.jimw@mysql.com2004-12-031-8/+5
| | * | Mergejimw@mysql.com2004-12-031-0/+10
| | |\ \ | | | |/ | | |/|
| | | * Prevent adding 'CREATE TABLE .. SELECT' query to the binary log when thejimw@mysql.com2004-12-031-0/+10
| * | | Mergebell@sanja.is.com.ua2004-12-011-0/+6
| |\ \ \ | | |/ /
| * | | fixed joincleunup to avoid double deletin tables, and too earlyfull cleanup i...bell@sanja.is.com.ua2004-11-161-1/+1
* | | | mergebell@sanja.is.com.ua2004-11-211-3/+6
|\ \ \ \
| * \ \ \ mergebell@sanja.is.com.ua2004-11-111-3/+6
| |\ \ \ \
| | * \ \ \ mergebell@sanja.is.com.ua2004-10-051-3/+6
| | |\ \ \ \
| | | * | | | support of join view updateability (WL#1809)bell@sanja.is.com.ua2004-09-151-3/+6
* | | | | | | mergedserg@serg.mylan2004-11-201-0/+6
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Enabled usage of new system variables for ndbtomas@poseidon.ndb.mysql.com2004-11-171-0/+6
| | |_|_|/ / | |/| | | |
* | | | | | remove unused parts of codegluh@gluh.mysql.r18.ru2004-11-181-0/+1
* | | | | | mergebell@sanja.is.com.ua2004-11-121-3/+4
|\ \ \ \ \ \
| * | | | | | post-review fixesbell@sanja.is.com.ua2004-11-121-1/+3
| * | | | | | changed function name to prevent injection wrong code from 4.1 (WL#2133)bell@sanja.is.com.ua2004-10-201-2/+0
| * | | | | | errors without code removedbell@sanja.is.com.ua2004-10-201-0/+1
* | | | | | | Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)brian@avenger.(none)2004-11-111-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| / / / / | |_|/ / / / |/| | | | |
| * | | | | More debuggingmonty@mysql.com2004-11-101-1/+1
* | | | | | merge on pullmonty@mysql.com2004-11-091-8/+24
|\ \ \ \ \ \
| * | | | | | After merge fixesmonty@mysql.com2004-11-091-1/+1
| * | | | | | Merge with 4.1 to get new thd->mem_root handlingmonty@mysql.com2004-11-081-8/+24
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Simpler arena swapping codemonty@mysql.com2004-11-081-8/+24
* | | | | | | new lock for multiupdate:bell@sanja.is.com.ua2004-11-051-2/+6
|/ / / / / /
* | | | | | Fixes after merge with 4.1monty@mysql.com2004-11-031-2/+7
* | | | | | merge with 4.1monty@mysql.com2004-10-291-70/+117
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | 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