summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0aivanov@mysql.com2005-12-130-0/+0
|\ | | | | | | into mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss11
| * Null-merge from 4.1aivanov@mysql.com2005-12-131-86/+86
| |
| * Merge mysql.com:/home/alexi/mysql-4.1aivanov@mysql.com2005-12-131-86/+86
| |\ | | | | | | | | | | | | into mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss11 Null merge
| | * Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1aivanov@mysql.com2005-12-1215-166/+253
| | |\ | | | | | | | | | | | | into mysql.com:/home/alexi/innodb-ss/mysql-4.1-ss11
| | | * Fix BUG#12071: "Windows hang: 'Opening tables' or 'Waiting foraivanov@mysql.com2005-12-1215-166/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | table' lockup". Changes from the innodb-4.1-ss11 snapshot. Do not call os_file-create_tmpfile() at runtime. Instead, create a tempfile at startup and guard access to it with a mutex. Also, fix bugs: 10511: "Wrong padding of UCS2 CHAR columns in ON UPDATE CASCADE"; 13778: "If FOREIGN_KEY_CHECKS=0, one can create inconsistent FOREIGN KEYs". When FOREIGN_KEY_CHECKS=0 we still need to check that datatypes between foreign key references are compatible. Also, added test cases (also for bug 9802).
| | * | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1joerg@mysql.com2005-12-122-6/+6
| | |\ \ | | | | | | | | | | | | | | | into mysql.com:/M41/mysql-4.1
| | | * \ Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/bug12429joerg@mysql.com2005-12-122-6/+6
| | | |\ \ | | | | |/ | | | |/|
* | | | | ndb - merge errorjonas@perch.ndb.mysql.com2005-12-131-0/+6
| | | | | | | | | | | | | | | | | | | | note bug#15629 has been fixed in release clone (sp on 64 bit platform), but not merged here yet
* | | | | Update ndb version in configure.injonas@perch.ndb.mysql.com2005-12-131-1/+1
| | | | |
* | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0jonas@perch.ndb.mysql.com2005-12-139-8/+250
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
| * | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1jonas@perch.ndb.mysql.com2005-12-139-8/+250
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
| | * | | | ndb - bug#15685jonas@perch.ndb.mysql.com2005-12-125-3/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error in abort handling in TC when timeout during abort
| | * | | | bug#15632 - ndbjonas@perch.ndb.mysql.com2005-12-094-3/+100
| | | | | | | | | | | | | | | | | | | | | | | | Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a) by also waiting for starting nodes
| | * | | | bug#15587 - ndbjonas@perch.ndb.mysql.com2005-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix typo in autotest script
| | * | | | bug#15587 - ndbjonas@perch.ndb.mysql.com2005-12-087-4/+74
| | | | | | | | | | | | | | | | | | | | | | | | Fix error in NF during NR
* | | | | | Merge rparranovo@bk-internal.mysql.com:/home/bk/mysql-5.0rparranovo@mysql.com2005-12-121-4/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/novo/MySQL/mysql-5.0
| * | | | | | mysql.spec.sh:rparranovo@mysql.com2005-12-121-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * made the following changes for the generic 5.0 RPM spec file - Added zlib to the list of (static) libraries installed - Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld) - Compile MySQL with bundled zlib - Fixed %packager name to "MySQL Production Engineering Team"
* | | | | | | Merge bk-internal:/home/bk/mysql-5.0jimw@mysql.com2005-12-126-15/+50
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * \ \ \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-12-126-15/+50
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | | | |_|/ / / | | |/| | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| | * | | | | Fix calls to free_underlaid_joins() in INSERT, DELETE, and UPDATEjimw@mysql.com2005-12-085-6/+46
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | handling so that indexes are closed before trying to commit the transaction. (Bug #15536)
| | * | | | Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@devsrv-b.mysql.com2005-12-071-9/+4
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into devsrv-b.mysql.com:/space/magnus/my41-bug9535
| | | * | | | Bug#13421 problem with sorting turkishbar@mysql.com2005-12-071-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | latin5.xml: - Fixing order thee Turkish letters to conform Turkish rules. - All non-Turkish accented letters are mappend to their non-accented counterparts.
| | * | | | | Merge ↵msvensson@devsrv-b.mysql.com2005-12-073-1/+19
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug9535/my41-bug9535 into devsrv-b.mysql.com:/space/magnus/my41-bug9535
* | | | | | | Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/bug12429joerg@mysql.com2005-12-122-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | rpl_until.test + rpl_until.result Fix (completion) for bug#12429joerg@mysql.com2005-12-122-4/+4
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | Manual merge from 4.1, extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places.
| | * | | | | rpl_until.test + rpl_until.resultjoerg@mysql.com2005-12-122-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs: The value is not important, and it depends on timing. Mask it. Backport and extension of a fix made by Matthias in 5.0, originally it was 1.1976 05/12/05 17:57:48 mleich@mysql.com
* | | | | | | Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0aivanov@mysql.com2005-12-123-2/+45
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/alexi/dev/mysql-5.0-14614
| * | | | | | | Fixed BUG #14614: Replication of tables with trigger generatesaivanov@mysql.com2005-12-113-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error message if database is changed.
* | | | | | | | item_sum.h, item.cc:igor@rurik.mysql.com2005-12-112-23/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Post review corrections in comments.
* | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-5.0igor@rurik.mysql.com2005-12-1098-1918/+6117
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
| * | | | | | | Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@devsrv-b.mysql.com2005-12-090-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into devsrv-b.mysql.com:/space/magnus/my50-bug9535
| | * \ \ \ \ \ \ Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@devsrv-b.mysql.com2005-12-070-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into devsrv-b.mysql.com:/space/magnus/my50-bug9535
| | | * \ \ \ \ \ \ Merge ↵msvensson@devsrv-b.mysql.com2005-12-070-0/+0
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug9535/my50-bug9535 into devsrv-b.mysql.com:/space/magnus/my50-bug9535
| | | | * \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/bug9535/my41-bug9535msvensson@neptunus.(none)2005-12-070-0/+0
| | | | |\ \ \ \ \ \ \ | | | | | | |_|_|/ / / | | | | | |/| | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug9535/my50-bug9535
| | | | | * | | | | | BUG#9535 Warning for "create table t as select uuid();"msvensson@neptunus.(none)2005-12-073-1/+19
| | | | | | |/ / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Set max_length of Item_func_uuid to max_length*system_charset_info->mbmaxlen Note! Item_func_uuid should be set to use 'ascii' charset when hex(), format(), md5() etc will use 'ascii' - Comitting again, the old patch seems to have been lost.
| * | | | | | | | | A fix and a test case for Bug#15441 "Running SP causes Server konstantin@mysql.com2005-12-095-36/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to Crash": the bug was that due to non-standard name resolution precedence in stored procedures (See Bug#5967) a stored procedure variable took precedence over a table column when the arguments for VALUES() function were resolved. The implementation of VALUES() function was not designed to work with Item_splocal and crashed. VALUES() function is non-standard. It can refer to, and is meaningful for, table columns only. The patch disables SP variables as possible arguments of VALUES() function.
| * | | | | | | | | Merge mysql.com:/home/dlenev/src/mysql-5.0-relfixdlenev@mysql.com2005-12-082-1/+36
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | / / / / | | | |_|_|/ / / / | | |/| | | | | | into mysql.com:/home/dlenev/src/mysql-5.0-merges
| | * | | | | | | Fix -ansi -pedantic compilation failure. Fix coding style.dlenev@mysql.com2005-12-071-6/+6
| | | | | | | | |
| | * | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-15510jimw@mysql.com2005-12-072-1/+36
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-release
| | | * | | | | | | Fix value returned by mysql_warning_count() after fetching a preparedjimw@mysql.com2005-12-062-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | statement that generated a warning. (Bug #15510)
| * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-12-071-0/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-5.0-merges
| | * | | | | | | | | Fix commit error: sp-vars.test should belong to mysql-test/t directory.anozdrin@mysql.com2005-12-071-0/+0
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-12-071-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-5.0-merges
| | * | | | | | | | Fix a compilation failure.konstantin@mysql.com2005-12-071-2/+2
| | | | | | | | | |
| * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-12-0741-1236/+4469
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-5.0-merges
| | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0konstantin@mysql.com2005-12-071-6/+6
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-5.0-root
| | | * | | | | | | | Fix -ansi -pedantic compilation failure. Fix coding style.konstantin@mysql.com2005-12-071-6/+6
| | | | | | | | | | |
| | * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0anozdrin@mysql.com2005-12-0741-1230/+4463
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-sp-vars-merge-2
| | | * | | | | | | | Patch for WL#2894: Make stored routine variables workanozdrin@mysql.com2005-12-0741-1231/+4463
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | according to the standard. The idea is to use Field-classes to implement stored routines variables. Also, we should provide facade to Item-hierarchy by Item_field class (it is necessary, since SRVs take part in expressions). The patch fixes the following bugs: - BUG#8702: Stored Procedures: No Error/Warning shown for inappropriate data type matching; - BUG#8768: Functions: For any unsigned data type, -ve values can be passed and returned; - BUG#8769: Functions: For Int datatypes, out of range values can be passed and returned; - BUG#9078: STORED PROCDURE: Decimal digits are not displayed when we use DECIMAL datatype; - BUG#9572: Stored procedures: variable type declarations ignored; - BUG#12903: upper function does not work inside a function; - BUG#13705: parameters to stored procedures are not verified; - BUG#13808: ENUM type stored procedure parameter accepts non-enumerated data; - BUG#13909: Varchar Stored Procedure Parameter always BINARY string (ignores CHARACTER SET); - BUG#14161: Stored procedure cannot retrieve bigint unsigned; - BUG#14188: BINARY variables have no 0x00 padding; - BUG#15148: Stored procedure variables accept non-scalar values;
| * | | | | | | | | | Merge mysql.com:/home/dlenev/src/mysql-5.0-bg11555-2dlenev@mysql.com2005-12-072-5/+5
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | / / / / / / / | | |_|/ / / / / / / | |/| | | | | | | | into mysql.com:/home/dlenev/src/mysql-5.0-merges
View Lorry Controller Status