summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0tomas@poseidon.ndb.mysql.com2004-11-042-4/+8
|\ | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
| * correct ndb versiontomas@poseidon.ndb.mysql.com2004-11-042-4/+8
| | | | | | | | upgrade compatability with 4.1.8
* | Fixed changes in printoutsmskold@mysql.com2004-11-042-3/+2
| |
* | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold@mysql.com2004-11-042-52/+67
|\ \ | |/ | | | | into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
| * take into accound end \0 in decimal_string_sizeserg@serg.mylan2004-11-031-2/+2
| |
| * Merge bk-internal:/home/bk/mysql-5.0/serg@serg.mylan2004-11-032-50/+65
| |\ | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0
| | * Merge bk-internal:/home/bk/mysql-5.0/serg@serg.mylan2004-11-032-50/+65
| | |\ | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0
| | | * error codes chaged to bitmap (for easier testing with masks)serg@serg.mylan2004-11-032-50/+65
| | | | | | | | | | | | | | | | two more round() modes - CEILING and FLOOR
* | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold@mysql.com2004-11-031305-21760/+58524
|\ \ \ \ | |/ / / | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
| * | | After merge fixesmonty@mysql.com2004-11-033-11/+13
| | | |
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2004-11-033-17/+27
| |\ \ \ | | |/ / | | | | | | | | into mysql.com:/home/my/mysql-5.0
| * | | Merge on pullmonty@mysql.com2004-11-031304-21750/+58512
| |\ \ \ | | |_|/ | |/| |
| | * | Fixes after merge with 4.1monty@mysql.com2004-11-0353-563/+653
| | | | | | | | | | | | | | | | | | | | | | | | | | | | FOUND is not a reserved keyword anymore Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete
| | * | merge with 4.1monty@mysql.com2004-10-291288-21668/+58339
| | |\ \
| | | * | Produce a "truncated" warning if a value cannot be convertedbar@mysql.com2004-10-288-16/+66
| | | | | | | | | | | | | | | | | | | | into the column character set on INSERT/UPDATE.
| | | * | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1joerg@mysql.com2004-10-281-12/+14
| | | |\ \ | | | | | | | | | | | | | | | | | | into mysql.com:/M41/mysql-4.1
| | | | * \ Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1joerg@mysql.com2004-10-281-12/+14
| | | | |\ \
| | | | | * | Fix for bug#5385 ("Text files have unix line break"): joerg@mysql.com2004-10-271-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows style line end \r\n on README, license, and similar essential plaintext files.
| | | * | | | An extra "separator" class member was removed from Item_func_concat_ws.bar@mysql.com2004-10-284-74/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | args[0] is now used instead.
| | | * | | | Making the latest fix for Bug#6166 (key.test) work in prepared statements.konstantin@mysql.com2004-10-281-2/+4
| | | | | | |
| | | * | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-10-274-24/+91
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-ps-4.1
| | | | * \ \ \ Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-10-274-24/+91
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-ps-4.1
| | | | | * | | | removed incorrect error message about aggregate functionsbell@sanja.is.com.ua2004-10-274-24/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improved mechanisn of detection posibility to be NULL for single row queries switched off substitution optimisation for single row subqueries in PS due to problem in resolving substituted expressions (changes to make subselects test working with PS protocol)
| | | * | | | | | A fix and test case for Bug#6096 "field.max_length is always zero for konstantin@mysql.com2004-10-273-5/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | numeric columns (stmt_resultset_metadata)"
| | | * | | | | | Fixed access to freed memorymonty@mysql.com2004-10-274-9/+7
| | | | | | | | |
| | | * | | | | | Merge with 4.0monty@mysql.com2004-10-2712-7/+94
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Fix when compiling without InnoDBmonty@mysql.com2004-10-273-1/+6
| | | | | | | | |
| | | | * | | | | Backport innodb_max_purge_lag from 4.1marko@hundin.mysql.fi2004-10-279-1/+84
| | | | | | | | |
| | | | * | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0bell@sanja.is.com.ua2004-10-2410-11/+92
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
| | | | | * | | | | postreview fixesbell@sanja.is.com.ua2004-10-223-4/+6
| | | | | | | | | |
| | | | | * | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0bell@sanja.is.com.ua2004-10-224-8/+29
| | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.0
| | | | | * | | | | | Check of temporary tables hiding for query fetched from QC (BUG#6084)bell@sanja.is.com.ua2004-10-214-1/+59
| | | | | | | | | | |
| | | | * | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0bell@sanja.is.com.ua2004-10-2212-29/+128
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
| | | | * | | | | | | fixed retsult codebell@sanja.is.com.ua2004-10-191-1/+1
| | | | | | | | | | |
| | | * | | | | | | | after merge fixserg@serg.mylan2004-10-261-1/+0
| | | | | | | | | | |
| | | * | | | | | | | mergedserg@serg.mylan2004-10-264-17/+8
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Bug #6019 - SELECT tries to use too short prefix index on utf8 dataserg@serg.mylan2004-10-264-17/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Field_string::pack should respect max_length as Field_string::pack_key does
| | | * | | | | | | | | Playing with test_bug5399() to make it work on HPUX 64 bit: no konstantin@mysql.com2004-10-261-18/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reason for the failure was found, so the guess is that it is a compiler bug.
| | | * | | | | | | | | Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1heikki@hundin.mysql.fi2004-10-263-14/+50
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/heikki/mysql-4.1
| | | | * | | | | | | | | fil0fil.c:heikki@hundin.mysql.fi2004-10-261-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print to the .err log a more detailed error message if in IMPORT TABLESPACE the .ibd file does not exist
| | | | * | | | | | | | | row0mysql.c:heikki@hundin.mysql.fi2004-10-263-14/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print more warnings to the .err log if ALTER TABLE ... IMPORT TABLESPACE fails for some reason os0file.c: Do not call exit(1) if os_file_delete() fails; remove unused parameter from handle_error_no_exit() fil0fil.c: Allow DROP TABLE even if the .ibd file for the table does not exist
| | | * | | | | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2004-10-261-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| | | | * | | | | | | | | - Bumped up version number to 4.1.8 in configure.inlenz@mysql.com2004-10-261-1/+1
| | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - tagged ChangeSet 1.2029 as "mysql-4.1.7"
| | | * | | | | | | | | Added missing initialiermonty@mysql.com2004-10-261-2/+2
| | | | | | | | | | | |
| | | * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-10-2656-197/+935
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| | | | * | | | | | | | A lot of fixes for prepared statements (PS):monty@mysql.com2004-10-2656-197/+935
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New mysqltest that can run mysqltest with PS Added support for ZEROFILL in PS Fixed crash when one called mysql_stmt_store_result() without a preceding mysql_stmt_bind_result() Updated test cases to support --ps-protocol (Some tests are still run using old protocol) Fixed crash in PS when using SELECT * FROM t1 NATURAL JOIN t2... Fixed crash in PS when using sub queries Create table didn't signal when table was created. This could cause a "DROP TABLE created_table" in another thread to wait "forever" Fixed wrong permissions check in PS and multi-table updates (one could get permission denied for legal quries) Fix for PS and SELECT ... PROCEDURE Reset all warnings when executing a new PS query group_concat(...ORDER BY) didn't work with PS Fixed problem with test suite when not using innodb
| | | * | | | | | | | | Use my_sleep instead of nanosleep for portabilitytomas@poseidon.ndb.mysql.com2004-10-261-0/+5
| | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| | | * | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-10-261-2/+2
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | | | * | | | | | | | removed compiler warningtomas@poseidon.ndb.mysql.com2004-10-261-2/+2
| | | | | | | | | | | |
| | | * | | | | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1gluh@gluh.mysql.r18.ru2004-10-261-1/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1
View Lorry Controller Status