Commit graph

19327 commits

Author SHA1 Message Date
joreland@mysql.com
97a778d88a Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-28 08:11:56 +01:00
joreland@mysql.com
45ebb56d0b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-28 08:09:36 +01:00
joreland@mysql.com
7200ff359f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-28 07:55:42 +01:00
tomas@poseidon.ndb.mysql.com
af12846505 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-28 02:07:13 +01:00
tomas@poseidon.ndb.mysql.com
3800cede90 Do-compile:
ndbcluster requires more ports, this is the reason why builds will not start on multiple builds
2005-01-28 02:06:27 +01:00
tomas@poseidon.ndb.mysql.com
2fbacc191b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-28 01:31:27 +01:00
tomas@poseidon.ndb.mysql.com
e8090fc224 Merge 2005-01-28 00:47:41 +01:00
tomas@poseidon.ndb.mysql.com
732d1a5e81 Bug#8167 signal usage clash between mysql server and ndb shared memory
added shared memory config parameter, signum for use in signalling
    added global variable for holdign signum to be used for shared memory connection
    only fiddle with signals if it is set
    simplified common ndb client option handling
2005-01-28 00:42:41 +01:00
konstantin@mysql.com
2b858ae682 Remove unused configure.in name TOOLS_LIBS. 2005-01-28 01:23:06 +03:00
heikki@hundin.mysql.fi
5014402000 os0file.c:
Add includes for the _stat() call to compile on Windows in Hot Backup build
2005-01-27 18:54:00 +02:00
heikki@hundin.mysql.fi
a4908dbcd1 ut0mem.c:
Add a note to the error message that is printed when memory allocation fails: 32-bit computers usually have at most 2 GB or 4 GB process memory space
2005-01-27 18:53:59 +02:00
gluh@gluh.mysql.r18.ru
cab93758f1 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.last
2005-01-27 19:53:58 +03:00
gluh@gluh.mysql.r18.ru
9cb334f490 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.last
2005-01-27 18:23:05 +03:00
lenz@mysql.com
8c6f24f6b0 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2005-01-27 15:12:33 +01:00
tomas@poseidon.ndb.mysql.com
a0acf31b98 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-27 12:23:18 +01:00
ingo@mysql.com
48488e483a Merge mysql.com:/home/mydev/mysql-4.1-4100
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-27 12:18:02 +01:00
ingo@mysql.com
42531336f0 Re-enabled the use of --prefix.
Adjusted the "Usage:" string.
Ordered the option recognition in reverse order from "Usage:".
2005-01-27 12:13:35 +01:00
ingo@mysql.com
896d3a5f05 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-27 12:10:15 +01:00
ram@gw.mysql.r18.ru
170fb5329b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
2005-01-27 15:10:06 +04:00
ingo@mysql.com
fd352fd00e Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-27 12:01:19 +01:00
bar@mysql.com
858171cb6f item_timefunc.cc:
CAST now always return a well-formed character string.
2005-01-27 14:51:16 +04:00
ram@gw.mysql.r18.ru
7fda26d7fb Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
2005-01-27 14:16:54 +04:00
gluh@gluh.mysql.r18.ru
ac14d40dde A fix: information_schema test fails on Mac OSX 2005-01-27 13:16:51 +03:00
ndbdev@ndbmaster.mysql.com
f522800b5f ndb - Make sure to install 16-node tests 2005-01-27 11:10:20 +01:00
tomas@poseidon.ndb.mysql.com
2f4db89288 moved sorting and duplicate check for unique indexes from api to kernel 2005-01-27 10:44:47 +01:00
joreland@mysql.com
e62a61d8d3 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-27 10:33:01 +01:00
joreland@mysql.com
5d967c6603 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-27 10:31:45 +01:00
joreland@mysql.com
d470738ca0 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-27 10:30:52 +01:00
ram@gw.mysql.r18.ru
b782431585 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2005-01-27 13:01:57 +04:00
lenz@mysql.com
bbf08df9f1 - added "../extra" to the include path of mysqltest.dsp (Windows compile
failed to find the newly introduced extra/mysqld_ername.h header file)
2005-01-27 09:05:55 +01:00
ingo@mysql.com
160541b5d4 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-27 08:32:46 +01:00
ingo@mysql.com
c83060628d Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-27 08:32:38 +01:00
patg@patrick-galbraiths-computer.local
670a293478 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
2005-01-26 17:15:11 -08:00
ingo@mysql.com
00807cb060 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-26 22:34:23 +01:00
ingo@mysql.com
98ef0b2b26 Test bug: Memory leak in archive handler.
Added a call to close the meta file after a repair.
2005-01-26 22:31:42 +01:00
monty@mysql.com
da25f94897 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/my/mysql-5.0
2005-01-26 22:13:48 +02:00
ingo@mysql.com
1b02e18820 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-26 21:09:16 +01:00
patg@patrick-galbraiths-computer.local
9103a44908 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
2005-01-26 11:53:33 -08:00
patg@patrick-galbraiths-computer.local
097bc9294c changes to get rid of compile warnings in both ha_federated.cc and ha_federated.h 2005-01-26 11:47:28 -08:00
igor@rurik.mysql.com
90fe2656c6 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-01-26 10:42:46 -08:00
tomas@poseidon.ndb.mysql.com
3b1703b11a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-26 16:51:10 +01:00
tomas@poseidon.ndb.mysql.com
cc07a3a146 Makefile.am:
updated doxygen Makefile for changed examples directory
.del-demos.tar~8e6dfbc510a6e323:
  Delete: ndb/ndbapi-examples/configurations/demos.tar
Many files:
  mvdir
2005-01-26 16:42:52 +01:00
dlenev@mysql.com
d8f0b7bec6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg7637
2005-01-26 18:36:18 +03:00
tomas@poseidon.ndb.mysql.com
5e78384ee4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-26 16:09:58 +01:00
ram@gw.mysql.r18.ru
eb7b83807c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
2005-01-26 19:07:07 +04:00
ingo@mysql.com
bbcd542917 Merge from 4.1
Archive fix by Ingo.
Innodb compile fix by Monty.
2005-01-26 15:51:46 +01:00
ram@gw.mysql.r18.ru
c38886b20c timed_mutexes moved to include/my_sys.h and mysys/my_static.c
to avoid linking problems referring to the variable from .c programs.
2005-01-26 18:37:49 +04:00
mleich@mysql.com
aea6068097 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/matthias/Arbeit/mysql-5.0/src
2005-01-26 15:33:10 +01:00
ingo@mysql.com
be5dade853 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-26 15:31:31 +01:00
ingo@mysql.com
300337cee7 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-26 15:31:06 +01:00