Commit graph

14470 commits

Author SHA1 Message Date
joreland@mysql.com
1c4cb230cd Use "configured" socklen_t
Fix master printout
2004-08-24 15:08:52 +02:00
joreland@mysql.com
90e6e89212 Compile fix sol9x86 2004-08-24 14:48:07 +02:00
paul@kite-hub.kitebird.com
25266b845f Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2004-08-24 07:22:16 -05:00
lenz@mysql.com
89fcb8ee41 - make sure to recreate all autoconf/automake-related files after
modifying configure.in for the commercial tarballs
 - added my-innodb-heavy-4G.cnf to the distribution
2004-08-24 13:51:28 +02:00
joreland@mysql.com
6163efe1ac merge 2004-08-24 13:29:11 +02:00
sergefp@mysql.com
908ff0495d Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-root-root
2004-08-24 15:29:10 +04:00
joreland@mysql.com
6f75b81b16 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-24 13:29:09 +02:00
hf@deer.(none)
d6c7a717bb Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.5066
2004-08-24 16:29:08 +05:00
joreland@mysql.com
88c55407aa SCO unix compile fix 2004-08-24 13:29:08 +02:00
joreland@mysql.com
b06742ec7d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-24 13:29:07 +02:00
dlenev@brandersnatch.localdomain
fb01750468 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-fix
2004-08-24 15:29:06 +04:00
hf@deer.(none)
3b4d7e0c6d Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.5066
2004-08-24 16:29:06 +05:00
hf@deer.(none)
b22a499d42 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.emb
2004-08-24 16:29:05 +05:00
tomas@poseidon.(none)
c5bf129e9c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-clean
2004-08-24 11:29:04 +00:00
tomas@poseidon.(none)
5a24844551 some more printouts to SHOW command 2004-08-24 11:28:19 +00:00
joreland@mysql.com
1c44cd9087 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-24 13:19:45 +02:00
tomas@poseidon.(none)
b5304c816f enabling stopping of ndb_mgmd 2004-08-24 10:44:42 +00:00
sergefp@mysql.com
d970586fef Fix to compile with msvc: converted static const int Item_arena::* to enum members, undefine ERROR 2004-08-24 14:44:15 +04:00
hf@deer.(none)
cce03195dc Merging fix 2004-08-24 15:03:44 +05:00
mikron@mikael-ronstr-ms-dator.local
cb81410e77 Manual Merge 2004-08-24 11:55:28 +02:00
dlenev@brandersnatch.localdomain
577d9b6ff2 Fixed windows-specific warning about undeclared localtime_r() in my_time.c.
We have to include my_pthread.h since it is the place where localtime_r() is declared 
on platforms where this function is missing.
2004-08-24 13:53:02 +04:00
joreland@mysql.com
2de4d1f517 bug#5014
detect change of #replicas + #nodes
2004-08-24 11:31:30 +02:00
tomas@poseidon.(none)
e00587bff1 added mysql libs to ndb for debug features primarily 2004-08-24 09:25:23 +00:00
hf@deer.(none)
31304a38e4 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.5066
2004-08-24 14:24:14 +05:00
hf@deer.(none)
e12064aa3a Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.5066
2004-08-24 14:22:47 +05:00
hf@deer.(none)
43a853dd4d Merging 2004-08-24 12:58:21 +05:00
tomas@poseidon.(none)
83c78121ff only in vm_trace 2004-08-24 07:38:04 +00:00
bell@sanja.is.com.ua
9d71f85121 subselect test split on two tests because gis extention can be absent 2004-08-24 10:15:39 +03:00
rburnett@build.mysql.com
95a51bca95 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/rburnett/mysql-4.1
2004-08-24 00:45:03 +02:00
mronstrom@mysql.com
0b15127eb5 Removed some error codes since the errors are hard errors which
need ndbrequire instead.
2004-08-24 00:15:04 +02:00
monty@mysql.com
3808e4a5cf Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-08-24 01:09:24 +03:00
monty@mysql.com
7ff0cef3f1 Fixed uninitialized variable
Fixed error messages
2004-08-24 01:08:48 +03:00
tomas@poseidon.(none)
18dc248260 added explicit instantiation of template 2004-08-23 22:06:23 +00:00
rburnett@build.mysql.com
990c5857e5 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/rburnett/mysql-4.1
2004-08-23 22:01:16 +02:00
bell@sanja.is.com.ua
df0e1feb72 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-bugs-4.1
2004-08-23 22:57:07 +03:00
paul@kite-hub.kitebird.com
c0e689c212 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2004-08-23 14:47:12 -05:00
bell@sanja.is.com.ua
3b65ce7489 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-bugs-4.1
2004-08-23 22:32:38 +03:00
brian@avenger.(none)
32f2674a07 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into avenger.(none):/export/brian/mysql/4.1
2004-08-23 12:31:03 -07:00
bell@sanja.is.com.ua
6fcd27e9cd after review fixes:
allowed parsing of table fields inside aggregate functions
 added new tests of fields resolving in grouping
2004-08-23 22:31:01 +03:00
paul@kite-hub.kitebird.com
917aa465e2 mysqld.cc:
System variable names use underscores, not dashes.
  Alphabetize variables in option struct for help message.

(will wait for okay to push)
2004-08-23 14:30:55 -05:00
brian@avenger.(none)
e4a2cdde47 Changing version information. 2004-08-23 12:28:28 -07:00
serg@serg.mylan
f68219f6df Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-23 21:25:25 +02:00
serg@serg.mylan
2f8be12b85 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-23 21:11:06 +02:00
lenz@mysql.com
871625c5d5 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-08-23 21:03:16 +02:00
lenz@mysql.com
0479919884 - removed mysql-test/t/flush_block_commit-master.opt as it collided
with the sleep value we use for the test suite run during the
   release builds
2004-08-23 20:58:56 +02:00
tomas@poseidon.(none)
c8d9149ff0 Merge poseidon.(none):/home/tomas/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
2004-08-23 18:54:29 +00:00
tomas@poseidon.(none)
a1e0046cbf Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1
2004-08-23 18:47:37 +00:00
tomas@poseidon.(none)
91f10a9943 added support for stopping ndb_mgmd from client 2004-08-23 18:47:12 +00:00
mskold@mysql.com
9ad2448606 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-08-23 20:33:38 +02:00
tomas@poseidon.(none)
e437d7f382 forgot this in my previos changeset, 2004-08-23 17:10:23 +00:00