Commit graph

18569 commits

Author SHA1 Message Date
hf@deer.(none)
6f511796fc Merging fixed 2005-01-11 23:28:56 +04: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
hf@deer.(none)
196c95e938 Merging conflicts resolved 2005-01-11 21:00:53 +04: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
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
joreland@mysql.com
ee72592bfd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-11 13:56:06 +01:00
joreland@mysql.com
d4aea9a44b Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-11 13:50:28 +01:00
bar@mysql.com
691b3283d2 If VARCHAR strips only trailing spaces, then produce
a note, not a warning or error.
2005-01-11 16:49:45 +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
konstantin@mysql.com
a55cd1f1c4 Fixes for two compile-time failures. 2005-01-11 15:32:23 +03: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
konstantin@mysql.com
a0bc131743 Merge mysql.com:/home/kostja/work/mysql-4.1-7428
into mysql.com:/home/kostja/work/mysql-5.0-root
2005-01-11 14:47:12 +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
joreland@mysql.com
d4e9719aff Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-11 11:14:14 +01:00
konstantin@mysql.com
876a96cd02 make it compile with -ansi -pedantic 2005-01-11 13:12:52 +03:00
joreland@mysql.com
1a1e4ab9e7 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-11 11:12:46 +01: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
mskold@mysql.com
20184b7047 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 10:31:31 +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
64c04a4c26 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jwinstead2/mysql-5.0-clean
2005-01-11 05:11:42 +01:00
jimw@mysql.com
3d0e2e70c6 Merge 2005-01-11 05:10:08 +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
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
kent@mysql.com
feee6ee30b field.h, field.cc:
Did some more split TABLE to TABLE and TABLE_SHARE
2005-01-11 00:17:21 +01:00