summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Eliminate warnings noticed by VC7. This includes fixing my_mmap() onjimw@mysql.com2005-03-1833-56/+66
| | | | | | Windows to call CreateFileMapping() with correct arguments, and propogating the introduction of query_id_t to everywhere query ids are passed around. (Bug #8826)
* mysql-test-run.sh:kent@mysql.com2005-03-181-6/+6
| | | | Disabled old feature to disable test cases
* Merge mysqldev@production.mysql.com:my/mysql-5.0-buildjoerg@mysql.com2005-03-180-0/+0
|\ | | | | | | into mysql.com:/M50/build-5.0.3
| * Mergejoerg@mysql.com2005-03-181-2/+2
| |\
| | * Move mis-placed assignments to their proper position.joerg@mysql.com2005-03-181-2/+2
| | |
* | | Merge mysqldev@production.mysql.com:my/mysql-5.0-buildjimw@mysql.com2005-03-171-3/+4
|\ \ \ | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-build
| * | | Fix merge of sql/sql_select.cc using Igor's patch (Bug #9254)jimw@mysql.com2005-03-171-3/+4
| | | |
* | | | - fixed two merge errorslenz@mysql.com2005-03-181-2/+2
|/ / /
* | | Mergemysqldev@mysql.com2005-03-174-47/+57
|\ \ \
| * | | sp.test, sp.result:mysqldev@mysql.com2005-03-174-47/+57
| | | | | | | | | | | | | | | | | | | | | | | | transactional test removed sp_trans.test, sp_trans.result: new file
* | | | Merge mysql.com:/home/jimw/my/mysql-5.0-8047jimw@mysql.com2005-03-171-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-build
| * | | | Fix 64-bit issue with mysql_client_test. (Bug #8047)jimw@mysql.com2005-03-161-1/+1
| | | | |
* | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-8679jimw@mysql.com2005-03-171-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-build
| * | | | Fix HP/UX debug compile error. (Bug #8679)jimw@mysql.com2005-03-171-1/+2
| |/ / /
* | | | Merge mysqldev@production.mysql.com:my/mysql-5.0-buildjimw@mysql.com2005-03-171-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-build
| * | | | - Added a missing pair of parenthesis. (already commited by Jani, ↵lenz@mysql.com2005-03-171-4/+4
| | |/ / | |/| | | | | | | | | | ChangeSet@1.1819)
* | | | Merge mysql.com:/home/jimw/my/mysql-5.0-8866jimw@mysql.com2005-03-171-1/+11
|\ \ \ \ | |/ / / |/| | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-build
| * | | Fix failure in 'kill' test due to change of defaultjimw@mysql.com2005-03-161-1/+11
| |/ / | | | | | | | | | reconnect setting in mysql client library. (Bug #8866)
* | | Manual merge.joerg@mysql.com2005-03-171-15/+41
|\ \ \ | | |/ | |/|
| * | Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1joerg@mysql.com2005-03-162-17/+44
| |\ \
| | * | Add information to the log file written by 'Do-compile' that allows to calculatejoerg@mysql.com2005-03-161-15/+41
| | | | | | | | | | | | | | | | the time spent in the various steps.
* | | | after merge fixgluh@gluh.mysql.r18.ru2005-03-176-9/+10
| | | |
* | | | Merge 4.1 -> 5.0gluh@gluh.mysql.r18.ru2005-03-1726-95/+394
|\ \ \ \
| * \ \ \ Mergeramil@mysql.com2005-03-173-1/+18
| |\ \ \ \
| | * | | | A fix (bug #8942: SUBSTRING_INDEX in UPDATE causes internal loop).ramil@mysql.com2005-03-173-1/+18
| | | | | |
| | * | | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0marko@hundin.mysql.fi2005-03-152-1/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/k/mysql-4.0
| * | \ \ \ \ Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2005-03-165-30/+211
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
| | * | | | | | olap.result, olap.test:igor@rurik.mysql.com2005-03-163-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a test for bug #8615. sql_select.cc: Fixed bug #8615. This fix only removed the cause of the reported crash. It does not resolve other problems of rollup queries with DISTINCT. They were fixed in the previous patch for bug 8616.
| | * | | | | | olap.result, olap.test:igor@rurik.mysql.com2005-03-155-27/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a test case for bug #8616. item.h: Fixed bug #8616. Added class Item_null_result used in rollup processing. sql_select.h, sql_select.cc: Fixed bug #8616. Added JOIN::rollup_write_data to cover rollup queries with DISTINCT. Modified other rollup methods.
| * | | | | | | Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b9123-4.1lars@mysql.com2005-03-161-36/+57
| |\ \ \ \ \ \ \
| | * | | | | | | Fixes after Sinisa and Serg comments after push of patch for BUG#9123.lars@mysql.com2005-03-161-36/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG#9123 is solved earlier than this patch though.
| * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2005-03-164-14/+17
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| | * | | | | | | Fix to get --skip-ndb to workmonty@mysql.com2005-03-161-2/+2
| | | | | | | | |
| | * | | | | | | Partly reverty back patch (in heap-auto-increment-key detection) to ensure ↵monty@mysql.com2005-03-164-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that auto_key and auto_key_type are calculated the same way
| * | | | | | | | Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1lars@mysql.com2005-03-164-14/+26
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | into mysql.com:/home/bkroot/mysql-4.1
| | * | | | | | | Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()bar@mysql.com2005-03-164-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not always correct for NULL values. Now they always result a non NULL value even the argument is NULL. It is more usefull for debugging purposes.
| * | | | | | | | Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1lars@mysql.com2005-03-163-0/+16
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | into mysql.com:/home/bkroot/mysql-4.1
| | * | | | | | | Fix for bug#8656: Crash with group_concat on alias in outer tablegluh@gluh.mysql.r18.ru2005-03-163-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed result_field support of Item_ref
| * | | | | | | | BUG#9123: Updates after Mats reviewlars@mysql.com2005-03-161-2/+2
| | | | | | | | |
| * | | | | | | | Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1lars@mysql.com2005-03-163-0/+9
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | into mysql.com:/home/bkroot/mysql-4.1
| | * | | | | | | Fix for bug #7100: relay_log_space_max missing from SHOW VARIABLESgluh@gluh.mysql.r18.ru2005-03-163-0/+9
| | | | | | | | |
| * | | | | | | | Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1lars@mysql.com2005-03-165-2/+33
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | into mysql.com:/home/bkroot/mysql-4.1
| | * | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-03-165-2/+33
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1-bug8785
| | | * | | | | | | # Bug#8785 Problem with nested concats andbar@mysql.com2005-03-155-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | character set conversion of a string constant.
| * | | | | | | | | Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1lars@mysql.com2005-03-161-1/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | into mysql.com:/home/bkroot/mysql-4.1
| | * | | | | | | | Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b9123-4.1lars@mysql.com2005-03-161-1/+3
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | | * | | | | | | BUG#9123: If a table name is given with an underscore, lars@mysql.com2005-03-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | then this must be properly quoted when sent to SHOW TABLES LIKE ...
* | | | | | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0gluh@gluh.mysql.r18.ru2005-03-174-9/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
| * \ \ \ \ \ \ \ \ \ Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0gluh@gluh.mysql.r18.ru2005-03-174-9/+7
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
| | * \ \ \ \ \ \ \ \ \ Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0gluh@gluh.mysql.r18.ru2005-03-161-1/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
View Lorry Controller Status