summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
Commit message (Expand)AuthorAgeFilesLines
* Conflict resolutionigor@rurik.mysql.com2003-07-161-8/+19
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mashka.mysql.fi2003-07-081-3/+8
| |\
| | * Support for variables with componentsmonty@mashka.mysql.fi2003-07-061-3/+8
| * | implementation of mysql_stmt_reset client endvenu@myvenu.com2003-07-081-0/+5
| |/
| * Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2003-07-011-5/+1
| |\
| | * Allow one to use MERGE tables with tables from different databasesmonty@mashka.mysql.fi2003-06-271-5/+1
| * | fixed uninitialized pointerbell@sanja.is.com.ua2003-07-011-0/+5
| |/
* | mi_keycache.c:igor@rurik.mysql.com2003-07-161-2/+11
|/
* Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2003-06-201-1/+1
|\
| * calloc replaced with alloc in st_select_lex_node 'new' operator (SCRUM?)bell@sanja.is.com.ua2003-03-051-1/+1
* | Mergeigor@rurik.mysql.com2003-06-181-1/+0
|\ \
| * | Fixes for make_win_src_distributionsmonty@narttu.mysql.fi2003-06-151-1/+0
* | | Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2003-06-121-0/+10
|\ \ \ | |/ / |/| |
| * | Many files:igor@rurik.mysql.com2003-06-121-0/+10
* | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1gluh@gluh.mysql.r18.ru2003-06-061-0/+32
|\ \ \
| * | | REVOKE all privileges and delete user(244)gluh@gluh.mysql.r18.ru2003-06-061-0/+32
* | | | Merge with 4.0.13monty@narttu.mysql.fi2003-06-051-1/+8
|\ \ \ \
| * | | | Print error if we can't delete an alarmmonty@narttu.mysql.fi2003-06-051-0/+7
* | | | | MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one ...bar@bar.mysql.r18.ru2003-06-031-1/+1
| |/ / / |/| | |
* | | | after review changesbell@sanja.is.com.ua2003-05-301-6/+8
* | | | mysqlshow and mysqldump now send their vharacter set to serverbar@bar.mysql.r18.ru2003-05-301-3/+10
* | | | "mysql" now sends client character set to server.bar@bar.mysql.r18.ru2003-05-281-0/+9
* | | | after-review fixbell@sanja.is.com.ua2003-05-281-44/+45
* | | | fixed priority checking bug in sub select handlingbell@sanja.is.com.ua2003-05-281-10/+44
* | | | New 4.1 protocol; SQLSTATE, CLIENT_MULTI_RESULTS, client character setmonty@mashka.mysql.fi2003-05-261-8/+23
* | | | mergemonty@mashka.mysql.fi2003-05-221-26/+107
|\ \ \ \
| * | | | After merge fixesmonty@mashka.mysql.fi2003-05-211-3/+3
| * | | | Merge with 4.0.13monty@narttu.mysql.fi2003-05-191-26/+107
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | Added option --read-only (Thanks to Markus Benning)monty@narttu.mysql.fi2003-05-191-0/+12
| | * | Fixed bug in CREATE ... DECIMAL(-1,1). Bug #432monty@narttu.mysql.fi2003-05-141-7/+9
| | * | Fix for checking global_access rightsmonty@narttu.mysql.fi2003-05-141-8/+23
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@narttu.mysql.fi2003-05-141-2/+6
| | |\ \
| | | * | Fix for bug 343 : we require only REPLICATION CLIENT forguilhem@mysql.com2003-05-131-2/+6
| | * | | Fix for UNION and LEFT JOIN (Bug #386)monty@narttu.mysql.fi2003-05-131-2/+9
| | |/ /
| | * | Merge to get security patchmonty@mashka.mysql.fi2003-05-081-1/+11
| | |\ \
| | | * | Security patch to remove wrong error when one had a global update/delete priv...monty@mashka.mysql.fi2003-05-071-1/+11
| | | * | Back porting a fix from 4.0 at customer's requestSinisa@sinisa.nasamreza.org2003-04-141-1/+1
| | * | | Updated commentmonty@mashka.mysql.fi2003-05-071-1/+2
| | * | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0Sinisa@sinisa.nasamreza.org2003-04-301-1/+1
| | |\ \ \
| | | * | | Fix reference to not initialized memorymonty@narttu.mysql.fi2003-04-301-1/+1
| | * | | | merge fixSinisa@sinisa.nasamreza.org2003-04-291-13/+39
| | |\ \ \ \ | | | |/ / /
| | | * | | CURRENT_USER() and "access denied" error messages now report hostname exactly...serg@serg.mylan2003-04-291-4/+5
| | | * | | Fix for openssl on Solarismonty@mashka.mysql.fi2003-04-281-6/+14
| | | * | | Fix for -fbranch-probabilites (bug 268)monty@mashka.mysql.fi2003-04-261-3/+20
| | * | | | A fix for a bug with uncached database privileges.Sinisa@sinisa.nasamreza.org2003-04-141-1/+1
| | |/ / /
| | * | | #244 bugfix (thread stack error message in embedded library)hf@deer.mysql.r18.ru2003-04-081-0/+2
| | * | | fixed bug 209 (SQL_SELECT_LIMIT and query cache incompatibility)bell@sanja.is.com.ua2003-03-311-1/+2
* | | | | Resolve merge colflictvenu@myvenu.com2003-05-211-28/+108
|\ \ \ \ \ | |/ / / /
| * | | | Scrum task 845. Thi is a behaviour change :guilhem@mysql.com2003-05-151-27/+105
| * | | | Give warning if MySQL doesn't honor given storage enginemonty@mashka.mysql.fi2003-05-131-1/+3