joerg@mysql.com
f8d524cdbc
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mtr-4.1
2006-04-07 21:07:53 +02:00
konstantin@mysql.com
15b591561f
A fix and a test case for Bug#16248 "WHERE (col1,col2) IN ((?,?))
...
gives wrong results". Implement previously missing
Item_row::cleanup. The bug is not repeatable in 5.0, probably
due to a coincidence: the problem is present in 5.0 as well.
2006-04-07 22:26:25 +04:00
joerg@mysql.com
a0c3f51c10
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mtr-5.0
2006-04-07 20:26:12 +02:00
aelkin@mysql.com
bfbd922eb8
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0.21-bug17284-temp_table
2006-04-07 21:21:23 +03:00
joerg@mysql.com
4a5985e694
Manual merge.
2006-04-07 19:50:07 +02:00
aelkin@mysql.com
d881fb36b9
Bug#17284 erroneous temp table cleanup on slave.
...
Idea of the fix is for master to send FD event with `created' as 0
to reconnecting slave (upon slave_net_timeout, no master crash) to avoid destroying temp tables.
In a case of a connect by slave to the master after its crash temp tables have been already
cleaned up so that slave can not keep `orphan' temp tables.
2006-04-07 20:44:37 +03:00
joerg@mysql.com
657d1bd182
Manual merge.
2006-04-07 19:42:46 +02:00
joerg@mysql.com
a7edbc647e
mysql-test/mysql-test-run.sh : Provide info about the options used.
2006-04-07 19:27:19 +02:00
igor@rurik.mysql.com
f053b7c9d0
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2006-04-07 10:19:09 -07:00
jonas@perch.ndb.mysql.com
739b0d676b
ndb - bug#11034
...
fix mem leak (not during running of transactions, but a few bytes when shutting down)
2006-04-07 17:10:56 +02:00
pem@mysql.com
739ee02cf6
Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
...
into mysql.com:/extern/mysql/5.0/generic/mysql-5.0-runtime
2006-04-07 16:55:49 +02:00
pem@mysql.com
bf548fb916
Renaming sp_pcontext members and methods; less cryptic and more consistent.
...
Also added comments, and fixing some coding style (mostly in comments too).
There are no functional changes, so no tests or documentation needed.
(This was originally part of a bugfix, but it was decided to not include this
in that patch; instead it's done separately.)
2006-04-07 16:53:15 +02:00
jonas@perch.ndb.mysql.com
7cd90d0081
ndb - bug#11033
...
silent valgrind warnings 5.0, ndb_autodiscover
2006-04-07 15:48:13 +02:00
joerg@mysql.com
763448830c
Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/mysql-5.0
2006-04-07 15:43:39 +02:00
msvensson@neptunus.(none)
0d98d97170
Remove #if 0
2006-04-07 14:21:00 +02:00
joerg@mysql.com
945599f3cf
Manual merge.
2006-04-07 13:44:43 +02:00
joerg@mysql.com
65f4595e9a
mysql-test/mysql-test-run.pl : Add option "with-ndbcluster-only" (ignored).
2006-04-07 13:34:39 +02:00
kroki@mysql.com
6222ca41a5
Bug#15933: max_used_connections is wrong after FLUSH STATUS if connections are cached
...
After FLUSH STATUS max_used_connections was reset to 0, and haven't
been updated while cached threads were reused, until the moment a new
thread was created.
The first suggested fix from original bug report was implemented:
a) On flushing the status, set max_used_connections to
threads_connected, not to 0.
b) Check if it is necessary to increment max_used_connections when
taking a thread from the cache as well as when creating new threads
2006-04-07 15:30:40 +04:00
joerg@mysql.com
df09a0cedc
Manual merge.
2006-04-07 13:16:40 +02:00
joerg@mysql.com
7e4d41de58
Perl test script: Avoid some aborts, which made the whole build/test process terminate.
2006-04-07 13:02:15 +02:00
joerg@mysql.com
a0541800aa
mysql-test/mysql-test-run.sh : Add option "--with-ndbcluster-only" (backport from 5.1)
2006-04-07 12:22:55 +02:00
jonas@perch.ndb.mysql.com
2d284fe0ed
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-jonas
...
into perch.ndb.mysql.com:/home/jonas/src/50-jonas
2006-04-07 12:01:08 +02:00
tomas@poseidon.ndb.mysql.com
d202d89c0a
multi node shutdown adabtions for restart of management servers
2006-04-07 12:01:07 +02:00
msvensson@neptunus.(none)
c2f1259834
Merge neptunus.(none):/home/msvensson/mysql/bug13228/my50-bug13228_minimal
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-04-07 11:46:22 +02:00
stewart@mysql.com
3b2cc9b844
BUG#18881 valgrind: kernel memory leak in vm/Emulator.cpp
2006-04-07 19:28:18 +10:00
hartmut@mysql.com
7ed2c6207a
fix for wrong QUARTER calculation in EXTRACT() (Bug #18100 )
2006-04-07 11:15:15 +02:00
msvensson@neptunus.(none)
a7f1936552
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-04-07 11:04:46 +02:00
jonas@perch.ndb.mysql.com
b6b06b8305
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2006-04-07 10:52:35 +02:00
jonas@perch.ndb.mysql.com
dc4d374810
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/41-work
2006-04-07 10:51:21 +02:00
tomas@poseidon.ndb.mysql.com
7fd9d66cdc
Support for ndb multi-node shutdown
2006-04-07 10:39:47 +02:00
jonas@perch.ndb.mysql.com
34aa77dd6f
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-jonas
2006-04-07 10:26:53 +02:00
gluh@eagle.intranet.mysql.r18.ru
4ef7e5b5f7
Fix for bug#18281 group_concat changes charset to binary
...
skip charset aggregation for order columns
2006-04-07 13:19:31 +05:00
jonas@perch.ndb.mysql.com
0f59399580
ndb -
...
remove debug prinouts in Qmgr
2006-04-07 10:10:09 +02:00
gluh@eagle.intranet.mysql.r18.ru
fe7ea20764
Bug#18469 make test fails on information_schema
...
move test case for bug 14290 to ctype_ucs test
2006-04-07 12:32:24 +05:00
igor@rurik.mysql.com
9bd0b97824
Fixed bug #15917 : unexpected complain for a NIST test case.
...
The problem was due to the fact that with --lower-case-table-names set to 1
the function find_field_in_group did not convert the prefix 'HU' in
HU.PROJ.CITY into lower case when looking for it in the group list. Yet the
names in the group list were extended by the database name in lower case.
2006-04-06 15:29:15 -07:00
igreenhoe@mysql.com
fe9b9c61d2
Merge mysql.com:/home/greenman/workspace-mysql/mysql/mysql-5.0
...
into mysql.com:/home/greenman/workspace-mysql/mysql/bug-5.0-16240
2006-04-06 10:42:34 -07:00
sergefp@mysql.com
f962fa5b91
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug18237-review
2006-04-06 21:42:33 +04:00
sergefp@mysql.com
be0ebd9e0a
Remove redundant code in opt_sum_query()
2006-04-06 21:42:03 +04:00
igreenhoe@mysql.com
84bfed689d
Fix for Bug #16240
2006-04-06 10:13:46 -07:00
joerg@mysql.com
73a0ae9d9b
Backport of 5.1 test options "--with-ndbcluster" and "--with-ndbcluster-only" as dummies (ignored).
2006-04-06 18:42:07 +02:00
stewart@mysql.com
c0c8bafbce
BUG#15530: Cluster start up "show" shows all data nodes as master during start
...
along with the fix for 18843, this should fix the bug.
2006-04-07 00:58:08 +10:00
jonas@perch.ndb.mysql.com
cb8084d446
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-jonas
2006-04-06 16:31:34 +02:00
jonas@perch.ndb.mysql.com
5904a94655
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2006-04-06 16:19:22 +02:00
jonas@perch.ndb.mysql.com
f41db42287
ndb - bug#18612 - post review fixes
...
1) make sure that check_multi_node_shutdown does not proceed (in stop case)
2) Fix printout
2006-04-06 16:18:42 +02:00
stewart@mysql.com
add2732f78
BUG#18833 valgrind: Mismatched free()/delete/delete[] in SimBlockList
2006-04-06 21:59:20 +10:00
stewart@mysql.com
f68c45d343
BUG#18843 valgrind: cond jump on uninit in Qmgr::execAPI_REGREQ
2006-04-06 21:59:13 +10:00
svoj@april.(none)
85ff7bec70
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into april.(none):/home/svoj/devel/mysql/BUG14945/mysql-5.0
2006-04-06 15:25:39 +05:00
svoj@april.(none)
209682e051
Fix for bug#14945 "Truncate table doesn't reset the auto_increment
...
counter".
When TRUNCATE TABLE was called within an stored procedure the
auto_increment counter was not reset to 0 even if straight
TRUNCATE for this table did this.
This fix makes TRUNCATE in stored procedures to be handled exactly
in the same way as straight TRUNCATE. We achieve this by rolling
back the fix for bug 8850, which is no longer needed since stored
procedures don't require prelocked mode anymore (and TRUNCATE is
not allowed in stored functions or triggers).
2006-04-06 15:19:01 +05:00
jonas@perch.ndb.mysql.com
3e2daff86c
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/50-jonas
2006-04-06 12:01:50 +02:00
jonas@perch.ndb.mysql.com
a68db45128
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-jonas
2006-04-06 11:55:36 +02:00