summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bug#16557 mysql cmd-line client does not rename .mysql_history.TMP to ↵msvensson@neptunus.(none)2006-02-131-2/+2
| | | | | | .mysql_history - Return error only if 'history' returns -1
* Bug#14013 mysql_stmt_store_result() bombs if a cursor is openmsvensson@neptunus.(none)2006-02-103-22/+73
| | | | | | - Add code to 'mysql_stmt_store_result' to allow it to be called on a prepared statement with open server side cursor. - Add tests to mysql_client_test that uses 'mysql_stmt_store_result'
* Use common function 'append_field' to output the value of one field to the ↵msvensson@neptunus.(none)2006-02-015-104/+75
| | | | | | result. Fix for extra zero in exponent of double values on windows.
* extra/comp_err.c : Fix a merge error.joerg@mysql.com2006-01-161-1/+2
|
* Manual merge of the fix for bug#16106.joerg@mysql.com2006-01-162-7/+4
|\ | | | | | | | | Currently failing tests (for me) in non-debug build: blackhole fulltext fulltext_cache fulltext_left_join fulltext_multi
| * Merge mysql.com:/M40/push-4.0 into mysql.com:/M41/merge-4.1joerg@mysql.com2006-01-132-4/+3
| |\
| | * extra/comp_err.c + scripts/mysqld_multi.sh :joerg@mysql.com2006-01-132-4/+3
| | | | | | | | | | | | Copyright string fixes (bug#16106)
| * | Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/merge-4.1joerg@mysql.com2006-01-1339-175/+778
| |\ \
| * \ \ Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1joerg@mysql.com2006-01-040-0/+0
| |\ \ \
* | \ \ \ Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0svoj@april.(none)2006-01-133-1/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into april.(none):/home/svoj/devel/mysql/BUG13835/mysql-5.0
| * | | | | BUG#13835: max key length is 1000 bytes when trying to create a fulltext indexsvoj@april.(none)2006-01-133-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | Allow fulltext index on VARCHAR columns longer than max key length.
* | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2006-01-133-0/+25
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | into moonbone.local:/work/15347-bug-5.0-mysql
| * | | | | Mergeevgen@moonbone.local2006-01-133-0/+25
| |\ \ \ \ \
| | * | | | | Fixed bug #15347: Wrong result of subselect when records cache and setevgen@moonbone.local2006-01-113-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functions are involved. When subselect is a join with set functions and no record have been found in it, end_send_group() sets null_row for all tables in order aggregate functions to calculate their values correctly. Normally this null_row flag is cleared for each table in sub_select(), but flush_cached_records() doesn't do so. Due to this all fields from the table processed by flush_cached_records() are always evaluated as nulls and whole select produces wrong result. flush_cached_records() now clears null_row flag at the very beginning.
* | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0bar@mysql.com2006-01-1310-2/+484
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.0
| * | | | | | Merge mysql.com:/usr/home/bar/mysql-4.1.b15377bar@mysql.com2006-01-1310-2/+484
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.0
| | * | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2006-01-1310-2/+484
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1.b15377
| | | * \ \ \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2006-01-1310-2/+484
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1.b15377
| | | | * \ \ \ \ Merge mysql.com:/usr/home/bar/mysql-4.1bar@mysql.com2006-01-1310-2/+484
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1.b15377
| | | | | * | | | | Bug#15377 Valid multibyte sequences are truncated on INSERTbar@mysql.com2005-12-0910-2/+484
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ctype-euc_kr.c: ctype-gb2312.c: Adding specific well_formed_length functions for gb2312 and euckr, to allow storing characters which are correct according to the character set specifications but just don't have Unicode mapping. Previously only those which have Unicode mapping could be stored, while unassigned characters lead to data truncation. Many files: new file
| | * | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/41-workjonas@perch.ndb.mysql.com2006-01-133-8/+32
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
* | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2006-01-133-2/+10
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | into moonbone.local:/work/15538-bug-5.0-mysql
| * | | | | | | | | Fixed bug #15538: unchecked table absence caused server crash.evgen@moonbone.local2006-01-113-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Absence of table in left part of LEFT/RIGHT join wasn't checked before name resolution which resulted in NULL dereferencing and server crash. Modified rules: "table_ref LEFT opt_outer JOIN_SYM table_ref" and "table_ref RIGHT opt_outer JOIN_SYM table_ref" NULL check is moved before push_new_name_resolution_context()
* | | | | | | | | | Mergeevgen@moonbone.local2006-01-135-3/+42
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed bug #15633: Evaluation of Item_equal for non-const table caused wrongevgen@moonbone.local2006-01-115-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | select result Item equal objects are employed only at the optimize phase. Usually they are not supposed to be evaluated. Yet in some cases we call the method val_int() for them. Here we have to take care of restricting the predicate such an object represents f1=f2= ...=fn to the projection of known fields fi1=...=fik. Added a check for field's table being const in Item_equal::val_int(). If the field's table is not const val_int() just skips that field when evaluating Item_equal.
* | | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2006-01-132-7/+29
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
| * | | | | | | | | | | bug#15619 - ndb_autodiscover sometimes failsjonas@perch.ndb.mysql.com2006-01-131-0/+10
| | | | | | | | | | | |
| * | | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/41-workjonas@perch.ndb.mysql.com2006-01-041-7/+19
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/50-work
| | * | | | | | | | | | ndb - Make testDatabuffer clean up tablesjonas@perch.ndb.mysql.com2006-01-041-7/+20
| | | | | | | | | | | |
* | | | | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0jonas@perch.ndb.mysql.com2006-01-13117-1726/+3380
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
| * \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2006-01-133-10/+168
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-5.0-bg12198-2
| | * | | | | | | | | | | | Fix for bug #12198 "Temporary table aliasing does not work inside storeddlenev@mysql.com2006-01-133-10/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functions". We should ignore alias when we check if table was already marked as temporary when we calculate set of tables to be prelocked. Otherwise we will erroneously treat tables which are used in same routine and have same name but different alias as non-temporary.
| * | | | | | | | | | | | | Fixed a bug in merge.jani@ua141d10.elisa.omakaista.fi2006-01-121-3/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix for Netware build.jani@ua141d10.elisa.omakaista.fi2006-01-121-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1jani@ua141d10.elisa.omakaista.fi2006-01-127-12/+52
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
| | * | | | | | | | | | | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0jani@ua141d10.elisa.omakaista.fi2006-01-124-6/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
| | | * | | | | | | | | | | NetWare specific change to increase thread stack size.jani@ua141d10.elisa.omakaista.fi2006-01-124-27/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes to Netware specific mysqld_safe.c
| | * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2006-01-127-40/+60
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| | * | | | | | | | | | | | | Re-run fix-fields on condition if table was reopened in HANDLERREADmonty@mysql.com2006-01-102-7/+24
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2006-01-102-29/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2006-01-093-2/+24
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| | | * | | | | | | | | | | | | | After merge fix (Lines lost in manual merge)monty@mysql.com2006-01-091-0/+3
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge mysql.com:/home/my/mysql-4.0monty@mysql.com2006-01-082-32/+15
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| | | | * | | | | | | | | | | | | Fixes during review of new pushed code:monty@mysql.com2006-01-065-38/+22
| | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove wrong fix for Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash Safety fix for bug #13855 "select distinct with group by caused server crash"
| * | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2006-01-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixupmsvensson@neptunus.(none)2006-01-121-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| | | * | | | | | | | | | | | | | | Use "test ! -s" to check that file does not exist msvensson@neptunus.(none)2006-01-121-1/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0bar@mysql.com2006-01-123-7/+76
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.0
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2006-01-123-7/+76
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-5.0-bug16166-r2
| | | * | | | | | | | | | | | | | | | Fix typo bug in previous csetsergefp@mysql.com2006-01-121-1/+1
| | | | | | | | | | | | | | | | | | |
View Lorry Controller Status