guilhem@mysql.com
55fb16a7a6
1) undoing my fix for BUG#8055 "Trouble with replication from temporary tables and ignores"
...
and fixing it another way (per Monty; a simpler solution which does not increase the number
of binlog events is to always execute DROP TEMPORARY TABLE IF EXISTS on slave). A new test rpl_drop_temp.
2) fixing BUG#8436 "Multiple "stacked" SQL statements cause replication to stop" by setting
thd->query_length to the length of the query being executed, not counting the next queries
if this is a multi-query. Should also improve display of SHOW PROCESSLIST. A new test rpl_multi_query.
2005-02-14 23:47:17 +01:00
sergefp@mysql.com
c30f7feba1
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug8218
2005-02-14 23:49:01 +03:00
mats@mysql.com
30bf28202c
Bug#8412: For replication to work correctly, the prologue and
...
epilogue to an SQL statement should not have an error code even
when the SQL statement itself has an error code.
2005-02-14 18:39:33 +01:00
bell@sanja.is.com.ua
2d3076b69d
removed wrong distinct UNION detection (BUG#6565)
2005-02-14 02:06:21 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
4957c4850d
Bug#2435
...
Alter handling for UNION syntax
Tests for UNION and parentheses
2005-02-13 22:35:52 +00:00
heikki@hundin.mysql.fi
961d8b0ebf
Merge hundin.mysql.fi:/home/heikki/mysql-4.0
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-02-13 21:05:18 +02:00
bell@sanja.is.com.ua
539cbc580a
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2005-02-13 11:18:55 +02:00
sergefp@mysql.com
c0c50efdef
Fix for BUG#8218:
...
Remove TMP_TABLE_PARAM::copy_funcs_it. TMP_TABLE_PARAM is a member of JOIN which is
copied via memcpy, and List_iterator_fast TMP_TABLE_PARAM::copy_funcs_it ends up
pointing to the wrong List.
2005-02-12 22:58:54 +03:00
guilhem@mysql.com
40a2e968f9
new static archive_inited variable, so that archive_db_end() will do something only if archive_db_init() was run before
...
(protection against destroying uninited mutex in the case where mysqld fails early at startup (before archive_db_init() was called)
and then calls archive_db_end() to clean up).
2005-02-12 19:17:33 +01:00
bar@mysql.com
9ba7392306
Bug#8235 Connection collation change & table create with default result in crash
2005-02-12 16:27:22 +04:00
bell@sanja.is.com.ua
8f95f5a595
Fixed mistyping (thnx to Konstantin)
2005-02-11 21:57:37 +02:00
igor@rurik.mysql.com
e528a1c777
Manual merge
2005-02-11 10:44:03 -08:00
igor@rurik.mysql.com
634424ca16
select.result:
...
After revision of the fix for bug #7520 .
table.cc:
Revised the fix for bug #7520 .
Made it compliant with 5.0 code where the bug does not exist.
2005-02-11 10:39:26 -08:00
igor@rurik.mysql.com
a697e5da15
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-10 23:48:35 -08:00
igor@rurik.mysql.com
06ff30f6c0
Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-10 22:17:18 -08:00
igor@rurik.mysql.com
8b3d59ad42
select.result, select.test:
...
Added a test case for bug #7520 .
table.cc:
Fixed bug #7520 .
The bug was caused by a wrong calculation of the field max_key_length for
a TABLE structure when there was an index on a blob field.
2005-02-10 22:15:38 -08:00
brian@zim.(none)
29af4dffe6
Set of fixes requested by Kent in IRC. Tested (except the windows changes since I am trusting Kent...). No windows compiles here folks...
2005-02-10 19:04:38 -08:00
lars@mysql.com
8b9679de0e
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6749-4.1
2005-02-10 21:55:36 +01:00
lars@mysql.com
bef05eda10
BUG#6749: If there is no current database, then nothing should be binlogged if
...
binlog-do-db or binlog-ignore-db are in effect. (In the future 5.1? 5.0? I think
each statement should be verified against the filtering criteria based on the database
it *uses* and not the *current* one. But, right now the *current* database is what
counts according to the semantics of the manual.)
2005-02-10 21:23:48 +01:00
bell@sanja.is.com.ua
70797f571f
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-02-09 21:14:06 +02:00
bell@sanja.is.com.ua
90c0024217
reverted patch for BUG#7351 (because of performance ussie)
2005-02-09 21:08:08 +02:00
monty@mysql.com
ab5aed6047
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-02-09 19:22:35 +02:00
jimw@mysql.com
f391223f19
Fix per-hour user connection limits by making sure that the number of
...
connections is actually reset after an hour, and also fix (unlikely)
conditions under which the per-hour query and connection limits could be
exceeded. (Bug #8350 )
2005-02-08 18:43:27 -08:00
jimw@mysql.com
5ebbc834fe
Fix removal of tables from cache when the database they are contained
...
within is dropped and lower_case_table_names is set. (Bug #8355 )
2005-02-08 15:14:14 -08:00
sergefp@mysql.com
dcc65b77a6
Fix for BUG#8371: wrong rec_per_key value for hash index on temporary table
2005-02-08 23:44:51 +03:00
jani@ua141d10.elisa.omakaista.fi
1c2f4ffecb
Applied a patch for Netware.
2005-02-08 19:49:40 +02:00
monty@mysql.com
79ec81071a
Better bugfix for "HAVING when refering to RAND()" (Bug #8216 )
...
Ensure that references in HAVING, ORDER BY or GROUP BY are calculated after fields in SELECT.
This will ensure that any reference to these has a valid value.
Generalized the code for split_sum_func()
2005-02-08 14:41:09 +02:00
jan@hundin.mysql.fi
fcfc1d8f29
Relaxed locking in INSERT...SELECT, single table UPDATE...SELECT and
...
single table DELETE...SELECT clauses when innobase_locks_unsafe_for_binlog
is used and isolation level of the transaction is not serializable.
InnoDB uses consistent read in these cases for a selected table.
Backported from 5.0.x.
2005-02-08 09:36:36 +02:00
monty@mysql.com
3fe60486e4
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-02-07 18:14:31 +02:00
monty@mysql.com
32f91f48e8
Fixed bug in HAVING when refering to RAND() through alias
...
(BUG 8216)
2005-02-07 18:13:57 +02:00
tomas@poseidon.ndb.mysql.com
6bbaeed5b9
ha_ndbcluster.cc:
...
corrected typo in previous changeset
2005-02-07 09:58:37 +01:00
tomas@poseidon.ndb.mysql.com
4873adace0
Corrected fragmentation calculation to take into account that LQH creates "2 fragments per fragment" in 4.1 and 5.0
...
+added some comments to ndb fragmentation calulation
2005-02-07 08:51:27 +01:00
guilhem@mysql.com
b97a519d72
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-05 15:29:38 +01:00
sergefp@mysql.com
511a166d55
Fix for BUG#7519: Index statistics is not displayed after ANALYZE for temporary tables:
...
Call file->extra() with HA_STATUS_CONST in mysqld_show_keys.
The fix will not be merged into 4.1/5.0 because they don't have this problem already.
2005-02-05 06:23:23 +03:00
sergefp@mysql.com
fb113b94e4
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug7816
2005-02-05 01:53:12 +03:00
guilhem@mysql.com
44c2dcff36
Fix for BUG#8055 "Trouble with replication from temporary tables and ignores":
...
when we close the session's temp tables at session end, we automatically write to binlog *one* DROP TEMPORARY TABLE *per tmp table*.
2005-02-04 22:43:54 +01:00
jimw@mysql.com
b509f2b373
Merge mysql.com:/home/jimw/my/mysql-4.1-6067
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-04 10:39:13 -08:00
mysqldev@mysql.com
79b88ead4a
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/mysqldev/tulin/mysql-4.1
2005-02-04 18:45:02 +01:00
serg@serg.mylan
47f354bca7
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-02-04 15:31:39 +01:00
serg@serg.mylan
cc1ee6475f
indexless boolean fulltext search was depending on default_charset_info - Bug#8159
...
ftbw->off wasn't cleared on reinit - Bug#8234
2005-02-04 15:24:06 +01:00
mysqldev@mysql.com
753ea29f86
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/mysqldev/tulin/mysql-4.1
2005-02-04 14:29:52 +01:00
tomas@poseidon.ndb.mysql.com
27a69e573a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-02-04 14:27:08 +01:00
tomas@poseidon.ndb.mysql.com
7fd685ffe8
added test to trigger drifferent fragmentations in ndb
...
corrected documentation on fragmentation
set "fragmentation medium" to mean 2 fragments per node instead of 1
set default fragmentation to small instead of medium
bug#8284 adjust fragmentation to max_rows
2005-02-04 14:25:08 +01:00
gluh@gluh.mysql.r18.ru
e9ce96c5cd
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-4.1
2005-02-04 15:47:12 +03:00
gluh@gluh.mysql.r18.ru
34915f7a91
A fix: bug#6931: Date Type column problem when using UNION-Table
...
bug#7833: Wrong datatype of aggregate column is returned
2005-02-04 15:31:36 +03:00
timour@mysql.com
e6150c7289
Merge mysql.com:/home/timka/mysql/src/4.1-dbg
...
into mysql.com:/home/timka/mysql/src/4.1-bug-8023
2005-02-04 11:58:59 +02:00
sergefp@mysql.com
38339e1c51
Fix for BUG#7716: in in_string::set() take into account that the value returned
...
by item->val_str() may be a substring of the passed string.
Disallow string=its_substring assignment in String::operator=().
2005-02-04 09:14:22 +03:00
jimw@mysql.com
c949055035
Fix error in parsing string literals containing a backslash followed
...
by a multi-byte character with a second byte of 0x5c (\). (Bug #8903 )
2005-02-03 16:07:32 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
1cb1dcb0f3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8057
2005-02-03 21:16:36 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
b8ceaa4a1f
Bug#8057
...
Fix crash with LAST_INSERT_ID() in UPDATE,
Tests included,
2005-02-03 21:11:12 +00:00