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
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
anozdrin/alik@ibm.opbmk
d6f94b062c
Fix for BUG#25843: changing default database between PREPARE and EXECUTE
...
of statement breaks binlog.
There were two problems discovered by this bug:
1. Default (current) database is not fixed at the creation time.
That leads to wrong output of DATABASE() function.
2. Database attributes (@@collation_database) are not fixed at
the creation time. That leads to wrong resultset.
Binlog breakage and Query Cache wrong output happened because of
the first problem.
The fix is to remember the current database at the PREPARE-time and
set it each time at EXECUTE.
2007-08-31 20:42:14 +04:00
malff/marcsql@weblab.(none)
a2ae41129f
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-cleanup
2007-08-31 08:51:31 -06:00
malff/marcsql@weblab.(none)
e5ac5a0881
Test cleanup for events.test
2007-08-31 08:49:49 -06:00
tsmith@ramayana.hindu.god
d70e4b0c92
Correct test result file for bug #27014
2007-08-31 05:21:12 -06:00
tsmith@ramayana.hindu.god
47dc161f5b
Fix test results for bug #27014
2007-08-31 01:28:42 -06:00
kostja@bodhi.(none)
467de3981b
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-12713-new
2007-08-31 10:58:02 +04:00
kostja@bodhi.(none)
8d1af60da0
Never access thd->ha_data directly, use getters/setters from the plugin
...
API instead.
This is a pre-requisite of the fix for Bug 12713, which changes the
data type of thd->ha_data from void * to struct Ha_data.
2007-08-31 10:19:52 +04:00
tsmith@ramayana.hindu.god
f5fdb53a35
Bug #27014 : Imperfect error/warning message for STR_TO_DATE for invalid datetime value
...
Fix name of function in warning message.
2007-08-30 23:57:39 -06:00
malff/marcsql@weblab.(none)
ca2b2585a5
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
...
into weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
2007-08-30 17:23:40 -06:00
malff/marcsql@weblab.(none)
4cab11097e
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
2007-08-30 17:05:49 -06:00
tsmith@ramayana.hindu.god
cefe7a3c8b
Merge ramayana.hindu.god:/home/tsmith/m/bk/51-target22
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-30 14:56:24 -06:00
tsmith@ramayana.hindu.god
ebe3894004
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-30 14:54:19 -06:00
tsmith@ramayana.hindu.god
58ecaaa859
Disable rpl_ndb_2other, which has never worked on bigendian machines.
2007-08-30 14:13:05 -06:00
malff/marcsql@weblab.(none)
2482c59740
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
2007-08-30 13:23:59 -06:00
davi@moksha.local
37d48bfe30
Post-merge test case with wait_condition for Bug#28587
2007-08-30 16:19:23 -03:00
davi@moksha.local
11830073bc
Merge moksha.local:/Users/davi/mysql/push/bugs/28587-5.0
...
into moksha.local:/Users/davi/mysql/push/bugs/28587-5.1
2007-08-30 16:13:07 -03:00