Commit graph

14925 commits

Author SHA1 Message Date
jan@hundin.mysql.fi
1152583362 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-09-17 18:31:19 +03:00
joreland@mysql.com
2e7e0d1f78 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-17 16:58:10 +02:00
pekka@mysql.com
d9be1123d7 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41-cc
2004-09-17 16:58:09 +02:00
tomas@poseidon.ndb.mysql.com
4c45731881 Preparation for batching 2004-09-17 14:58:08 +00:00
joreland@mysql.com
3cb410b8cd New mgmapi call - ndb_mtm_listen_event 2004-09-17 15:11:57 +02:00
joreland@mysql.com
07c7e1f530 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-17 14:18:55 +02:00
pekka@mysql.com
e274047c24 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41-cc
2004-09-17 14:18:32 +02:00
joreland@mysql.com
11dbfe4796 Fix backup event 2004-09-17 14:18:28 +02:00
tomas@poseidon.ndb.mysql.com
f21e6d81ff replaced some "localhost" checks with try bind
removed some #id 0 code
2004-09-17 12:16:34 +00:00
pekka@mysql.com
d02998e20f ndb charsets (wl-1732) final part: use strxfrm + strcoll 2004-09-17 14:09:21 +02:00
bell@sanja.is.com.ua
d2474ee2e5 Do not try use fields examples is expression and fiend used or SET/ENUM field used in types merging procedure (BUG#5618) 2004-09-17 13:23:57 +03:00
joreland@mysql.com
2f43e54aa4 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-17 12:06:23 +02:00
tomas@poseidon.ndb.mysql.com
27fcc9ecac Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
2004-09-17 10:06:22 +00:00
tomas@poseidon.ndb.mysql.com
f5e6f23343 made tryBind static
using tryBind instead to determine if we're "config host" is "local"
2004-09-17 10:05:42 +00:00
joreland@mysql.com
8dfb6b3fc4 Added EventReport for backup 2004-09-17 10:32:22 +02:00
joreland@mysql.com
31ba0b2be2 Moved event category match functionality into mgmapi
Removed grep introduced bogus mgm call
2004-09-17 08:28:22 +02:00
tomas@poseidon.(none)
4bfe7efeb0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
2004-09-17 00:14:40 +00:00
tomas@poseidon.(none)
a86100e78a corrected mistake in counting 2004-09-17 00:12:03 +00:00
tomas@poseidon.(none)
87ba45e99b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
2004-09-16 23:36:48 +00:00
tomas@poseidon.(none)
89c8365f39 removed different CFG_ defined for connection host names
added support for setting up multiple interfaces
correct connect address for mgmt server
bug, -l flag would be interpreted as connectstring
added flag to remove all node id checks
changed automatic allocation of ports somewhat
2004-09-16 23:36:13 +00:00
igor@rurik.mysql.com
c12c9af224 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2004-09-16 13:53:22 -07:00
joreland@mysql.com
0fe59a1a64 Fix error handling in atrt-mysqltest-run 2004-09-16 22:15:51 +02:00
joreland@mysql.com
6e2adc220e removed extra newline 2004-09-16 22:06:17 +02:00
mysql@mc04.(none)
5e8d686b5a Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mc04.(none):/space/mysql/mysql-4.1-ndb
2004-09-16 21:53:46 +02:00
jan@hundin.mysql.fi
762c24f29a Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-09-16 21:32:05 +03:00
konstantin@mysql.com
2fd2846f55 A quick fix for bug#5556: replace a column of SHOW TABLE STATUS result
with a fixed constant to pass on QNX:
max_data_file_length is calculated depending on max possible value of
record pointer. It's different on QNX, so the difference in results is OK.
2004-09-16 22:13:24 +04:00
marko@hundin.mysql.fi
a660499cd9 Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-09-16 19:09:38 +03:00
joreland@mysql.com
b04d9dcde4 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-16 18:09:35 +02:00
joreland@mysql.com
32cd5acd38 wl1668 -
Add support for getting events via mgmapi
removed all traces of stat port
2004-09-16 18:02:41 +02:00
bell@sanja.is.com.ua
b1374836b3 wording fixed 2004-09-16 18:37:26 +03:00
bell@sanja.is.com.ua
97a1418d16 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-update-4.1
2004-09-16 17:47:53 +03:00
bell@sanja.is.com.ua
f6dba131eb Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-sum-4.1
2004-09-16 16:24:46 +03:00
jani@rhols221.adsl.netsonic.fi
ac55486644 A fix for MetroWerks compiler. 2004-09-16 16:24:45 +03:00
jani@rhols221.adsl.netsonic.fi
dd5d2d8a6d Applied a few Netware patches. 2004-09-16 16:24:44 +03:00
ram@gw.mysql.r18.ru
a5d6f9f79a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2004-09-16 18:24:43 +05:00
tomas@poseidon.(none)
5ee0411275 compile fix 2004-09-16 13:24:42 +00:00
pekka@mysql.com
23dd2e15ae ndb charsets: TUX must use Dbtup::readAttributes 2004-09-16 14:38:01 +02:00
pekka@mysql.com
82c0e3b478 ndb charsets: metadata in TUP, TUX 2004-09-16 12:57:15 +02:00
ram@gw.mysql.r18.ru
dda34d21b9 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2004-09-16 15:05:17 +05:00
ram@gw.mysql.r18.ru
80f6c7e9a9 Clean-up. The length of compress() may depend on zlib version, etc. 2004-09-16 15:01:12 +05:00
bar@mysql.com
7c4ab566d2 Return character strings in table, type, possible_keys, key fields
of EXPLAIN SELECT, rather than binary strings.
2004-09-16 14:47:39 +05:00
igor@rurik.mysql.com
c9265171dc Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2004-09-16 01:23:38 -07:00
tomas@poseidon.(none)
9df9132183 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
2004-09-16 08:23:37 +00:00
tomas@poseidon.(none)
5488f207db mysql_install_db should do skip-ndbcluster
set a printout in SocketClient only for debug
2004-09-16 08:22:22 +00:00
magnus@neptunus.(none)
713c80d2b3 Add variable to printout 2004-09-16 09:51:35 +02:00
magnus@neptunus.(none)
f53bf1b6de Added DBUG_PRINT 2004-09-16 09:40:59 +02:00
mysql@mc04.(none)
d905188230 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mc04.(none):/space/mysql/mysql-4.1-ndb
2004-09-16 09:21:49 +02:00
igor@rurik.mysql.com
cfbd2b7f7a opt_sum.cc:
Slightly improved the fix for bug #5406.
2004-09-15 23:52:46 -07:00
bar@mysql.com
e39a5033f2 item.cc:
Bug #5561 No BINARY_FLAG in metadata
2004-09-16 11:12:49 +05:00
mskold@mysql.com
251fe25bf8 Optimzed handling of NO_AUTO_VALUE_ON_ZERO 2004-09-16 04:55:22 +02:00