summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-10-142-0/+8
|\ | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
| * Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2004-10-142-0/+8
| |\ | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| | * - added missing file strings/my_strtoll10.c to the libmysql.dsp andlenz@mysql.com2004-10-142-0/+8
| | | | | | | | | | | | mysqlclient.dsp project files
* | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-10-144-2/+40
|\ \ \ | |/ / | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
| * | ctype_utf8.test, ctype_utf8.result:bar@mysql.com2004-10-142-2/+2
| | | | | | | | | | | | Wrong handler.
| * | Bug #6019 SELECT tries to use too short prefix index on utf8 databar@mysql.com2004-10-144-2/+32
| |/
| * ctype_utf8.test:bar@mysql.com2004-10-141-0/+8
| | | | | | | | Bug#6086 "ctype_utf8" test fails when MySQL does not include InnoDB support
* | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-10-1414-59/+214
|\ \ | |/ | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
| * Bug #6043 erratic searching for diacriticals in indexed MyISAM UTF-8 tablebar@mysql.com2004-10-143-6/+55
| |
| * Followup to Bug#5985: fixing one thing that went wrong.konstantin@mysql.com2004-10-141-0/+1
| |
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1konstantin@mysql.com2004-10-1411-54/+159
| |\ | | | | | | | | | into mysql.com:/media/sda1/mysql/mysql-4.1-5985
| | * A fix and test case for Bug#5985 ""prepare stmt from "select rand(?)" konstantin@mysql.com2004-10-1411-54/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crashes server." The fix makes Item_func_rand prepared-statements aware plus it fixes the case when RAND is used in prepared statements and replication is on (as well as several similar issues). Until now we did not reset THD before every execution of a prepared statement, so if some execution had set thd->time_zone_used or thd->rand_used they would not be reset until next mysql_parse. Some of post-review fixes done.
* | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-10-131-2/+4
|\ \ \ | |/ / |/| | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
| * | correct (high level) fix for BUG#5367 to privent problems in other enginesbell@sanja.is.com.ua2004-10-071-2/+4
| | |
* | | srv0srv.c, log0log.c, srv0srv.h, ha_innodb.cc, ha_innodb.h:heikki@hundin.mysql.fi2004-10-135-14/+124
| | | | | | | | | | | | Implement innobase_very_fast_shutdown and innobase_start_trx_and_assign_read_view(); these were requested by Guilhem
* | | Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.1ingo@mysql.com2004-10-131-7/+1
|\ \ \ | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1
| * | | BUG#4286 - HANDLER tables are closed by FLUSH TABLE(S).ingo@mysql.com2004-10-131-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG#4335 - one name can be handler open'ed many times. Fixed problems detected on Windows build by VC++. Removed unused variables. Applied a neccessary cast.
* | | | tests/client_test.c:konstantin@mysql.com2004-10-131-482/+596
|/ / / | | | | | | | | | | | | Make checks (asserts) performed in client_test.c work in non-debug builds.
* | | InnoDB: correct potential overflow in trx_purge()marko@hundin.mysql.fi2004-10-131-2/+5
| | |
* | | fix for some build/test errors for 4.1.6tomas@poseidon.ndb.mysql.com2004-10-133-4/+6
| | |
* | | Move Heikki's comment about thd->query comment to proper place konstantin@mysql.com2004-10-131-18/+17
| | | | | | | | | | | | (bad merge from 4.0)
* | | post-commit:mwagner@here.mwagner.org2004-10-121-1/+2
| |/ |/| | | | | Added catch for (example) WL#1234 into bk commit subjects
* | ps.test, ps.result: a test case for Bug#6042 "constants konstantin@mysql.com2004-10-122-0/+39
| | | | | | | | propogation works only once (prepared statements)".
* | New tests for prepared statements:joerg@mysql.com2004-10-124-0/+184
| | | | | | | | | | | | | | | | | | | | - 'ps_10nestset' uses a "nested set" approach for an employee hierarchy, then does arithmetic on the "salary" field; (soon) to be extended by inserts / deletes which imply mass updates on the "l"/"r" fields showing the set inclusion, - 'ps_11bugs' will get (some of ?) those bug DB entries which refer to prepared statements, but whose number does not appear in a test file comment - so it will also be extended.
* | item.h:konstantin@mysql.com2004-10-121-0/+1
| | | | | | | | | | | | | | | | A fix for Bug#6042 "constants propogation works olny once (prepared statements)": reset item->marker in Item::cleanup, as it's used in propogate_cond_constants. No test case as the only way I could come up with to show the problem is EXPLAIN, and EXPLAIN is painful to use in the test suite.
* | NDB compile fix sol9x86pekka@mysql.com2004-10-124-3/+4
| |
* | Added documentation.jani@a193-229-222-105.elisa-laajakaista.fi2004-10-111-1/+20
| |
* | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-10-117-9/+9
|\ \ | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| * | another order by fix for ndbtomas@poseidon.ndb.mysql.com2004-10-117-9/+9
| | |
* | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1jani@a193-229-222-105.elisa-laajakaista.fi2004-10-112-86/+99
|\ \ \ | |/ / |/| | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
| * | Improved mysqld_multi documentation, especially the --examplejani@a193-229-222-105.elisa-laajakaista.fi2004-10-112-86/+99
| | | | | | | | | | | | section, which had gotten somewhat out-dated.
* | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ram@gw.mysql.r18.ru2004-10-105-33/+64
|\ \ \ | | | | | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5382
| * \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-10-105-33/+64
| |\ \ \ | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | * \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-10-105-33/+64
| | |\ \ \ | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | | * | | Fixes bug with tableImpl with blobs not being initialized properly w.r.t ↵tomas@poseidon.ndb.mysql.com2004-10-105-33/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pointer to blob tableImpl in column added blob to test to see that blob tables don't show up in show tables auto increment setting need not fetch blob tables (will otherwise generate error during table creation) moved addBlobTables out of fetchGlobalTableImpl to get_local_table_info changed addBlobTables to start from last column and break if all blobs added also addBlobTables will return -1 if failed (typically getTable) changed to using get_local_table_info with internal table name where applicable for efficiency added option to get_local_table_info wether to fetch blob tables or not getTable always fetches the blobtables moved addBlobTables to get_local_table_info to always be called, even if main table goes to cache only
* | | | | | clean-up, indentation fixes.ram@gw.mysql.r18.ru2004-10-102-11/+10
| | | | | |
* | | | | | A fix (bug #5382: Server crashes after writing INTO OUTFILE)ram@gw.mysql.r18.ru2004-10-103-17/+63
|/ / / / /
* | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ram@gw.mysql.r18.ru2004-10-108-54/+215
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/4.1.gconcat
| * | | | Blob support for the group_concat() function.ram@gw.mysql.r18.ru2004-10-108-54/+215
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Bug #4315: GROUP_CONCAT with ORDER BY returns strange results for TEXT fields Bug #5564: Strange behaviour with group_concat and distinct Bug #5970: group_concat doesn't print warnings)
* | | | | A small simplification: perform two actions at once, register akonstantin@mysql.com2004-10-107-41/+31
| | | | | | | | | | | | | | | | | | | | change, and perform it (the new Item changes registry).
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1konstantin@mysql.com2004-10-107-56/+82
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/media/sda1/mysql/mysql-4.1-hook
| * | | | | A fix and test case for Bug#5987 "subselect in bool function konstantin@mysql.com2004-10-107-56/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crashes server (prepared statements)": the bug was that all boolean items always recovered its original arguments at statement cleanup stage. This collided with Item_subselect::select_transformer, which tries to permanently change the item tree to use a transformed subselect instead of original one. So we had this call sequence for prepare: mysql_stmt_prepare -> JOIN::prepare -> Item_subselect::fix_fields -> the item tree gets transformed -> Item_bool_rowready_func2::cleanup, item tree is recovered to original state, while it shouldn't have been; mysql_stmt_execute -> attempts to execute a broken tree -> crash. Now instead of bluntly recovering all arguments of bool functions in Item_bool_rowready_func2::cleanup, we recover only those which were changed, and do it in one place. There still would exist a possibility for a collision with subselect tranformation, if permanent and temporary changes were performed at the same stage. But fortunately subselect transformation is always done first, so it doesn't conflict with the optimization done by propogate_cond_constants. Now we have: mysql_stmt_prepare -> JOIN::prepare -> subselect transformation permanently changes the tree -> cleanup doesn't recover anything, because nothing was registered for recovery. mysql_stmt_execute -> JOIN::prepare (the tree is already transformed, so it doesn't change), JOIN::optimize -> propogate_cond_constants -> temporary changes the item tree with constants -> JOIN::execute -> cleanup -> the changes done by propogate_cond_constants are recovered, as they were registered for recovery.
* | | | | | Added possibility to use [GNR...] optional argument forjani@a193-229-222-2.elisa-laajakaista.fi2004-10-091-12/+15
| |_|_|/ / |/| | | | | | | | | | | | | | mysqld_multi via mysqld_multi.server.sh
* | | | | Added some extra information to output in case --verbosejani@a193-229-222-2.elisa-laajakaista.fi2004-10-092-2/+55
| | | | | | | | | | | | | | | | | | | | was given.
* | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1jani@a193-229-222-2.elisa-laajakaista.fi2004-10-091-68/+91
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into a193-229-222-2.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
| * | | | | - Added --verbosejani@a193-229-222-2.elisa-laajakaista.fi2004-10-091-68/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Made some of the warnings under --verbose only - Added possibility to add mysqladmin= under groups [mysqldN] mysqladmin=... is no longer mandatory under [mysqld_multi] - Made 'start', 'stop' and 'report' commands truly case-insensitive - Some other common places code merge and cleanup
* | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-10-095-64/+18
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-ps-4.1
| * | | | | args_copy and cleunup() removed from Item_sumbell@sanja.is.com.ua2004-10-095-64/+18
| |/ / / / | | | | | | | | | | | | | | | registration changing ITEM_SUM arguments added
* | | | | row0mysql.c:heikki@hundin.mysql.fi2004-10-081-3/+15
| | | | | | | | | | | | | | | | | | | | If one tries to drop an InnoDB table without an .ibd file, print to .err log that we DID remove the table from the internal data dictionary of InnoDB, and return DB_SUCCESS so that MySQL will delete the .frm file; the drawback in this is that then DROP TABLE returns success, and the user is not alerted; maybe it could return a warning
* | | | | mysql-test-run.sh:mwagner@here.mwagner.org2004-10-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Look for 'client_test' in tests/ not bin/ make_binary_distribution.sh: Copy 'client_test' into the dist