serg@serg.mylan
e83f49bd2f
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-01-12 12:35:34 +01:00
serg@serg.mylan
cc23dc2d11
merged. ul.
2005-01-12 12:24:23 +01:00
serg@serg.mylan
b86a512e37
added missing Com_update_multi status variable
2005-01-12 12:18:17 +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
dlenev@brandersnatch.localdomain
23c9e0a75a
Fix for bug #7586 "TIMEDIFF for sec+microsec not working properly".
2005-01-12 12:18:36 +03:00
jan@hundin.mysql.fi
3ba52c1eb8
Take a shared record lock (LOCK_REC_NOT_GAP) for a matching record in the foreign
...
key check because we can allow inserts into gaps (Support Issue #4317 ).
2005-01-12 10:36:50 +02: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
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
kent@mysql.com
70443afe7d
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-11 21:09:22 +01: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
monty@mysql.com
f4274fe9be
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-11 19:35:00 +02:00
monty@mysql.com
2677a1c46b
Review of new pushed code
...
Indentation cleanup
2005-01-11 18:55:53 +02: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
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
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
joreland@mysql.com
45505cb8c6
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-11 13:36:27 +01:00
joreland@mysql.com
6c69e3d2b3
bug#7798 - ndb - range scan with invalid table version could cause node failure
2005-01-11 13:30:11 +01:00
hf@deer.(none)
7ddb951984
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 16:10:06 +04:00
tomas@poseidon.ndb.mysql.com
ecbeaabdd4
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-11 13:06:04 +01:00
tomas@poseidon.ndb.mysql.com
87b15bd993
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-11 12:54:53 +01:00
tomas@poseidon.ndb.mysql.com
5a2dc1de6f
can't use my_pread,my_pwrite since it uses mutexes on the files
2005-01-11 12:50:54 +01:00
dlenev@brandersnatch.localdomain
2f32115092
Fix for bug #7418 "TIMESTAMP not always converted to DATETIME in MAXDB
...
mode".
Changed grammar rule for "type" token. Now we have one branch with
optional length specification for TIMESTAMP type instead of two separate
branches.
2005-01-11 14:26:40 +03:00
konstantin@mysql.com
4073c11a72
Followup: rename the declaration (hash_reset -> my_hash_reset)
2005-01-11 13:57:07 +03:00
konstantin@mysql.com
067d13f632
A fix for linking failure of MySQL client when linking with imap libraries
...
(Bug#7428) (renamed: hash_reset -> my_hash_reset)
2005-01-11 13:53:10 +03:00
konstantin@mysql.com
876a96cd02
make it compile with -ansi -pedantic
2005-01-11 13:12:52 +03:00
bell@sanja.is.com.ua
dd56d63f48
error of parsing can occur in any SELECT, so all SELECTs have to be checked
2005-01-11 11:53:39 +02:00
serg@serg.mylan
b670f88287
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-11 10:34:38 +01:00
joreland@mysql.com
28f5a019c1
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-11 10:34:37 +01:00
tomas@poseidon.ndb.mysql.com
e88b292738
Bug#7477
2005-01-11 10:34:36 +01:00
joreland@mysql.com
0cf3c1e5c1
bug#7765 - ndb startup on 64-bit, increase stack on 64-bit
2005-01-11 10:02:31 +01:00
jimw@mysql.com
d5f18e63b3
Merge mysql.com:/home/jwinstead2/mysql-4.1-7556
...
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-11 02:57:47 +01:00
serg@serg.mylan
e9ac8dbc51
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-11 02:36:50 +01:00
kent@mysql.com
654c95dcba
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-11 01:36:49 +01:00
kent@mysql.com
31d5463ae1
mtr_process.pl:
...
Catch more fork() errors.
Moved sleep_until_file_created() here from "mysql-test-run.pl".
Improved debug output.
mtr_io.pl:
Improved mtr_get_opts_from_file(), try to mimic some sh.
mysql-test-run.pl:
Cleaned up the timeout handling.
Created new function environment_setup().
Corrected time zone handling.
Moved sleep_until_file_created() to "lib/mtr_process.pl".
Improved debug output.
2005-01-11 01:35:08 +01:00
jimw@mysql.com
e173b24f75
Merge mysql.com:/home/jwinstead2/mysql-4.1-7762
...
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-11 01:25:46 +01:00
jimw@mysql.com
699cb2c066
Fix style nit
2005-01-11 01:01:35 +01:00