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
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
mhansson@dl145s.mysql.com
b1cc84ec1d
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/mhansson/my50-bug30234-push
2007-09-03 12:44:17 +02:00
mhansson/martin@linux-st28.site
7ed22abe1a
Merge linux-st28.site:/home/martin/mysql/src/bug30234-push/my50-bug30234-push
...
into linux-st28.site:/home/martin/mysql/src/bug30234-push/my51-bug30234-push
2007-09-03 12:02:45 +02:00
mhansson/martin@linux-st28.site
df5c9e69f0
Bug #30234 : Unexpected behavior using DELETE with AS and USING
...
DELETE FROM ... USING ... statements with the following type of
ambiguous aliasing gave unexpected results:
DELETE FROM t1 AS alias USING t1, t2 AS alias WHERE t1.a = alias.a;
This query would leave table t1 intact but delete rows from t2.
Fixed by changing DELETE FROM ... USING syntax so that only alias
references (as opposed to alias declarations) may be used in FROM.
2007-09-03 11:55:35 +02:00
jonas@perch.ndb.mysql.com
9529e06c9a
ndb - merge error code
...
forgot to update next TC no
2007-09-03 11:32:48 +02:00
jonas@perch.ndb.mysql.com
d1c8dc8320
ndb - merge error code(s)
2007-09-03 11:29:58 +02:00
joerg@trift2.
83bb61d8a3
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-09-03 11:13:44 +02:00
joerg@trift2.
53303665a3
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-09-03 11:09:54 +02: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
kaa@polly.(none)
0c19993807
Use SIZE_T_MAX instead of ulong as a limit for key_buffer_size to allow key_bufer_size > 4G on Windows in 5.1. This is for bug #5731 .
2007-09-03 12:57:47 +04: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
gluh@mysql.com/eagle.(none)
33eaf2cd95
Bug#29408 Cannot find view in columns table if the selection contains a function
...
Use view db name as thread default database, in order to ensure
that the view is parsed and prepared correctly.
2007-09-03 12:22:56 +05:00
jonas@perch.ndb.mysql.com
eab642a4f4
ndb - bug#30764
...
When adding a read to lock queue, where there is a X-lock ahead, upgrade to X-lock
(found by pekkas blob changes)
2007-09-03 08:15:59 +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
jonas@perch.ndb.mysql.com
9b913a1973
ndb - autotest
...
remove more "extra mysql-"
2007-08-31 16:55:59 +02: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