summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* A fix for a crashing bug in EXPLAIN on derived tables with a join.Sinisa@sinisa.nasamreza.org2003-04-103-1/+10
* Post - post merge fix.Sinisa@sinisa.nasamreza.org2003-04-091-1/+0
* merge fixSinisa@sinisa.nasamreza.org2003-04-0937-199/+520
|\
| * Merge bk-internal:/home/bk/mysql-4.1serg@sergbook.mysql.com2003-04-097-2/+303
| |\
| | * don't increment LAST_INSERT_ID() when incremented value cannot be stored in a...serg@sergbook.mysql.com2003-03-313-2/+70
| | * ft benchmark suite: initial checkinserg@sergbook.mysql.com2003-03-294-0/+233
| * | - bumped up version number to 4.1.1-alpha now that 4.0.1 has been taggedlenz@mysql.com2003-04-081-1/+1
| * | Use of CHARSWT_INFO *result_collationbar@bar.mysql.r18.ru2003-04-0810-77/+118
| * | SET NAMES doesn't start recodingbar@bar.mysql.r18.ru2003-04-087-26/+27
| * | A better fix for UNION and slow query log.monty@mashka.mysql.fi2003-04-081-27/+44
| * | All collation names are now fit into convensionbar@bar.mysql.r18.ru2003-04-0715-80/+40
* | | A fix for DELETE with ORDER BY and LIMIT.Sinisa@sinisa.nasamreza.org2003-04-091-6/+9
* | | fix for a :Sinisa@sinisa.nasamreza.org2003-04-091-1/+2
* | | a fix for a crashing bug when attempting to create InnoDB table Sinisa@sinisa.nasamreza.org2003-04-083-1/+8
* | | Fix for a bug with empty item list in UNION'sSinisa@sinisa.nasamreza.org2003-04-083-3/+8
* | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1Sinisa@sinisa.nasamreza.org2003-04-0752-1197/+486
|\ \ \ | |/ /
| * | sys_var_collation is now abstract classbar@bar.mysql.r18.ru2003-04-0711-62/+113
| * | New methods to store strings with "convert to" argimumentbar@bar.mysql.r18.ru2003-04-073-15/+64
| * | fixed bug with locales in libeditvva@eagle.mysql.r18.ru2003-04-064-133/+140
| * | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2003-04-057-85/+49
| |\ \
| | * | Some optimization in SET NAMESmysql@home.(none)2003-04-057-85/+49
| * | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2003-04-053-14/+46
| |\ \ \ | | |/ /
| | * | sql_yacc.yy:mysql@home.(none)2003-04-051-1/+1
| | * | sql_yacc.yy, set_var.h, set_var.cc:mysql@home.(none)2003-04-053-14/+46
| * | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2003-04-054-4/+40
| |\ \ \ | | |/ / | |/| |
| | * | fixed st_select_lex initializationbell@sanja.is.com.ua2003-04-054-4/+40
| * | | sql_cache.cc:mysql@home.(none)2003-04-051-2/+2
| * | | Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.1pem@mysql.com2003-04-0422-1/+22
| |\ \ \
| | * | | Added missing error message (was only added in english/).pem@mysql.com2003-04-0422-1/+22
| * | | | Merge abarkov@build.mysql.com:/home/bk/mysql-4.1bar@bar.mysql.r18.ru2003-04-041-8/+8
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Index.xml:bar@bar.mysql.r18.ru2003-04-041-8/+8
| * | | | Updating subselect results after SUBSELECT was changed into SUBQUERY.pem@mysql.com2003-04-041-24/+24
| * | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ram@mysql.r18.ru2003-04-041-8/+9
| |\ \ \ \
| | * | | | Fixed envelope() function.ram@mysql.r18.ru2003-04-041-8/+9
| * | | | | Sync string in EXPLAIN code with phrasing of manual (subquery, not subselect).arjen@george.bitbike.com2003-04-041-3/+3
| * | | | | gis.txt deleted - updated text merged into manual (mysqldoc tree).arjen@george.bitbike.com2003-04-041-874/+0
| * | | | | And got rid of signess warnings...pem@mysql.com2003-04-031-4/+4
| * | | | | Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.1pem@mysql.com2003-04-031-1/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge akishkin@bk-internal.mysql.com:/home/bk/mysql-4.1walrus@mysql.com2003-04-041-1/+1
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | test-transactions.sh:walrus@mysql.com2003-04-031-1/+1
| * | | | | | Got rid of silly compiler errors on HP-UX and SGI Irix.pem@mysql.com2003-04-031-3/+5
| |/ / / / /
* | | | | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1Sinisa@sinisa.nasamreza.org2003-04-0354-1855/+1256
|\ \ \ \ \ \ | |/ / / / /
| * | | | | field.cc:bar@bar.mysql.r18.ru2003-04-031-2/+2
| * | | | | Fixed bug in warning handling (Memory was allocated from wrong MEM_ROOT)monty@narttu.mysql.fi2003-04-035-27/+40
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@narttu.mysql.fi2003-04-0327-75/+300
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Merge with 4.0monty@narttu.mysql.fi2003-04-0327-75/+300
| | |\ \ \ \
| | | * | | | After merge fixmonty@narttu.mysql.fi2003-04-031-10/+9
| | | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@narttu.mysql.fi2003-04-031-0/+8
| | | |\ \ \ \
| | | | * | | | add test file for rpl_loaddata.testvva@eagle.mysql.r18.ru2003-04-031-0/+8
| | | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@narttu.mysql.fi2003-04-034-2/+37
| | | |\ \ \ \ \ | | | | |/ / / /