Commit graph

24881 commits

Author SHA1 Message Date
joreland@mysql.com
1b31399774 ndb - changed config 2005-07-26 09:06:37 +02:00
joreland@mysql.com
3b8275d062 Merge mysql.com:/home/jonas/src/mysql-5.0
into  mysql.com:/home/jonas/src/mysql-5.0-push
2005-07-26 08:09:38 +02:00
joreland@mysql.com
122758e5c8 Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-5.0
2005-07-26 08:05:06 +02:00
joreland@mysql.com
be8d46028f ndb_config test requires ndb 2005-07-26 07:59:10 +02:00
joreland@mysql.com
88006d6a3c Merge mysql.com:/home/jonas/src/mysql-5.0
into  mysql.com:/home/jonas/src/mysql-5.0-push
2005-07-25 15:33:17 +02:00
joreland@mysql.com
3c59758fdc Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-5.0
2005-07-25 15:31:38 +02:00
joreland@mysql.com
0cd9e2e269 fix compile error 2005-07-25 13:47:40 +02:00
joreland@mysql.com
c12b41605d Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-5.0
2005-07-25 13:23:34 +02:00
joreland@mysql.com
07cdfdca69 ndb - Fix LCP during SR parameters 2005-07-25 12:41:25 +02:00
joreland@mysql.com
fe800b95b3 Merge mysql.com:/home/jonas/src/mysql-5.0
into  mysql.com:/home/jonas/src/mysql-5.0-push
2005-07-24 21:22:15 +02:00
joreland@mysql.com
8fc24f2634 merge error 2005-07-24 21:20:45 +02:00
joreland@mysql.com
4fbc43abc1 Merge mysql.com:/home/jonas/src/mysql-5.0
into  mysql.com:/home/jonas/src/mysql-5.0-push
2005-07-24 21:16:21 +02:00
joreland@mysql.com
0345998f5d Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-5.0
2005-07-24 20:41:38 +02:00
joreland@mysql.com
b285050e52 ndb - add mysql-test-run test case for ndb_config 2005-07-24 17:35:39 +02:00
joreland@mysql.com
293145b314 Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-5.0
2005-07-24 08:27:16 +02:00
georg@lmy002.wdf.sap.corp
35b66a40c2 Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
2005-07-24 08:12:20 +02:00
joreland@mysql.com
5490cdfb24 Add tool to extract config info from ndb_mgmd 2005-07-23 12:06:02 +02:00
bell@sanja.is.com.ua
f5833989ba Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
2005-07-23 07:55:07 +03:00
bell@sanja.is.com.ua
bfdb6ca3cf store SERVER_MORE_RESULTS_EXISTS in key of query cache (BUG#6897) 2005-07-23 07:51:25 +03:00
jimw@mysql.com
d6d1a9aae2 Merge mysql.com:/home/jimw/my/mysql-5.0-11227
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-22 12:39:47 -07:00
jimw@mysql.com
421f267b7f Merge mysql.com:/home/jimw/my/mysql-5.0-11213
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-22 12:38:14 -07:00
jimw@mysql.com
6e955625f6 Merge mysql.com:/home/jimw/my/mysql-5.0-build
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-22 12:36:17 -07:00
jimw@mysql.com
49e5636410 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-22 12:35:15 -07:00
jimw@mysql.com
e15dd02241 Remove use of non-portable gettimeofday() in thr_lock.c (Bug #12100) 2005-07-22 12:01:42 -07:00
jimw@mysql.com
535ba76b98 Merge mysql.com:/home/jimw/my/mysql-4.1-10407
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-22 11:57:34 -07:00
patg@radha.local
757f94009f removed DBUG code from ha_federated.cc causing windows compile problems.
This is for the release bk tree, same change as 1.1890, which JimW approved.
2005-07-22 20:56:08 +02:00
jimw@mysql.com
e26a344d19 Fix calculation for length of LPAD() and RPAD() reported to
client via mysql_fetch_fields(). (Bug #11311)
2005-07-22 11:46:29 -07:00
joerg@mysql.com
306ade1fd5 Add the definition of "floatget".
Necessary to compile 5.0.10 on Windows, no bug report filed.
2005-07-22 20:37:59 +02:00
paul@snake-hub.snake.net
368d353993 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2005-07-22 12:59:41 -05:00
paul@snake-hub.snake.net
3723ea1c67 errmsg.txt:
Change an ` quote to ' (' is used everywhere else)
  This does not affect any test results.
2005-07-22 12:46:39 -05:00
bar@mysql.com
daab2160a0 Merge mysql.com:/usr/home/bar/mysql-4.1.b11987
into  mysql.com:/usr/home/bar/mysql-5.0
2005-07-22 21:13:15 +05:00
bar@mysql.com
44a446dc07 ctype-gbk.c:
Bug #11987
  mysql will truncate the text when the text contain GBK char:"0xA3A0" and "0xA1"
  Allow to store and retrieve even unassigned GBK codes.
  Like we did in Big5 earlier.
have_gbk.inc, have_gbk.require, ctype_gbk.result, ctype_gbk.test:
  new file
2005-07-22 21:06:02 +05:00
joreland@mysql.com
4f7360f31d ndb - hugo, fix closeTransaction in testPartitioning 2005-07-22 16:29:38 +02:00
georg@lmy002.wdf.sap.corp
36b9af2d02 Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
2005-07-22 15:48:07 +02:00
joreland@mysql.com
21edad598d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/jonas/src/mysql-5.0
2005-07-22 14:32:17 +02:00
joreland@mysql.com
4fedf8462d bug#11133 - ndb write/lock upgrade
fix test case
  improve testing
2005-07-22 14:30:00 +02:00
stewart@mysql.com
36b5406604 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/wl2347
2005-07-22 21:43:25 +10:00
bar@mysql.com
cbbf0e21b3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0
2005-07-22 16:35:09 +05:00
stewart@mysql.com
6f62273c00 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/wl2347
2005-07-22 21:22:40 +10:00
bar@mysql.com
a7e5fa4d83 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b11754
2005-07-22 15:33:13 +05:00
stewart@mysql.com
96f8cf3588 WL#2347 - Load independent heartbeats
Reset missed heartbeat count on receipt of signal from node.

This fixes a bug where that under high network load, the heartbeat packets could be
delayed, causing the appearance of node failure (due to lost heartbeats).
2005-07-22 20:29:25 +10:00
joreland@mysql.com
f4731e1f40 Merge mysql.com:/home/jonas/src/mysql-5.0
into  mysql.com:/home/jonas/src/mysql-5.0-push
2005-07-22 12:28:17 +02:00
joreland@mysql.com
fc2573a086 bug#11675 - ndb backup
Fix invalid backup log when using #nodes != 2^x
  Fix ndb_restore --printXXX options
    (among other init counters)
2005-07-22 12:17:53 +02:00
stewart@mysql.com
614c6cd8ef Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
2005-07-22 19:49:50 +10:00
bar@mysql.com
894dc2fdb0 Merge mysql.com:/usr/home/bar/mysql-4.1.b11754
into  mysql.com:/usr/home/bar/mysql-5.0
2005-07-22 14:47:13 +05:00
stewart@mysql.com
5ac22d0446 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
2005-07-22 19:44:33 +10:00
bar@mysql.com
4d75b059c0 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b11754
2005-07-22 13:27:30 +05:00
hf@deer.(none)
d72a837029 Merge deer.(none):/home/hf/work/mysql-4.1.clean
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-07-22 12:18:19 +05:00
hf@deer.(none)
62aad2bcd0 merging 2005-07-22 12:15:09 +05:00
hf@deer.(none)
5efe010f8a Merge bk@192.168.21.1:/usr/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0.clean
2005-07-22 12:01:28 +05:00