Commit graph

48326 commits

Author SHA1 Message Date
kostja@bodhi.(none)
88fc7cab26 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-16 23:31:36 +04:00
kostja@bodhi.(none)
06d656b808 Fix ndb_cache* test failures in the -runtime tree.
Do not try to acquire structure_guard_mutex for the second time
when invalidating a table from send_result_to_client.
2007-07-16 22:34:36 +04:00
kostja@bodhi.(none)
be4f73c44f Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-16 17:22:33 +04:00
kostja@bodhi.(none)
eec9f7c59d A follow up after the fix for Bug#21074 - fix NDB tests breaking on
asserts.
The patch for Bug#21074 replaces acquisition of the global LOCK_open lock
with exclusive locks on table names in such operations ad DROP TABLE
and RENAME TABLE.
Unfortunately, NDB internally assumes that LOCK_open is acquired and
tries to release it.
This dependency should be fixed by a separate (and significant in size)
patch. For now we just satisfy it - after all, the original
goal of the patch for Bug#21074 was to move query_cache_invalidate
outside of the scope of LOCK_open, and we still can do that.

This fixes some failing NDB tests in the runtime tree.
2007-07-16 15:57:20 +04:00
df@pippilotta.erinye.com
28a620213f Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
2007-07-16 12:42:14 +02:00
dfischer/mysqldev@mysql.com/production.mysql.com
c04ae188f5 Raise version number after cloning 5.0.46 2007-07-16 12:42:12 +02:00
kostja@bodhi.(none)
5466b0df14 Add a teste case for Bug#27296 "Assertion in ALTER TABLE SET DEFAULT in
Linux Debug build (possible deadlock)"

The bug is not repeatable any more.
2007-07-15 13:34:35 +04:00
kostja@bodhi.(none)
9175e85078 A fix for Bug#27406 Events: failure only causes a warning. Update test
results.
When executing a CREATE EVENT statement with ON COMPLETION NOT PRESERVE 
clause (explicit or implicit) and completion date in the past, we do not 
create the event. Or, put it differently, we create it and then drop 
immediately.
A warning is issued in this case, not an error -- we want to load 
successfully old database dumps, and such dumps may contain events
that are no longer valid.

Update the warning text to not imply an erroneous condition.
2007-07-15 13:25:38 +04:00
kostja@bodhi.(none)
9e7f70023c Fix a compiler warning. 2007-07-14 05:22:24 +04:00
kostja@bodhi.(none)
74e4fccbbc Fix a warning in a non-debug build. 2007-07-14 04:38:21 +04:00
kostja@bodhi.(none)
f5267530d9 A follow up after the patch for Bug#21074 - even though
we now have exclusive name lock on the table name in mysql_rm_table_part2,
we still should keep LOCK_open - some storage engines are not
ready for locking scope change and assume that LOCK_open is kept.
Still, the binary logging and query cache invalidation calls
moved out of LOCK_open scope.
Fixes some of the broken 5.1-runtime tests (tests break on asserts).
2007-07-14 02:04:48 +04:00
kostja@bodhi.(none)
6c152b29f2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-07-12 23:22:17 +04:00
kostja@bodhi.(none)
366b761f91 Apply community contributed fix for Bug#13326 SQLPS statement logging is
incomplete in 5.0 (and review fixes).

When in 5.0.13 I introduced class Prepared_statement and methods
::prepare and ::execute, general logging was left out of this class.
This was good for stored procedures, since in stored procedures
we do not log sub-statements, but introduced a regression in case of SQL
syntax for prepared statements, as previously we would log the actual
statements to the log, and after the change we would log only
COM_QUERY text.

Restore the old behavior, but still suppress logging if inside a stored 
procedure.

Based on a community contributed patch from Vladimir Shebordaev.

No test case since we do not have a mechanism to test output
of the general log.
2007-07-12 23:14:00 +04:00
kostja@bodhi.(none)
675a4e8f7b Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  bodhi.(none):/opt/local/work/mysql-5.0-26141-final
2007-07-12 22:28:13 +04:00
kostja@bodhi.(none)
5ab4b6f1ac A fix and a test case for Bug#26141 mixing table types in trigger
causes full table lock on innodb table.
Also fixes Bug#28502 Triggers that update another innodb table 
will block on X lock unnecessarily (duplciate).
Code review fixes.

