summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
Commit message (Expand)AuthorAgeFilesLines
* Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEYmonty@mysql.com2005-01-031-1/+1
|\
| * Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flagmonty@mysql.com2004-12-311-1/+1
* | Merge bk-internal:/home/bk/mysql-5.0vtkachenko@intelp4d.mysql.com2004-12-311-1/+1
|\ \
| * | logging_ok:vtkachenko@intelp4d.mysql.com2004-12-241-1/+1
* | | Merge with global treemonty@mysql.com2004-12-311-1/+1
|\ \ \
| * \ \ Merge with 4.1monty@mishka.local2004-12-221-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | WL#2274 - INSERT..SELECT..UPDATEacurtis@pcgem.rdg.cyberkinetica.com2004-12-131-1/+1
* | | | revert "LOCK TABLES ... WHERE ENGINE=INNODB"serg@serg.mylan2004-12-271-2/+2
* | | | WL#925 - Privileges for stored routinesacurtis@pcgem.rdg.cyberkinetica.com2004-12-231-0/+1
| |_|/ |/| |
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2004-12-211-4/+3
|\ \ \ | |/ / |/| |
| * | Fix for bug #6849 "Crash while preparing query containing const expr withdlenev@brandersnatch.localdomain2004-12-171-4/+3
* | | Content merge.jan@hundin.mysql.fi2004-12-091-0/+1
|\ \ \ | |/ / |/| |
| * | Added support for a LOCK TABLES...WHERE ENGINE = InnoDB query which setsjan@hundin.mysql.fi2004-12-091-0/+1
* | | Merge with 4.1monty@mysql.com2004-12-061-1/+1
|\ \ \ | |/ / |/| / | |/
| * Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-12-031-1/+0
| |\
| | * Bug #6379: ENUM values are incorrectly convertedbar@mysql.com2004-12-021-1/+0
| * | now we create temporary join for all queries with subqueries to make correct ...bell@sanja.is.com.ua2004-11-301-0/+1
| |/
* | protection: TRASH in deleteserg@serg.mylan2004-11-281-3/+5
* | Merge mysql.com:/home/mydev/mysql-5.0ingo@mysql.com2004-11-251-1/+2
|\ \
| * | WL#2050 - CREATE USER and DROP USER and RENAME USERingo@mysql.com2004-11-251-1/+2
* | | Fixed BUG#6807: Stored procedure crash if CREATE PROCEDURE ... KILL QUERYpem@mysql.comhem.se2004-11-251-2/+1
|/ /
* | do not leave sql command uninitialized, because it used for detection need of...bell@sanja.is.com.ua2004-11-251-1/+1
* | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2004-11-251-4/+7
|\ \
| * \ Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2004-11-241-0/+1
| |\ \
| | * | fixed problem in MacOSbell@sanja.is.com.ua2004-11-241-0/+1
| * | | Fix for bug #5888 "Triggers with nonexistent columns cause packetsdlenev@brandersnatch.localdomain2004-11-241-4/+6
| |/ /
* | | mergebell@sanja.is.com.ua2004-11-211-0/+4
|\ \ \ | |/ / |/| |
| * | post mergebell@sanja.is.com.ua2004-11-211-0/+1
| * | mergebell@sanja.is.com.ua2004-11-111-0/+3
| |\ \
| | * \ mergebell@sanja.is.com.ua2004-10-051-0/+3
| | |\ \
| | | * | fixed merged view fields names (BUG#5147)bell@sanja.is.com.ua2004-09-141-0/+3
* | | | | margebell@sanja.is.com.ua2004-11-131-5/+5
|\ \ \ \ \
| * \ \ \ \ mergebell@sanja.is.com.ua2004-11-121-5/+5
| |\ \ \ \ \
| | * \ \ \ \ Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2004-10-201-5/+5
| | |\ \ \ \ \
| | | * | | | | errors without code removedbell@sanja.is.com.ua2004-10-201-5/+5
| | | | |/ / / | | | |/| | |
* | | | | | | WL#1629: SHOW with WHERE(partially) &gluh@gluh.mysql.r18.ru2004-11-131-2/+2
|/ / / / / /
* | | | | | Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)brian@avenger.(none)2004-11-111-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | WL#1596 "make mysqldump --master-data --single-transaction able to do online ...guilhem@mysql.com2004-11-101-1/+1
* | | | | Simple optimization to avoid a malloc for each querymonty@mysql.com2004-11-091-1/+2
* | | | | Merge on pullmonty@mysql.com2004-11-031-3/+7
|\ \ \ \ \
| * \ \ \ \ merge with 4.1monty@mysql.com2004-10-291-3/+7
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | |
| | * | | A lot of fixes for prepared statements (PS):monty@mysql.com2004-10-261-0/+2
| | * | | Fix compiler warnings (detected by Intel's C++ compiler)monty@mysql.com2004-10-221-0/+1
| | * | | A fix and test case for Bug#5985 ""prepare stmt from "select rand(?)" konstantin@mysql.com2004-10-141-2/+2
| | * | | After merge fixesmonty@mysql.com2004-10-071-1/+1
| | * | | check that table used in multi-update is unique added (BUG#5455)bell@sanja.is.com.ua2004-09-081-0/+1
* | | | | smarter ALTER TABLE - don't copy the table if only comment or default val...serg@serg.mylan2004-10-211-1/+3
|/ / / /
* | | | Implemented the stored procedure data access characteristics:pem@mysql.comhem.se2004-10-141-3/+16
| |/ / |/| |
* | | mergebell@sanja.is.com.ua2004-09-291-0/+1
|\ \ \ | |_|/ |/| |
| * | mergebell@sanja.is.com.ua2004-09-061-0/+1
| |\ \