tsmith@ramayana.hindu.god
f4309e1777
ddl_i18n_utf8.test, ddl_i18n_koi8r.test:
...
Don't run test with embedded server; requires external client connections
2007-07-18 15:31:24 -06:00
tsmith@ramayana.hindu.god
23695e4e1e
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-07-17 11:33:26 -06:00
kostja@bodhi.(none)
0d027edd6a
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-17 13:32:19 +04:00
kostja@bodhi.(none)
19a19f81e8
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-17 13:13:49 +04:00
kostja@bodhi.(none)
6b3784870c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-17 13:10:02 +04:00
kostja@bodhi.(none)
948ba7b7fb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-07-17 13:08:23 +04:00
svoj@june.mysql.com
cb995365fb
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into mysql.com:/home/svoj/devel/mysql/test/mysql-5.1-engines
2007-07-17 13:20:32 +05:00
istruewing@chilla.local
db2884a530
Disabled a test case that reports an error on OSX.
2007-07-17 09:52:55 +02:00
tnurnberg@sin.intern.azundris.com
c01fe97165
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into sin.intern.azundris.com:/home/tnurnberg/27198/51-27198
2007-07-17 09:39:44 +02:00
istruewing@chilla.local
ba177535f5
Post-merge fixes
...
Disabled test cases that produce errors in a "server log".
2007-07-17 09:25:01 +02:00
tnurnberg@sin.intern.azundris.com
bc3b442998
Merge sin.intern.azundris.com:/home/tnurnberg/27198/50-27198
...
into sin.intern.azundris.com:/home/tnurnberg/27198/51-27198
2007-07-17 08:23:43 +02:00
tnurnberg@sin.intern.azundris.com
261acdbbea
Merge sin.intern.azundris.com:/home/tnurnberg/27198/41-27198
...
into sin.intern.azundris.com:/home/tnurnberg/27198/50-27198
2007-07-17 06:59:24 +02:00
dkatz@damien-katzs-computer.local
e5d23da4af
Merge damien-katzs-computer.local:/Users/dkatz/mysql51
...
into damien-katzs-computer.local:/Users/dkatz/51
2007-07-16 23:15:34 -04:00
kostja@bodhi.(none)
97bdd8030b
Fix a build break on 64 bit (uint and size_t are distinct types).
2007-07-17 01:30:57 +04:00
istruewing@chilla.local
dd7e9b9a42
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-07-16 23:21:08 +02:00
istruewing@chilla.local
acd2c62fd1
Merge chilla.local:/home/mydev/mysql-5.1-amain
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-07-16 23:19:45 +02:00
kostja@bodhi.(none)
0e92e434d1
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-17 01:06:47 +04:00
kostja@bodhi.(none)
b8fc731804
Post-merge fixes (merge from the main).
2007-07-17 00:59:21 +04:00
tnurnberg@sin.intern.azundris.com
7dbf738f4a
Merge sin.intern.azundris.com:/home/tnurnberg/27198/40-27198
...
into sin.intern.azundris.com:/home/tnurnberg/27198/41-27198
2007-07-16 22:38:50 +02:00
kostja@bodhi.(none)
7989c712a6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-07-16 23:41:28 +04:00
kostja@bodhi.(none)
c8a651bb41
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-16 23:38:55 +04:00
kostja@bodhi.(none)
1ecb226efa
Bug#29050 Creation of a legal stored procedure fails if a database is not
...
selected prior: ensure the fix also works for information_schema
tables.
2007-07-16 23:37:02 +04:00
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
dkatz@damien-katzs-computer.local
639fd4c555
Bug #29692 Single row inserts can incorrectly report a huge number of row insertions
...
This bug was caused by unitialized value that was the result of a bad 5.0 merge.
2007-07-16 14:53:05 -04:00
istruewing@chilla.local
62620ecb4e
Merge chilla.local:/home/mydev/mysql-5.0-amain
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-07-16 20:39:05 +02: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
istruewing@chilla.local
7f6bf17bab
Post-merge fix
...
Disabled a test that reports Slave SQL error in warnings file.
2007-07-16 16:12:05 +02: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
svoj@mysql.com/june.mysql.com
ee13e03ca0
BUG#29807 - innodb_mysql.test: Cannot find table test/t2 from the
...
internal data dictionary
- re-enabled innodb_mysql test;
- added a rule to through away expected warning to mtr_report.pl;
- fixed a test case to produce unique warning.
2007-07-16 15:09:46 +05:00
istruewing@chilla.local
e819c326ed
Post-merge fixes
...
Disabled tests which break automatic merging due to
non-empty warnings file.
2007-07-15 18:47:57 +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
istruewing@chilla.local
0dc77cbb17
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-07-14 19:37:06 +02:00
istruewing@chilla.local
e307a089a9
Merge chilla.local:/home/mydev/mysql-5.1-amain
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-07-14 19:35:43 +02:00
istruewing@chilla.local
aceded7c0e
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-07-14 17:51:52 +02:00
istruewing@chilla.local
23dbf09798
Merge chilla.local:/home/mydev/mysql-5.0-amain
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-07-14 17:51:00 +02:00
istruewing@chilla.local
4874e18dab
Merge chilla.local:/home/mydev/mysql-4.1-amain
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-07-14 16:19:17 +02:00
svoj@april.(none)
eb5398fdd9
Merge mysql.com:/home/svoj/devel/mysql/BUG29734/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG29734/mysql-5.1-engines
2007-07-14 18:09:48 +05:00
svoj@mysql.com/april.(none)
c5608c9db2
BUG#29734 - thread_id=0 in binary log which leads to temporary table conflicts
...
pseudo_thread_id was reset to zero via mysql_change_user() handling
whereas there is no reason to do that. Moreover, having two
concurrent threads that change user and create a namesake temp tables
leads to recording the dup pair of queries:
set @@session.pseudo_thread_id = 0;
CREATE temporary table `the namesake`;
which will stall the slave as the second instance can not be created.
And that is the bug case.
Fixed by correcting pseudo_thread_id value after mysql_change_user().
2007-07-14 17:58:39 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
9febf0d3bf
Merge mysql.com:/home/ram/work/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b29253/b29253.5.1
2007-07-14 10:23:48 +05: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
tomas@whalegate.ndb.mysql.com
07656398a8
correct cluster support check
2007-07-13 22:45:05 +02:00
tomas@whalegate.ndb.mysql.com
b0aabc7940
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-13 22:22:02 +02:00
tomas@whalegate.ndb.mysql.com
d00282ae36
avoid multiple defines of server1/2
2007-07-13 22:21:19 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
11a0cf3a6f
Fix for bug #29253 : csv table reportedly marked as crashed
...
Problem: the data file changes made during delete/update are not visible to
other threads as the file is reopened, so reading data
with old descriptors might miss the changes.
Fix: reopen the data file before reading if it was reopened during
delete/update to ensure there's no data behind.
Note: there's no simple test case.
2007-07-14 00:13:37 +05:00