Both bugs' synopses are misleading: InnoDB table is
not X locked. The statements, however, cannot proceed concurrently, 
but this happens due to lock conflicts for tables used in triggers,
not for the InnoDB table. 

If a user had an InnoDB table, and two triggers, AFTER UPDATE and 
AFTER INSERT, competing for different resources (e.g. two distinct
MyISAM tables), then these two triggers would not be able to execute
concurrently. Moreover, INSERTS/UPDATES of the InnoDB table would
not be able to run concurrently. 
The problem had other side-effects (see respective bug reports).

This behavior was a consequence of a shortcoming of the pre-locking
algorithm, which would not distinguish between different DML operations
(e.g. INSERT and DELETE) and pre-lock all the tables
that are used by any trigger defined on the subject table.

The idea of the fix is to extend the pre-locking algorithm to keep track,
for each table, what DML operation it is used for and not
load triggers that are known to never be fired.
2007-07-12 22:26:41 +04:00
thek@adventure.(none)
825b5096ad Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-07-12 15:38:23 +02:00
thek@adventure.(none)
2a5e7fe592 Merge adventure.(none):/home/thek/Development/cpp/bug28249/my50-bug28249
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-07-12 15:30:34 +02:00
thek@adventure.(none)
8ee7e48de8 Bug#28249 Query Cache returns wrong result with concurrent insert / certain lock
A race condition in the integration between MyISAM and the query cache code 
caused the query cache to fail to invalidate itself on concurrently inserted
data.

This patch fix this problem by using the existing handler interface which, upon
each statement cache attempt, compare the size of the table as viewed from the 
cache writing thread and with any snap shot of the global table state. If the
two sizes are different the global table size is unknown and the current
statement can't be cached.
2007-07-12 13:29:51 +02:00
anozdrin/alik@ibm.
3f2e94c401 Fix for 5.1 for BUG#10491: Server returns data as charset binary
SHOW CREATE TABLE or SELECT FROM I_S.

This is the last patch for this bug, which depends on the big
CS patch and was pending.

The problem was that SHOW CREATE statements returned original
queries in the binary character set. That could cause the query
to be unreadable.

The fix is to use original character_set_client when sending
the original query to the client. In order to preserve the query
in mysqldump, 'binary' character set results should be set when
issuing SHOW CREATE statement. If either source or destination
character set is 'binary' , no conversion is performed.
The idea is that since the source character set is no longer
'binary', we fix the destination character set to still produce
valid dumps.
2007-07-12 12:49:39 +04:00
kostja@bodhi.(none)
3364066e29 A fix and a test case for Bug#25859 ALTER DATABASE works w/o parameters.
Fix the parser to make the database options not optional.
2007-07-12 01:10:29 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
372856cd72 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/home/ram/work/mysql-5.1-maint
2007-07-10 14:22:37 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
5fb5f2a9a5 Fix for bug #29652: csv.test failure: two changes conflict after merge
Problem: we don't take into account the length of the data written
to the temporary data file during update on a CSV table.

