lars/lthalmann@dl145h.mysql.com
0ad6384f9e
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
2007-09-17 14:14:02 +02:00
lars/lthalmann@dl145k.mysql.com
3379f375a3
Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-09-17 13:31:35 +02:00
lars/lthalmann@dl145h.mysql.com
234e55623b
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-09-17 12:38:22 +02:00
aelkin@dl145j.mysql.com
0c153419ce
Merge: bug@27417,23333 and bug#28960 tests with 5.1
2007-09-17 12:31:10 +02:00
aelkin@dl145j.mysql.com
11c9a13a24
Merge: bug#27417,23333 manual work for fixing tests and a source code.
2007-09-16 18:16:40 +02:00
aelkin@dl145j.mysql.com
e9b287f27e
Manual merge fixes/tests for bugs_28960,27417,23333.
2007-09-16 12:07:00 +02:00
aelkin@dl145j.mysql.com
1a0fea60a3
Merge dl145j.mysql.com:/tmp/andrei/mysql-5.0-rpl
...
into dl145j.mysql.com:/tmp/andrei/5.1-merge
2007-09-15 21:25:56 +02:00
cbell/Chuck@mysql_cab_desk.
17f804f8d3
Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
...
into mysql_cab_desk.:C:/source/c++/mysql-5.1_BUG_30790
2007-09-14 11:32:14 -04:00
cbell/Chuck@mysql_cab_desk.
6f96967f0a
BUG#30790 : Suspicious code in rpl_utility.cc
...
This patch clarifies some of the coding choices with documentationa and
removes a limitation in the code for future expansion of the CHAR and
BINARY fields to length > 255.
2007-09-14 11:22:41 -04:00
lars/lthalmann@dl145j.mysql.com
1e265379a7
Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-09-10 14:17:12 +02:00
lars/lthalmann@dl145h.mysql.com
7d6f639d28
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-09-10 13:59:38 +02:00
lars/lthalmann@dl145h.mysql.com
4f29c65ae1
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-09-10 13:15:04 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
cc5fa8d649
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
2007-09-10 13:14:35 +02:00
skozlov/ksm@mysql.com/virtop.localdomain
4bfad3e923
replaced '--exec rm' to '--remove_file'
2007-09-07 12:04:57 +04:00
malff@omega.weblab
1a13d76941
Test cleanup in rpl_binlog_grant: XID values are unpredictable
2007-09-06 12:06:22 -06:00
davi@moksha.local
0187e78f40
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into moksha.local:/Users/davi/mysql/push/mysql-5.1-runtime
2007-09-06 13:28:00 -03:00
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
dlenev@mockturtle.local
175c1ab740
Make events.test more robust against timing issues.
2007-09-06 15:57:36 +04: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
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
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
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
rafal@quant.(none)
1835b16255
Disabling rpl_ndb_2other test.
2007-09-04 15:24:04 +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
anozdrin/alik@station.
c7de965215
Make mysql compilable on gcc-4.2.1.
...
c++config.h now has the following code:
// For example, <windows.h> is known to #define min and max as macros...
#undef min
#undef max
So, our defines in my_global.h are undefined when <new> header
is included.
Move definitions of min()/max() to the end of my_global.h.
2007-09-03 15:12:28 +04:00
thek@adventure.(none)
fea7bf2409
Merge adventure.(none):/home/thek/Development/cpp/bug21074/my51-bug21074
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-09-03 11:07:32 +02:00
thek@adventure.(none)
0184f50f27
Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-09-03 10:59:44 +02:00
thek@adventure.(none)
85d7007848
Merge adventure.(none):/home/thek/Development/cpp/bug21074/my50-bug21074
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-09-03 10:54:33 +02:00
thek@adventure.(none)
a860751b57
Merge adventure.(none):/home/thek/Development/cpp/bug21074/my50-bug21074
...
into adventure.(none):/home/thek/Development/cpp/bug21074/my51-bug21074
2007-09-03 10:52:14 +02:00
thek@adventure.(none)
f5ecb35e6c
Bug #21074 Large query_cache freezes mysql server sporadically under heavy load
...
Invaldating a subset of a sufficiently large query cache can take a long time.
During this time the server is efficiently frozen and no other operation can
be executed. This patch addresses this problem by setting a time limit on
how long time a dictionary access request can take before giving up on the
attempt. This patch does not work for query cache invalidations issued by
DROP, ALTER or RENAME TABLE operations.
2007-09-03 10:47:24 +02:00
msvensson@pilot.(none)
122f5f6cd0
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-09-01 11:43:44 +02:00
msvensson@pilot.(none)
66ae874371
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-09-01 11:42:43 +02:00
msvensson@pilot.(none)
0ccf3502ef
Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-09-01 11:41:59 +02:00
msvensson@pilot.(none)
c5ea7b0641
Use eval around "rmtree" and use our own version of rmtree if it fails
2007-09-01 11:41:38 +02:00
malff/marcsql@weblab.(none)
635f31822f
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-30712
2007-08-31 16:04:36 -06:00
malff/marcsql@weblab.(none)
143d8e460e
Fixed timing issues in events.test
2007-08-31 15:51:57 -06:00
anozdrin/alik@ibm.opbmk
136a5412e9
Eliminate compile warnings.
2007-09-01 00:12:00 +04:00
anozdrin/alik@ibm.opbmk
0261d2d9db
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into ibm.opbmk:/home/alik/Documents/MySQL/devel/5.1-rt-bug25843
2007-08-31 22:13:27 +04:00
tsmith@ramayana.hindu.god
b5c13a0f46
Correct fix for test result.
2007-08-31 10:53:51 -06:00