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
msvensson@shellback.(none)
70404e2a75
Fix spelling error
2006-04-07 12:46:50 +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
msvensson@shellback.(none)
e8723ca453
Update yassl to 1.2.2
2006-04-07 11:35:12 +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
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
jonas@perch.ndb.mysql.com
bd7a574035
post merge fixes
2006-04-06 11:51:24 +02:00
jonas@perch.ndb.mysql.com
40d83bdf6e
ndb - wl1760/bug#18216
...
add two new start options that will decrease likelyhood of bug#18612
push cntr-sp2 logic down into qmgr-sp1 to decrease likelyhood of bug#18612
2006-04-06 11:43:31 +02:00
msvensson@shellback.(none)
cd15f309fb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-04-06 10:34:41 +02:00
bar@mysql.com
13b5cdb126
Moving mysql_get_server_version() from libmysql.c to client.c,
...
as it is now required by mysql_set_character_set()
2006-04-06 13:03:22 +05:00
bar@mysql.com
14846536a4
client.c:
...
Bug#18830 incompatibility new libraries with old server
Additional 5.0 fix:
applying the same patch to client.c.
2006-04-06 12:43:13 +05:00
bar@mysql.com
6a847761f1
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-04-06 12:38:24 +05:00
bar@mysql.com
45a3bb57d6
libmysql.c:
...
Bug#18830: incompatibility new libraries with old server
Don't execute SET NAMES with pre-4.1 server.
2006-04-06 11:47:46 +05:00
bar@mysql.com
0459d69d7a
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-04-06 10:53:42 +05:00
bar@mysql.com
925ea02b4c
This problem has already been fixed by one of the previous changes.
...
Adding test case to cover queries which worked incorrectly earlier:
Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci
2006-04-06 10:51:23 +05:00
bar@mysql.com
a83d206811
ctype-extra.c:
...
Using local.
2006-04-06 10:23:42 +05:00
bar@mysql.com
743f96da9c
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-04-06 10:21:33 +05:00
bar@mysql.com
8f1bddb8ed
conf_to_src.c:
...
Backporting a 5.0 change:
MAX_BUF was too small for Index.xml
Changeing MAX_BUF and adding assert to easier
catch the same problem in the future.
ctype-extra.c:
Regenerating ctype-extra.c with the fixed conf_to_src.
2006-04-06 10:17:01 +05:00
igor@rurik.mysql.com
e732d0536f
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-04-05 14:06:34 -07:00
bar@mysql.com
52220d2d79
conf_to_src.c:
...
Buffer was too small to load Index.xml.
So some charsets were not gerenrated.
Making the buffer bigger, and adding an DBUG_ASSERT,
to easier catch the problem in the future.
ctype-extra.c:
Additional charsets were generated.
2006-04-05 19:43:38 +05:00
ingo@mysql.com
c864ac15a5
BUG#5390 - problems with merge tables
...
Additional fix for INSERT DELAYED with subselect.
Originally detected in 5.1, but 5.0 could also be affected.
The user thread creates a dummy table object,
which is not included in the lock. The 'real' table is
opened and locked by the 'delayed' system thread.
The dummy object is now marked as not locked and this is
tested in mysql_lock_have_duplicate().
2006-04-05 14:39:20 +02:00