Commit graph

15380 commits

Author SHA1 Message Date
joreland@mysql.com
57612c479f Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-10-13 10:19:28 +02:00
joreland@mysql.com
29c270c13e Bug#6020, any lock >= write_allow_write is a write lock 2004-10-13 10:08:18 +02:00
tomas@poseidon.ndb.mysql.com
b40261262a fix for some build/test errors for 4.1.6 2004-10-13 00:38:43 +00:00
konstantin@mysql.com
1ac41c9285 Move Heikki's comment about thd->query comment to proper place
(bad merge from 4.0)
2004-10-13 00:17:37 +04:00
mwagner@here.mwagner.org
06245b4508 post-commit:
Added catch for (example) WL#1234 into bk commit subjects
2004-10-12 15:08:58 -05:00
konstantin@mysql.com
cc57252bb7 ps.test, ps.result: a test case for Bug#6042 "constants
propogation works only once (prepared statements)".
2004-10-12 21:16:07 +04:00
heikki@hundin.mysql.fi
41ab008a36 ha_innodb.cc:
Change error code to HA_ERR_ROW_IS_REFERENCED if we cannot DROP a parent table referenced by a FOREIGN KEY constraint; this error number is less misleading than the previous value HA_ERR_CANNOT_ADD_FOREIGN, but misleading still; we should introduce to 5.0 a proper MySQL error code
2004-10-12 18:12:00 +03:00
heikki@hundin.mysql.fi
1ddec876d6 Merge heikki@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.0
2004-10-12 18:07:55 +03:00
joerg@mysql.com
ae8800d8d3 New tests for prepared statements:
- '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.
2004-10-12 16:00:50 +02:00
konstantin@mysql.com
f063a81755 item.h:
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.
2004-10-12 17:33:13 +04:00
pekka@mysql.com
abf1b8fbc3 NDB compile fix sol9x86 2004-10-12 14:07:41 +02:00
joreland@mysql.com
4041575a46 Fix order by 2004-10-12 07:20:38 +02:00
tomas@poseidon.ndb.mysql.com
ed52b77483 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-11 22:31:44 +00:00
jani@a193-229-222-105.elisa-laajakaista.fi
9001573040 Added documentation. 2004-10-11 23:59:37 +03:00
tomas@poseidon.ndb.mysql.com
dbd73895d2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-11 20:59:36 +00:00
tomas@poseidon.ndb.mysql.com
1b35f6b469 another order by fix for ndb 2004-10-11 20:58:48 +00:00
jani@a193-229-222-105.elisa-laajakaista.fi
520d875015 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2004-10-11 20:55:36 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
4d55c4a321 Improved mysqld_multi documentation, especially the --example
section, which had gotten somewhat out-dated.
2004-10-11 20:54:48 +03:00
sergefp@mysql.com
d86b33c641 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/mnt/tmp/mysql-4.0-bug-myisampack
2004-10-11 21:30:25 +04:00
tomas@poseidon.ndb.mysql.com
6d83632432 converted to use my_malloc for memory allocation 2004-10-11 10:30:47 +00:00
joreland@mysql.com
975dcc9628 Add new test cases to autotest 2004-10-11 11:32:16 +02:00
joreland@mysql.com
072f4fbf2e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-10-11 11:13:04 +02:00
joreland@mysql.com
cf6a605437 wl1801 - more node failure handling in simple/dirty read 2004-10-11 11:02:39 +02:00
guilhem@mysql.com
c84737d6e8 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-10-11 11:02:24 +02:00
guilhem@mysql.com
13af58aab6 Fix for BUG#5949 "error code 1223 in binlog when using innobackup":
when one connection had done FLUSH TABLES WITH READ LOCK, some updates, and then COMMIT,
it was accepted but my_error() was called and so, while client got no error, error was logged in binlog.
We now don't call my_error() in this case; we assume the connection know what it does.
This problem was specific to 4.0.21. The change is needed to make replication work with existing versions of innobackup.
2004-10-11 11:01:38 +02:00
joreland@mysql.com
fa7a36bb33 wl1801 - Support for handling NF during dirty read 2004-10-11 09:20:04 +02:00
pekka@mysql.com
fabf791061 Merge 2004-10-10 18:55:05 +02:00
pekka@mysql.com
3d21802443 NDB tux optim 16 - binary search on bounding node when adding entry 2004-10-10 18:21:05 +02:00
pekka@mysql.com
1778ac4fcf NDB ndb_mgm: fix dump and signal log (more to do) 2004-10-10 17:38:14 +02:00
tomas@poseidon.ndb.mysql.com
f05a92ce4b Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
2004-10-10 14:08:18 +00:00
ram@gw.mysql.r18.ru
e970eab39d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5382
2004-10-10 16:31:42 +05:00
tomas@poseidon.ndb.mysql.com
f3d002c1b6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-10 11:31:41 +00:00
joreland@mysql.com
37cc75b1cb Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-10-10 13:13:13 +02:00
ram@gw.mysql.r18.ru
0962ac560f clean-up, indentation fixes. 2004-10-10 15:29:06 +05:00
tomas@poseidon.ndb.mysql.com
252c14049e Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
2004-10-10 10:03:10 +00:00
ram@gw.mysql.r18.ru
48305dcd69 A fix (bug #5382: Server crashes after writing INTO OUTFILE) 2004-10-10 14:40:24 +05:00
tomas@poseidon.ndb.mysql.com
c5020e3b4c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-10 08:32:15 +00:00
tomas@poseidon.ndb.mysql.com
060707c2f1 Fixes bug with tableImpl with blobs not being initialized properly w.r.t 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
2004-10-10 08:31:45 +00:00
ram@gw.mysql.r18.ru
5e352defa5 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.gconcat
2004-10-10 12:35:39 +05:00
ram@gw.mysql.r18.ru
5f857a7a82 Blob support for the group_concat() function.
(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)
2004-10-10 12:10:53 +05:00
konstantin@mysql.com
703e396b6e A small simplification: perform two actions at once, register a
change, and perform it (the new Item changes registry).
2004-10-10 03:10:00 +04:00
konstantin@mysql.com
e08febea0c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/media/sda1/mysql/mysql-4.1-hook
2004-10-10 02:39:48 +04:00
konstantin@mysql.com
daa4c2495c A fix and test case for Bug#5987 "subselect in bool function
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.
2004-10-10 02:39:22 +04:00
pekka@mysql.com
e0c36040b8 NDB tux optim 15 - fix wasted space in index node entries 2004-10-09 16:22:16 +02:00
heikki@hundin.mysql.fi
af3681f2d9 trx0rec.c:
Fix bug #5960: if one updated a column so that its size changed, or updated it to an externally stored (TEXT or BLOB) value, then ANOTHER externally stored column would show up as 512 bytes of good data + 20 bytes of garbage in a consistent read that fetched the old version of the row
2004-10-09 14:13:40 +03:00
jani@a193-229-222-2.elisa-laajakaista.fi
49aac4ba3f Added possibility to use [GNR...] optional argument for
mysqld_multi via mysqld_multi.server.sh
2004-10-09 13:57:27 +03:00
jani@a193-229-222-2.elisa-laajakaista.fi
26e34093c3 Added some extra information to output in case --verbose
was given.
2004-10-09 13:23:00 +03:00
jani@a193-229-222-2.elisa-laajakaista.fi
aa294cbd11 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into a193-229-222-2.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2004-10-09 12:33:50 +03:00
jani@a193-229-222-2.elisa-laajakaista.fi
2450f4afa2 - Added --verbose
- 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
2004-10-09 12:33:24 +03:00
bell@sanja.is.com.ua
fbe05a03c5 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps-4.1
2004-10-09 11:18:42 +03:00