davi@moksha.local
4aaab47ea9
The test case for bug 28587 doesn't work with the embedded version,
...
the first query is not running while we are doing wait queries on
a second connection.
2007-09-06 13:22:34 -03:00
gshchepa/uchum@gleb.loc
adbe17c8a1
sp.result:
...
Post-merge fix.
2007-09-06 20:42:36 +05:00
gshchepa/uchum@gleb.loc
4732821e9d
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-09-06 19:15:31 +05:00
dlenev@mockturtle.local
175c1ab740
Make events.test more robust against timing issues.
2007-09-06 15:57:36 +04:00
tomas@whalegate.ndb.mysql.com
0e18338ae0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-09-06 10:23:14 +02:00
jonas@perch.ndb.mysql.com
13298bd821
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
2007-09-06 07:40:54 +02:00
rburnett/Administrator@xp64.
da13b58127
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into xp64.:C:/work/mysql-5.0-build
2007-09-05 16:32:38 -05:00
rburnett/Administrator@xp64.
a29c72d89d
Adding batch files for building with nmake make files
2007-09-05 16:30:38 -05:00
malff@omega.weblab
d55b2bd13b
Merge omega.weblab:/home/malff/TREE/mysql-5.1-base
...
into omega.weblab:/home/malff/TREE/mysql-5.1-rt-merge
2007-09-05 14:52:40 -06:00
malff@omega.weblab
0a10782f75
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into omega.weblab:/home/malff/TREE/mysql-5.1-cleanup
2007-09-05 12:15:24 -06:00
malff@omega.weblab
43e5ab75ca
Test events_logs_tests cleanup
...
Fixed test failure under heavy load, in case truncate table is slow.
2007-09-05 12:14:43 -06:00
davi@moksha.local
2e3ded3ec9
The test case for Bug#29936 doesn't work with the embedded version,
...
the first query is not running while we are doing wait queries on
a second connection.
2007-09-05 15:03:02 -03:00
tomas@whalegate.ndb.mysql.com
b5e7c8dbd3
change printout to be a warning
2007-09-05 19:39:13 +02:00
tomas@whalegate.ndb.mysql.com
78fb6b274b
moving these tests to suite ndb_team
2007-09-05 19:13:36 +02:00
tomas@whalegate.ndb.mysql.com
e8c2807aac
tests actually work in statement based
2007-09-05 18:44:47 +02:00
tomas@whalegate.ndb.mysql.com
06b267cbb7
correct include file
2007-09-05 18:02:46 +02:00
lzhou/zhl@dev3-63.(none)
c0f5b574f4
Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
...
into dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug27543
2007-09-05 15:37:30 +00:00
tomas@whalegate.ndb.mysql.com
173a9473be
correct include file
2007-09-05 17:31:26 +02:00
lzhou/zhl@dev3-63.(none)
b2b22e93a2
Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
...
into dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug30024
2007-09-05 15:03:11 +00:00
lzhou/zhl@dev3-63.(none)
53c2c7fa3f
BUG#27543 Backup and restore can compatible with different endians for blob attribute
2007-09-05 13:01:30 +00:00
tomas@whalegate.ndb.mysql.com
1657c2d88a
getting rid of flush altogether, fix with post_epoch hendeling and/or changes in Rows_log_event
...
- problem is the database name accessed in Rows_log_event write... get_db() which is a pointer to the share string...
- point to table map instead?
- or copy it?
- or make sure that anything interacting with the share happens _after_ the epoch
Problem with flush is that STMT_END_F may not be included as it shoudld...
2007-09-05 11:43:42 +02:00
joerg@trift2.
04d12fc9d6
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-09-05 09:35:02 +02:00
joerg@trift2.
04b56132a7
libmysql/libmysql.c : Correct a wrong automerge: Don't duplicate "DBUG_ENTER()".
2007-09-05 09:30:50 +02:00
tomas@whalegate.ndb.mysql.com
39edaf9f8d
this flush with flag TRUE causes spurious errors in the binlog... as it will insert a STMT_END_F... and hence an invalid binlog (missing table mappings)
2007-09-05 09:22:58 +02:00
gshchepa/uchum@gleb.loc
582b69686c
Merge gleb.loc:/home/uchum/work/bk/5.1-opt-29938
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-09-05 11:43:40 +05:00
gshchepa/uchum@gleb.loc
adfbea368d
Fixed bug #29938 .
...
mysqldump --skip-events --all-databases dumped data of the mysqld.event table,
and during the restoration from this dump events were created in spite
of the --skip-events option.
The mysqldump client has been modified to ignore mysql.event table data
in case of --skip-events options.
2007-09-05 11:35:29 +05:00
brian@zim.(none)
e235ccd13a
Discovered a bug while working with backup. Since it is possible to execute a statement in a pre/post statment clause that can return a result, we need to test for that and free it.
2007-09-04 20:03:12 -07:00
malff/marcsql@weblab.(none)
5cd66ca65f
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
2007-09-04 16:50:09 -06:00
malff/marcsql@weblab.(none)
f4b671d8bc
Fixed whitespace
2007-09-04 16:40:27 -06:00
malff/marcsql@weblab.(none)
3a7bcd72f3
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
...
into weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
2007-09-04 14:38:26 -06:00
tomas@whalegate.ndb.mysql.com
29af14afa2
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-09-04 22:25:23 +02:00
malff/marcsql@weblab.(none)
0f58ed7e74
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
2007-09-04 12:25:54 -06:00
joerg@trift2.
3042b5bfec
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-09-04 19:56:08 +02:00
joerg@trift2.
a751c743c0
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-09-04 19:49:42 +02:00
joerg@trift2.
7fc80ef6eb
Merge trift2.:/MySQL/M41/push-4.1
...
into trift2.:/MySQL/M50/push-5.0
2007-09-04 19:43:44 +02:00
joerg@trift2.
1aa9d47832
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-09-04 19:41:33 +02:00
joerg@trift2.
150b9a5f20
Merge trift2.:/MySQL/M41/mysql-4.1
...
into trift2.:/MySQL/M41/push-4.1
2007-09-04 19:37:45 +02:00
thek@adventure.(none)
11c97a2646
Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-09-04 17:46:01 +02:00
thek@adventure.(none)
e480b31794
Merge adventure.(none):/home/thek/Development/cpp/bug21074/my51-bug21074
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-09-04 17:43:29 +02:00
df@pippilotta.erinye.com
48380a6366
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-09-04 11:39:34 +02:00
df@pippilotta.erinye.com
08337dd084
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-09-04 11:07:07 +02:00
df@pippilotta.erinye.com
c5a33802b5
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-09-04 11:06:02 +02:00
df@pippilotta.erinye.com
ab791bc13d
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
2007-09-04 10:54:32 +02:00
df@pippilotta.erinye.com
59b504a5e3
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.48
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-09-04 10:49:54 +02:00
mhansson@dl145s.mysql.com
313453f192
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into dl145s.mysql.com:/data0/mhansson/my51-bug30234-push
2007-09-03 16:24:33 +02:00
anozdrin/alik@station.
7dee4ac78c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into station.:/mnt/raid/alik/MySQL/5.1-rt-build
2007-09-03 17:24:59 +04:00
thek@adventure.(none)
b1d1204576
Merge adventure.(none):/home/thek/Development/cpp/bug21074/my50-bug21074
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-09-03 13:46:10 +02:00
thek@adventure.(none)
530d6fd983
Merge adventure.(none):/home/thek/Development/cpp/bug21074/my50-bug21074
...
into adventure.(none):/home/thek/Development/cpp/bug21074/my51-bug21074
2007-09-03 13:44:02 +02:00
thek@adventure.(none)
a8b9bd9f67
- Fix cross compatibility issues by exchanging pthread_yield with my_sleep(0)
2007-09-03 13:42:32 +02:00
anozdrin/alik@station.
c39d032da2
Rewrite test case for BUG 25843 to avoid SHOW BINLOG EVENTS
...
statement.
2007-09-03 15:13:34 +04:00