Fix: properly calculate the data file length during update.
2007-07-10 13:09:07 +05:00
tomas@whalegate.ndb.mysql.com
810db44e4f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
2007-07-10 09:03:21 +02:00
tomas@whalegate.ndb.mysql.com
503f86f3ba Bug #29570
- correct result files
2007-07-10 09:00:15 +02:00
tsmith@sita.local
63dd4251e4 Bug #29634: mysqld_safe does not set err_log variable, error log file is not created
Dont touch & chmod the err_log file if using syslog (mysqld_safe)
2007-07-09 16:10:43 -06:00
tsmith@sita.local
0ed9e3eb4c Merge sita.local:/Users/tsmith/m/bk/maint/50
into  sita.local:/Users/tsmith/m/bk/maint/51
2007-07-09 15:45:13 -06:00
tsmith@sita.local
06c8087070 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sita.local:/Users/tsmith/m/bk/maint/50
2007-07-09 15:38:36 -06:00
tsmith@sita.local
e345a242f4 mysqld_safe.sh:
Fix a few typos in comments (from Paul DuBois)
2007-07-09 15:30:19 -06:00
tsmith@sita.local
832eb83777 Merge sita.local:/Users/tsmith/m/bk/maint/50
into  sita.local:/Users/tsmith/m/bk/maint/51
2007-07-09 13:28:37 -06:00
tsmith@sita.local
4b1da38b13 rpl_misc_functions.result, rpl_misc_functions.test:
Backport from 5.1 a fix to make this test deterministic
2007-07-09 13:18:27 -06:00
tsmith@sita.local
92cad567ba Merge sita.local:/Users/tsmith/m/bk/maint/50
into  sita.local:/Users/tsmith/m/bk/maint/51
2007-07-09 10:41:58 -06:00
tsmith@sita.local
59c570ba78 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  sita.local:/Users/tsmith/m/bk/maint/51
2007-07-09 10:33:33 -06:00
tsmith@sita.local
1e0d809992 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sita.local:/Users/tsmith/m/bk/maint/50
2007-07-09 10:32:04 -06:00
tomas@whalegate.ndb.mysql.com
278a5dfa83 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
2007-07-09 12:17:47 +02:00
tomas@whalegate.ndb.mysql.com
14a20dad62 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
2007-07-09 12:17:03 +02:00
tomas@whalegate.ndb.mysql.com
658d12aea8 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-07-09 12:15:52 +02:00
tomas@whalegate.ndb.mysql.com
b66fac4fc1 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
2007-07-09 12:07:33 +02:00
tomas@whalegate.ndb.mysql.com
81eb732880 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint
2007-07-09 12:05:07 +02:00
tsmith@sita.local
5cba44239a disabled.def:
post-merge fix: re-enable rpl_udf test
2007-07-09 03:31:27 -06:00
tsmith@sita.local
5f12f35c34 Merge sita.local:/Users/tsmith/m/bk/51
into  sita.local:/Users/tsmith/m/bk/maint/51

This merge requires a post-merge fix to remove rpl_udf from
suite/rpl/t/disabled.def.
2007-07-09 03:27:03 -06:00
tsmith@sita.local
00c6793075 Merge sita.local:/Users/tsmith/m/bk/maint/41
into  sita.local:/Users/tsmith/m/bk/maint/50
2007-07-09 01:47:33 -06:00
tomas@whalegate.ndb.mysql.com
7dd1f323a8 Bug #29570
- correct result files
2007-07-09 09:35:27 +02:00
tsmith@sita.local
7b2b10e462 Merge sita.local:/Users/tsmith/m/bk/50
into  sita.local:/Users/tsmith/m/bk/maint/50
2007-07-09 01:22:54 -06:00
tsmith@sita.local
1106dddfa2 Merge sita.local:/Users/tsmith/m/bk/41
into  sita.local:/Users/tsmith/m/bk/maint/41
2007-07-09 01:21:22 -06:00
tsmith@sita.local
75810fbc22 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sita.local:/Users/tsmith/m/bk/maint/50
2007-07-09 01:14:33 -06:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
b37c24c439 after-merge fix. 2007-07-09 10:39:49 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
ede22768a9 Merge mysql.com:/home/ram/work/b28808/b28808.5.0
into  mysql.com:/home/ram/work/b28808/b28808.5.1
2007-07-09 10:20:45 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
a10759d070 Merge mysql.com:/home/ram/work/mysql-5.0-maint
into  mysql.com:/home/ram/work/b28808/b28808.5.0
2007-07-09 10:17:04 +05:00
tsmith@sita.local
c2092ee91b Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sita.local:/Users/tsmith/m/bk/maint/50
2007-07-08 19:39:54 -06:00
gshchepa/uchum@gleb.loc
eac626bde6 Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into  gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-08 11:51:09 +05:00