jonas@perch.ndb.mysql.com
e0f3118ab9
ndb - bug#17607
...
5.0->5.1 merge
2006-04-10 14:02:13 +02:00
jonas@perch.ndb.mysql.com
965d6ac6bf
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2006-04-08 16:33:59 +02: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
jonas@perch.ndb.mysql.com
7cd90d0081
ndb - bug#11033
...
silent valgrind warnings 5.0, ndb_autodiscover
2006-04-07 15:48:13 +02:00
jonas@perch.ndb.mysql.com
878ce564f4
Merge perch.ndb.mysql.com:/home/jonas/src/50-jonas
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2006-04-07 12:01:09 +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
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
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
jonas@perch.ndb.mysql.com
0f59399580
ndb -
...
remove debug prinouts in Qmgr
2006-04-07 10:10:09 +02: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
327adcf461
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2006-04-06 16:25:19 +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
jonas@perch.ndb.mysql.com
f609313d4c
Merge perch.ndb.mysql.com:/home/jonas/src/51-jonas
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2006-04-06 14:35:07 +02:00
jonas@perch.ndb.mysql.com
1617e5cb25
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-jonas
2006-04-06 13:18:13 +02: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)
e1348410d7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-04-06 11:38:50 +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
stewart@mysql.com
ef4c0d8042
Merge mysql.com:/home/stewart/Documents/MySQL/5.1/new
...
into mysql.com:/home/stewart/Documents/MySQL/5.1/new-bug18831
2006-04-06 17:24:02 +10:00
stewart@mysql.com
c7f3ce1148
BUG#18831 Valgrind: cond jmp on uninit during ndb_dd_dump test
...
don't know why this didn't generate a warning, but let's fix it too.
2006-04-06 17:13:17 +10:00
stewart@mysql.com
f54a2ff55b
BUG#18831 Valgrind: cond jmp on uninit during ndb_dd_dump test
2006-04-06 17:02:56 +10:00
bar@mysql.com
ceb0a0b2d5
Merge mysql.com:/usr/home/bar/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.1-new
2006-04-06 12:00:14 +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
jonas@perch.ndb.mysql.com
11bbc4e8e5
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-04-05 23:25:26 +02: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
igor@rurik.mysql.com
58ad55937d
Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-04-05 14:00:54 -07:00
bar@mysql.com
d590331d3c
Merge mysql.com:/usr/home/bar/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.1-new
2006-04-05 23:01:10 +05:00
evgen@sunlight.local
368b92390c
Manually merged
2006-04-05 20:12:26 +04:00
bar@mysql.com
139808f020
ctype-extra.c:
...
Recreating ctype-extra.c with additional 5.1
charset, and with additional missing 5.0 charset
due to bug with too small buffer MAX_BUF.
2006-04-05 19:52:47 +05:00
bar@mysql.com
31ef6c7c79
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new
2006-04-05 19:47:36 +05: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
bar@mysql.com
cbcd9cd575
Merge mysql.com:/usr/home/bar/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.1-new
2006-04-05 19:00:02 +05:00
konstantin@mysql.com
59f20d290f
Remove dead code from BUILD/ scripts: $debug_extra_warnings is
...
never defined.
It was used at some point to add -Wuninitialized to debug flags,
but not any more. If there is still need to add -Wunitialized,
it can be added directly to $global_warnings.
2006-04-05 17:50:33 +04:00
mats@mysql.com
d26cf9f2c8
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/b18436-mysql-5.1-new
2006-04-05 15:18:51 +02:00
mats@mysql.com
1344cde60d
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/b18436-mysql-5.1-new
2006-04-05 15:16:02 +02:00
konstantin@mysql.com
976a7493d3
Remove dead code from BUILD/ scripts.
2006-04-05 16:50:12 +04:00
kent@mysql.com
196521bd99
Makefile.am:
...
After merge correction
2006-04-05 12:56:05 +02:00