Commit graph

18619 commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
1640554fd4 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-12 14:30:04 +01:00
tomas@poseidon.ndb.mysql.com
728aa6e7fd added management server port as "unique" id for use in shmkey 2005-01-12 14:03:10 +01:00
joreland@mysql.com
fadd2bea49 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-12 11:27:30 +01:00
joreland@mysql.com
1d2d545000 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-12 11:25:54 +01:00
joreland@mysql.com
953df8f48d Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-12 11:24:46 +01:00
joreland@mysql.com
eeabd0bb67 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-12 11:20:05 +01:00
joreland@mysql.com
a9dc068a43 ndb - fix 64-bit problem in autotest 2005-01-12 11:17:03 +01:00
tomas@poseidon.ndb.mysql.com
af78edc1eb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-12 09:22:10 +01:00
sergefp@mysql.com
4860bf9a06 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-look-valgrind
2005-01-12 09:05:10 +03:00
sergefp@mysql.com
ea8d861d23 Fix for use of unitialized variable errors: Manually delete
{min,max}_functions_it as it is not allocated on the pool.
2005-01-12 08:15:46 +03:00
shuichi@mysql.com
2c6ef57f9a uncommented the drop table statement 2005-01-11 20:26:43 -08:00
shuichi@mysql.com
3126e82291 added new character set - cp932, eucjp_ms 2005-01-11 17:45:36 -08:00
tomas@poseidon.ndb.mysql.com
3f7c13d501 change to using public enum for log events 2005-01-11 23:25:45 +01:00
tomas@poseidon.ndb.mysql.com
a5c08a718e ndbcluster.sh:
increased timeouts to see if more tests get started automatically
2005-01-11 23:09:10 +01:00
tomas@poseidon.ndb.mysql.com
0f302deb41 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-11 23:02:14 +01:00
jimw@mysql.com
b89d35fa68 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-11 21:55:39 +01:00
jimw@mysql.com
6dbea8fc55 Merge mysql.com:/home/jwinstead2/mysql-4.1-6418
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-11 21:53:39 +01:00
jimw@mysql.com
39d90b710f Replace ZLIB_LIBS in mysql_config. (Bug #6418) 2005-01-11 21:50:30 +01:00
bar@mysql.com
28ee79a732 strict.result, strict.test:
Clean-up for the previous change: VARCHAR and trailing spaces.
2005-01-11 23:28:57 +04:00
hf@deer.(none)
6f511796fc Merging fixed 2005-01-11 23:28:56 +04:00
joreland@mysql.com
f8d8c2bafb ndb compile warnings 2005-01-11 19:45:57 +01:00
hf@deer.(none)
38baa28a10 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-01-11 22:15:29 +04:00
jon@gigan.
eccd1229f0 Documentation: NdbError is no longer a class,
it's a struct now.
2005-01-12 03:55:53 +10:00
jani@ua141d10.elisa.omakaista.fi
fd79354273 Fixed Bug#2813, "analyse does not quot string values in enams from string". 2005-01-11 19:40:33 +02:00
tomas@poseidon.ndb.mysql.com
5595eaf56e 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-11 18:36:35 +01:00
tomas@poseidon.ndb.mysql.com
3577dbe3ff removed getBaseTable, was wrong and will not work 2005-01-11 18:32:02 +01:00
joreland@mysql.com
fd7010523c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-11 18:28:59 +01:00
hf@deer.(none)
196c95e938 Merging conflicts resolved 2005-01-11 21:00:53 +04:00
mskold@mysql.com
c0a46fc460 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
2005-01-11 17:20:14 +01:00
joreland@mysql.com
cc051b0d33 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-11 17:14:02 +01:00
joreland@mysql.com
c9502b5567 merge 2005-01-11 17:02:30 +01:00
joreland@mysql.com
7f287d963c removed compiler warnings from ha_ndbcluster 2005-01-11 17:00:31 +01:00
bar@mysql.com
2bd854c859 Bug #7730 Server crash using soundex on an utf8 table
Don't use my_tolower: it works only for 8bit charsets.
2005-01-11 19:58:53 +04:00
hf@deer.(none)
8b3b364893 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.5920
2005-01-11 19:58:52 +04:00
mskold@mysql.com
718d4ea245 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-01-11 16:49:52 +01:00
lenz@mysql.com
33795908a0 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2005-01-11 16:02:45 +01:00
konstantin@mysql.com
dbd6589851 A fix for Bug#7365 "embedded server for MacOS: problem with prepared
statements": no test case, the test case is there already, 
libmysqld/examples/client_test.c, we just need to run it on a daily basis.
2005-01-11 18:02:44 +03:00
tomas@poseidon.ndb.mysql.com
02ae961b34 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-11 16:02:42 +01:00
tomas@poseidon.ndb.mysql.com
cecb618c62 bug fixed parsing with comments on same line 2005-01-11 16:00:11 +01:00
joreland@mysql.com
fd9d32bd7e Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-11 15:46:43 +01:00
lenz@mysql.com
a156ddd0be - Create the mysqld binaries with the correct file names during the build
instead of renaming them in the packaging stage with Do-win-build later:
  mysqld-opt.exe -> mysqld.exe, mysqld.exe -> mysqld-debug.exe
2005-01-11 15:41:42 +01:00
lenz@mysql.com
0d08e9b2c2 - Housekeeping: removed a few unreferenced variables, noticed while doing
Windows builds
2005-01-11 15:38:03 +01:00
tomas@poseidon.ndb.mysql.com
20067ffdeb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-11 14:56:49 +01:00
tomas@poseidon.ndb.mysql.com
b99c878c77 Suma.cpp:
same as prev fix, wrong read of 64 bit value
2005-01-11 14:54:58 +01:00
tomas@poseidon.ndb.mysql.com
dcfa02917f Backup.cpp:
bug#7660
2005-01-11 14:49:35 +01:00
serg@serg.mylan
9a43b64874 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-11 14:29:22 +01:00
hf@deer.(none)
292c3612ee Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.7330
2005-01-11 17:29:21 +04:00
hf@deer.(none)
40461c9143 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.7330
2005-01-11 17:27:54 +04:00
mskold@mysql.com
082bd01572 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-01-11 14:21:58 +01:00
mskold@mysql.com
e72f9108ef Removed compiler warnings 2005-01-11 14:06:44 +01:00