summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* WL#1218 "Triggers". Some very preliminary version of patch.dlenev@brandersnatch.localdomain2004-09-0749-78/+1664
* satisfy VC++bell@sanja.is.com.ua2004-07-161-4/+5
* Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2004-07-161-22/+26
|\
| * changes to sutisfy VC++bell@sanja.is.com.ua2004-07-161-22/+26
* | Merge lgrimmer@build.mysql.com:/home/bk/mysql-5.0lenz@mysql.com2004-07-162-5/+21
|\ \
| * | - Added sql/parse_file.cpp and sql/sql_view.cpp to the mysqld andlenz@mysql.com2004-07-162-5/+21
| |/
* | Merge miguel@bk-internal.mysql.com:/home/bk/mysql-5.0miguel@hegel.txg2004-07-165-13/+45
|\ \ | |/
| * fix function prototypebell@sanja.is.com.ua2004-07-161-1/+1
| * memory leak removingbell@sanja.is.com.ua2004-07-163-2/+28
| * Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2004-07-161-10/+16
| |\
| | * changes in system db creation procedure for view privilegesbell@sanja.is.com.ua2004-07-161-10/+16
* | | Fixes for bug #4571 (Windows compabilities)miguel@hegel.txg2004-07-167-20/+17
|/ /
* | Fixed typo in sql/sql_insert.cc which caused non-debug builds to fail.dlenev@brandersnatch.localdomain2004-07-161-1/+1
* | Fix warnings in sql/item_timefunc.cc which popped up during windows builds.dlenev@brandersnatch.localdomain2004-07-161-2/+2
|/
* Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2004-07-1685-1217/+6093
|\
| * VIEWbell@sanja.is.com.ua2004-07-1685-1217/+6093
* | Merge gbichot@bk-internal.mysql.com://home/bk/mysql-5.0guilhem@mysql.com2004-07-155-86/+69
|\ \ | |/ |/|
| * after merge fixes (making rpl_charset and rpl_timezone pass).guilhem@mysql.com2004-07-155-86/+69
* | failing fulltext_order_by.test fixedserg@serg.mylan2004-07-154-3/+3
|/
* Mergemonty@mysql.com2004-07-151854-76876/+101620
|\
| * After merge fixesmonty@mysql.com2004-07-1550-247/+285
| * Merge with 4.1monty@mysql.com2004-07-12141-764/+1736
| |\
| | * Don't close already closed files in vio (not critical)monty@mysql.com2004-07-124-2/+17
| | * Mergemonty@mysql.com2004-07-113-12/+11
| | |\
| | | * mysql_find_files() made extern (from static to sql_show.cc)serg@serg.mylan2004-07-102-4/+3
| | | * Merge bk-internal:/home/bk/mysql-4.0/serg@serg.mylan2004-07-101-8/+8
| | | |\
| | | | * mysqlhotcopy:serg@serg.mylan2004-07-091-8/+8
| | * | | Reorder variables to preserve alphabetical sorting.dlenev@brandersnatch.localdomain2004-07-101-3/+3
| | * | | manual merge vva@eagle.mysql.r18.ru2004-07-091-6/+6
| | |\ \ \
| | | * | | added an optimization in mysql_create_db (sql_db.cc)vva@eagle.mysql.r18.ru2004-07-091-2/+2
| | | * | | fixed Bug #4378 "create database IF NOT EXISTS thing" returns an errorvva@eagle.mysql.r18.ru2004-07-081-2/+3
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-07-0921-55/+77
| | |\ \ \ \
| | | * | | | my_global.h:konstantin@mysql.com2004-07-091-1/+5
| | | * | | | Bug#4338: mysql-test-run fails if compiled with non-latin1 character setbar@mysql.com2004-07-0820-54/+72
| | * | | | | Cleanup of db option cacheingmonty@mysql.com2004-07-0911-94/+129
| | * | | | | Merge with 4.0 to get bug fixesmonty@mysql.com2004-07-0912-220/+307
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@mysql.com2004-07-091-2/+2
| | | |\ \ \ \
| | | | * | | | Updated result sets (from 4.1)monty@mysql.com2004-07-091-2/+2
| | | * | | | | Do-compile:mwagner@here.mwagner.org2004-07-081-2/+2
| | | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0mwagner@here.mwagner.org2004-07-081-1/+18
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Merge here.mwagner.org:/Volumes/BK/mysql-4.0mwagner@here.mwagner.org2004-07-081-1/+18
| | | | |\ \ \ \
| | | | | * | | | Do-compile:mwagner@here.mwagner.org2004-07-081-1/+18
| | | * | | | | | Fixed Bug#4451. According to C/C++ standards, enums should not be usedjani@a80-186-24-72.elisa-laajakaista.fi2004-07-081-3/+12
| | | |/ / / / /
| | | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0mwagner@here.mwagner.org2004-07-071-1/+7
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge here.mwagner.org:/Volumes/BK/mysql-4.0mwagner@here.mwagner.org2004-07-071-1/+7
| | | | |\ \ \ \
| | | | | * | | | my_md5sum:mwagner@here.mwagner.org2004-07-071-1/+7
| | | * | | | | | my_lib.c:guilhem@mysql.com2004-07-051-2/+4
| | | * | | | | | Windows-specific:guilhem@mysql.com2004-07-051-0/+9
| | | * | | | | | Fixing a bug in mysqltest.c:guilhem@mysql.com2004-07-021-8/+11
| | | |/ / / / /
| | | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0mwagner@here.mwagner.org2004-07-013-9/+28
| | | |\ \ \ \ \ | | | | |/ / / /