summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* mergedserg@sergbook.mysql.com2005-01-061-1/+0
|\
| * removed unused labelbell@sanja.is.com.ua2005-01-061-1/+0
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0serg@sergbook.mysql.com2005-01-0656-1489/+1579
|\ \
| * | Fixed a bug in prepared statements error handlingmonty@mysql.com2005-01-062-4/+6
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-01-0654-1472/+1538
| |\ \
| | * | First stage of table definition cachemonty@mysql.com2005-01-0654-1472/+1538
| * | | Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0jimw@mysql.com2005-01-051-0/+1
| |\ \ \
| | * \ \ Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0jimw@mysql.com2005-01-041-0/+1
| | |\ \ \
| | | * \ \ Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0jimw@mysql.com2005-01-041-0/+1
| | | |\ \ \
| | | | * \ \ Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0jimw@mysql.com2005-01-031-0/+1
| | | | |\ \ \
| | | | | * | | Fix 'SHOW CREATE FUNCTION' to say 'FUNCTION' in its error message. (Bug #6338)jimw@mysql.com2005-01-031-0/+1
| * | | | | | | added correct res initialisationbell@sanja.is.com.ua2005-01-051-1/+12
| * | | | | | | fixed views with PS protocolbell@sanja.is.com.ua2005-01-055-13/+23
* | | | | | | | fix alignment issuesserg@sergbook.mysql.com2005-01-051-2/+2
|/ / / / / / /
* | | | | | | reverting the change that results in infinite recursionserg@sergbook.mysql.com2005-01-051-4/+4
* | | | | | | federated: compilation errors and crash fixed. test still fails.serg@sergbook.mysql.com2005-01-051-10/+10
|/ / / / / /
* | | | | | fixed bugs in view code with prepared statemntsbell@sanja.is.com.ua2005-01-048-48/+116
| |_|_|/ / |/| | | |
* | | | | After merge fixesmonty@mysql.com2005-01-047-24/+25
* | | | | Mergemonty@mysql.com2005-01-0420-108/+129
|\ \ \ \ \
| * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-01-0420-108/+129
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEYmonty@mysql.com2005-01-0320-108/+129
| | |\ \ \ \
| | | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2005-01-031-53/+51
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1serg@sergbook.mysql.com2005-01-031-1/+1
| | | | |\ \ \
| | | | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1serg@sergbook.mysql.com2005-01-021-53/+51
| | | | |\ \ \ \
| | | | | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1serg@sergbook.mysql.com2004-12-311-53/+51
| | | | | |\ \ \ \
| | | * | | \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2005-01-031-1/+1
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | |
| | | | * | | | | | set_var.cc:paul@snake-hub.snake.net2005-01-021-1/+1
| | | | |/ / / / /
| | | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2005-01-022-32/+55
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Fixed failed mergemskold@mysql.com2005-01-011-1/+1
| | | | * | | | | Fixed failed mergemskold@mysql.com2005-01-011-5/+5
| | | | * | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2004-12-312-29/+52
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | | * | | | Merged bugfixmskold@mysql.com2004-12-302-29/+52
| | | | | |\ \ \ \
| | | * | | \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-12-3117-86/+109
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flagmonty@mysql.com2004-12-3117-86/+109
| | | * | | | | | | Merged fixes for bug #7297 "Two digit year should be interpreted dlenev@brandersnatch.localdomain2004-12-301-0/+1
| | | * | | | | | | Manual merge of fix for bugs of #7297 and #7515 into 4.1 tree.dlenev@mysql.com2004-12-301-5/+6
| | | |\ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0dlenev@mysql.com2004-12-306-52/+55
| | | | |\ \ \ \ \ \
| | | | * | | | | | | Fix for bug #7515 "from_unixtime(0) now returns NULL instead ofdlenev@mysql.com2004-12-302-6/+7
| | | | * | | | | | | Fix for bug #7297 "Two digit year should be interpreted correctlydlenev@mysql.com2004-12-161-1/+1
| | | * | | | | | | | Fix for bug #6914 "Problems using time()/date() output in expressions".dlenev@brandersnatch.localdomain2004-12-301-0/+7
* | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0serg@sergbook.mysql.com2005-01-0411-50/+63
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | fixed reporting errorbell@sanja.is.com.ua2005-01-031-2/+3
| |/ / / / / / / / /
| * | | | | | | | | Better handling of ensuring that setup_tables() are not called twicemonty@mysql.com2005-01-0311-48/+60
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | mysql-test/r/multi_update.result, mysql-test/t/multi_update.testserg@sergbook.mysql.com2005-01-041-8/+6
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0serg@sergbook.mysql.com2005-01-039-91/+113
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-01-037-59/+58
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove clear_insert_values() because it was far from trivial to handle the cl...monty@mysql.com2005-01-036-29/+12
| | * | | | | | | | Streamlined code for trim, ltrim and rtrimmonty@mysql.com2005-01-021-30/+46
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Fixed failed mergemskold@mysql.com2005-01-031-4/+4
| * | | | | | | | Merge from fix for Bug #7480 Mysqld crash in ha_ndbcluster using Query Browsermskold@mysql.com2005-01-032-29/+52
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | / / | | | |_|_|_|/ / | | |/| | | | |
View Lorry Controller Status