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
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
jimw@mysql.com
2347e386d7
Fix double-initalization of mutex in archive storage engine. (Bug #7762 )
2005-01-10 23:59:28 +01:00
guilhem@mysql.com
4195cfc2a8
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-10 18:42:07 +01:00
lenz@mysql.com
af7dcec56d
- removed the mysql-test/suites/jp test suite and marked all files as gone
2005-01-10 16:19:01 +01:00
serg@serg.mylan
618d01e788
bad merge fixed
2005-01-10 16:03:06 +01:00
guilhem@mysql.com
b9926d71c0
A test for the BUG#7658 just fixed in 4.0 (could not put it into 4.0 as in 4.0 we don't replicate OPTIMIZE TABLE).
2005-01-10 15:13:33 +01:00
monty@mysql.com
56fb6f31ba
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-10 15:28:17 +02:00
heikki@hundin.mysql.fi
59b9a5289a
os0file.c:
...
Fix compiler error on those OS X platforms where Apple's special file flush trick with fcntl() is not defined
2005-01-10 15:26:33 +02:00
guilhem@mysql.com
da1d751b31
Merge mysql.com:/home/mysql_src/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-10 14:13:41 +01:00
guilhem@mysql.com
3439ce4ee3
Fix for BUG#7658 "optimize crashes slave thread (1 in 1000)]":
...
mysql_admin_table() attempted to write to a vio which was 0. I could have fixed mysql_admin_table()
but fixing my_net_write() looked more future-proof.
2005-01-10 13:52:32 +01:00
joreland@mysql.com
4ddd79fb69
bug#7761 - ndb does not autcommit - postreview fixes
2005-01-10 11:33:08 +01:00
joreland@mysql.com
6331241cb3
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-10 11:20:01 +01:00
joreland@mysql.com
c9f7f0ffcf
bug#7761 - ndb does not autocommit during alter table
2005-01-10 11:17:01 +01:00
paul@kite-hub.kitebird.com
7585b5cb61
set_var.cc:
...
Whack duplicate variable line. (Affects SHOW VARIABLES.)
2005-01-08 19:43:15 -06:00
jimw@mysql.com
0d8bfc5f92
Replace all sprintf() calls with my_snprintf() in client.c. All of the
...
format strings (in all languages) already included field limits on the
specifiers, so this is just protection against future mistakes. (Bug #7556 )
2005-01-09 02:19:42 +01:00
paul@kite-hub.kitebird.com
cbd56fce87
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2005-01-08 18:32:57 -06:00
serg@sergbook.mylan
e98e64cea8
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-08 21:27:22 +01:00
serg@sergbook.mylan
247052fecc
few harmless warnings from automated code-checking tools fixed
2005-01-08 21:25:31 +01:00
jimw@mysql.com
3b1b5edde5
Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-08 21:16:51 +01:00
pekka@mysql.com
50c3a883b2
ndb - wl-1442 fix Time ordering
2005-01-08 19:28:44 +01:00
pekka@mysql.com
0462ccfe3c
ndb - wl-1442 fix Date ordering
2005-01-08 16:57:51 +01:00
pekka@mysql.com
7ef7580bb7
ndb - wl-1442 updated ndb_index_ordered.result
2005-01-08 15:18:24 +01:00