summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/home/mydev/mysql-5.0ingo@mysql.com2006-04-115-41/+35
|\ | | | | | | into mysql.com:/home/mydev/mysql-5.0-bug5390
| * Merge bk-internal:/home/bk/mysql-5.0jimw@mysql.com2006-04-104-39/+33
| |\ | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| | * Merge bk-internal:/home/bk/mysql-5.0jimw@mysql.com2006-04-104-39/+33
| | |\ | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| | | * Merge mysql.com:/home/jimw/my/mysql-5.0-13601jimw@mysql.com2006-04-104-39/+33
| | | |\ | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| | | | * Bug #13601: Wrong int type for bitjimw@mysql.com2006-04-044-39/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The wrong value was being reported as the field_length for BIT fields, resulting in confusion for at least Connector/J. The field_length is now always the number of bits in the field, as it should be.
| * | | | Merge rurik.mysql.com:/home/igor/mysql-5.0igor@rurik.mysql.com2006-04-101-2/+2
| |\ \ \ \ | | |/ / / | |/| | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
| | * | | Fixed bug #16069.igor@rurik.mysql.com2006-04-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function agg_cmp_type in item_cmpfunc.cc neglected the fact that the first argument in a BETWEEN/IN predicate could be a field of a view. As a result in the case when the retrieved table was hidden by a view over it and the arguments in the BETWEEN/IN predicates are of the date/time type the function did not perform conversion of the constant arguments to the same format as the first field argument. If formats of the arguments differed it caused wrong a evaluation of the predicates.
* | | | | Merge mysql.com:/home/mydev/mysql-5.0ingo@mysql.com2006-04-103-121/+207
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | into mysql.com:/home/mydev/mysql-5.0-bug5390
| * | | | BUG#5390 - problems with merge tablesingo@mysql.com2006-04-052-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional fix for INSERT DELAYED with subselect. Originally detected in 5.1, but 5.0 could also be affected. The user thread creates a dummy table object, which is not included in the lock. The 'real' table is opened and locked by the 'delayed' system thread. The dummy object is now marked as not locked and this is tested in mysql_lock_have_duplicate().
| * | | | Merge mysql.com:/home/mydev/mysql-5.0ingo@mysql.com2006-04-052-121/+199
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-5.0-bug5390
| | * | | | BUG#5390 - problems with merge tablesingo@mysql.com2006-02-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Fix for merge from 4.1.
| | * | | | Merge mysql.com:/home/mydev/mysql-4.1-bug5390ingo@mysql.com2006-02-201-4/+18
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-5.0-bug5390
| | | * \ \ \ Merge mysql.com:/home/mydev/mysql-4.0-bug5390ingo@mysql.com2006-02-201-4/+16
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-bug5390
| | | | * | | | BUG#5390 - problems with merge tablesingo@mysql.com2006-02-201-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix is necessary because thr_multi_lock() reorderes the lock data references array.
| | * | | | | | BUG#5390 - problems with merge tables ingo@mysql.com2006-02-202-95/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge from 4.1
| | * | | | | | Merge mysql.com:/home/mydev/mysql-4.1-bug5390ingo@mysql.com2006-02-062-31/+121
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-5.0-bug5390
| | | * | | | | Merge mysql.com:/home/mydev/mysql-4.0-bug5390ingo@mysql.com2006-01-232-79/+171
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-bug5390
| | | | * | | | BUG#5390 - problems with merge tablesingo@mysql.com2006-01-232-73/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After-fix optimizations proposed and finally implemented by Monty.
| | | | * | | | Merge bk-internal:/home/bk/mysql-4.0msvensson@neptunus.(none)2006-01-161-1/+2
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug6554/my40-bug6554
| | | | | * | | | BUG#6554 Problem Building MySql on Fedora Core 3msvensson@neptunus.(none)2006-01-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove the local static var
* | | | | | | | | Fixed BUG#15868: InnoDB hangs under 200 threads making INSERTs: 'thread ↵aivanov@mysql.com2006-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thrashing'. Applied changes due Heikki Tuuri.
* | | | | | | | | Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0aivanov@mysql.com2006-04-093-6/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/alexi/bugs/mysql-5.0-15758
| * | | | | | | | | Fixed BUG#15758: "Holding adaptive search latch inaivanov@mysql.com2006-04-073-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase_query_caching_of_table_permitted()". Applied the patch due to Heikki Tuuri. Also removed superfluous #ifdefs.
* | | | | | | | | | Merge mysql.com:/users/lthalmann/bk/mysql-5.0-release-bug18116lars@mysql.com2006-04-091-1/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | into mysql.com:/users/lthalmann/bk/mysql-5.0
| * | | | | | | | | BUG#18116: Changed of how mutex is handled for XA and rotating binloglars@mysql.com2006-03-311-1/+5
| | | | | | | | | |
* | | | | | | | | | Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0aelkin@dl145j.mysql.com2006-04-071-0/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dl145j.mysql.com:/tmp/5.0.21-bug17284-temp_table
| * \ \ \ \ \ \ \ \ \ Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0aelkin@mysql.com2006-04-071-0/+6
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0.21-bug17284-temp_table
| | * | | | | | | | | | Bug#17284 erroneous temp table cleanup on slave.aelkin@mysql.com2006-04-071-0/+6
| | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Idea of the fix is for master to send FD event with `created' as 0 to reconnecting slave (upon slave_net_timeout, no master crash) to avoid destroying temp tables. In a case of a connect by slave to the master after its crash temp tables have been already cleaned up so that slave can not keep `orphan' temp tables.
* | | | | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0igor@rurik.mysql.com2006-04-071-0/+9
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/mysql-5.0
| * | | | | | | | | | Fixed bug #15917: unexpected complain for a NIST test case.igor@rurik.mysql.com2006-04-061-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was due to the fact that with --lower-case-table-names set to 1 the function find_field_in_group did not convert the prefix 'HU' in HU.PROJ.CITY into lower case when looking for it in the group list. Yet the names in the group list were extended by the database name in lower case.
* | | | | | | | | | | fix for wrong QUARTER calculation in EXTRACT() (Bug #18100)hartmut@mysql.com2006-04-071-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Fix for bug#18281 group_concat changes charset to binarygluh@eagle.intranet.mysql.r18.ru2006-04-071-1/+4
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | skip charset aggregation for order columns
* | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2006-04-061-20/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-5.0-bug18237-review
| * | | | | | | | | Remove redundant code in opt_sum_query()sergefp@mysql.com2006-04-061-20/+7
| | | | | | | | | |
* | | | | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0svoj@april.(none)2006-04-062-3/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | into april.(none):/home/svoj/devel/mysql/BUG14945/mysql-5.0
| * | | | | | | | | Fix for bug#14945 "Truncate table doesn't reset the auto_incrementsvoj@april.(none)2006-04-062-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | counter". When TRUNCATE TABLE was called within an stored procedure the auto_increment counter was not reset to 0 even if straight TRUNCATE for this table did this. This fix makes TRUNCATE in stored procedures to be handled exactly in the same way as straight TRUNCATE. We achieve this by rolling back the fix for bug 8850, which is no longer needed since stored procedures don't require prelocked mode anymore (and TRUNCATE is not allowed in stored functions or triggers).
* | | | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-5.0igor@rurik.mysql.com2006-04-051-1/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
| * | | | | | | | | | Fixed bug #18237.igor@rurik.mysql.com2006-04-041-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code in opt_sum_query that prevented the COUNT/MIN/MAX optimization from being applied to outer joins was not adjusted after introducing nested joins. As a result if an outer join contained a reference to a view as an inner table the code of opt_sum_query missed the presence of an on expressions and erroneously applied the mentioned optimization.
* | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@sunlight.local2006-04-052-3/+11
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | into sunlight.local:/local_work/16281-bug-5.0-mysql
| * | | | | | | | | | Fixed bug #16281: Multi-table update broken in 5.0 on tables imported from 4.1evgen@sunlight.local2006-04-052-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mutli-table uses temporary table to store new values for fields. With the new values the rowid of the record to be updated is stored in a Field_string field. Table to be updated is set as source table of the rowid field. But when the temporary table creates the tmp field for the rowid field it converts it to a varstring field because the table to be updated was created by the v4.1. Due to this the stored rowids were broken and no records for update were found. The flag can_alter_field_type is added to Field_string class. When it is set to 0 the field won't be converted to varstring. The Field_string::type() function now always returns MYSQL_TYPE_STRING if can_alter_field_type is set to 0. The multi_update::initialize_tables() function now sets can_alter_field_type flag to 0 for the rowid fields denying conversion of the field to a varstring field.
* | | | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0bar@mysql.com2006-04-044-9/+102
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.0
| * | | | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-5.0igor@rurik.mysql.com2006-04-033-17/+16
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
| | * | | | | | | | | | Post review changes for the fix of bug #16504.igor@rurik.mysql.com2006-04-033-17/+16
| | | | | | | | | | | |
| * | | | | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0igor@rurik.mysql.com2006-04-034-12/+106
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/mysql-5.0
| | * | | | | | | | | | Fixed bug #16504.igor@rurik.mysql.com2006-03-314-12/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple equalities were not adjusted after reading constant tables. It resulted in neglecting good index based methods that could be used to access of other tables.
* | | | | | | | | | | | Merge mysql.com:/usr/home/bar/mysql-4.1.12076bar@mysql.com2006-04-032-9/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.0
| * | | | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2006-04-032-9/+12
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1.12076
| | * | | | | | | | | | | latin1.xml:bar@mysql.com2005-11-072-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing latin1 to cp1252, according to recent changes in ctype-latin1.c. Index.xml: Marking latin1_swedish_ci as "compiled" to avoid its generating into ctype-extra.c. ctype-extra.c: Bug#12076 --with-extra-charsets has no effect All supported dnamic charsets were generated from sql/share/charsets/*.xml under #ifdefs. Compiling is to be activated from "configure" by adding --with-extra-charsets. I'm not including auto-recreating of ctype-extra.c into build process for ease purposes.
* | | | | | | | | | | | | Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0aivanov@mysql.com2006-04-011-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/alexi/innodb/mysql-5.0-merged
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0aivanov@mysql.com2006-04-011-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/alexi/innodb/mysql-5.0-merged