joreland@mysql.com
047a3d1258
merge
2004-11-25 14:33:33 +01:00
joreland@mysql.com
29326b1d41
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2004-11-25 14:33:32 +01:00
tomas@poseidon.ndb.mysql.com
538a3f7a53
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2004-11-25 13:33:31 +00:00
ram@gw.mysql.r18.ru
886d54bb37
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6441
2004-11-25 16:18:48 +04:00
bar@mysql.com
3d6e811ed5
table.cc:
...
Bug #6802 MySQL 4.0's VARCHAR(NN) BINARY is interpreted as VARBINARY(NN) in 4.1
2004-11-25 16:18:47 +04:00
ram@gw.mysql.r18.ru
511eb626bf
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6441
2004-11-25 16:18:46 +04:00
serg@serg.mylan
895376998f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-25 13:18:46 +01:00
tomas@poseidon.ndb.mysql.com
870c718b03
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-25 12:18:45 +00:00
tomas@poseidon.ndb.mysql.com
5a09289bd1
ndb/src/common/logger/LogHandler.cpp
...
changed so that error is returned if format is wrong in logger param parsing
ndb/src/common/logger/Logger.cpp
some debuf printout added
ndb/src/mgmsrv/InitConfigFileParser.cpp
rewrote parsing on parseNameValuePair, was buggy
2004-11-25 12:14:15 +00:00
joreland@mysql.com
3f8f0f3369
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-11-25 10:48:20 +01:00
joreland@mysql.com
183a9a169d
ndb - Fix loop over multiple bounds in LQH
...
Last part of NDB batching of range scans
(now only handler remains)
2004-11-25 10:47:44 +01:00
joreland@mysql.com
5d70a4895f
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-25 10:40:56 +01:00
joreland@mysql.com
64bc875228
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-25 10:39:34 +01:00
joreland@mysql.com
a9e5e7de88
bug#6775 - ndb - fix bug introduced by bug fix
2004-11-25 10:38:46 +01:00
bell@sanja.is.com.ua
d472a62475
do not leave sql command uninitialized, because it used for detection need of preparation correct idends printing during finding identifiers i
2004-11-25 10:23:47 +02:00
bell@sanja.is.com.ua
a1cac9687e
spelling fixed/comments added (postreview fixes)
2004-11-25 09:28:32 +02:00
bell@sanja.is.com.ua
69ec6a4592
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-join-5.0
2004-11-25 02:27:02 +02:00
bell@sanja.is.com.ua
1e3d8b0839
post-merge fix
2004-11-25 02:23:13 +02:00
guilhem@mysql.com
2e6d576053
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0-clean
2004-11-25 01:09:04 +01:00
guilhem@mysql.com
d913f4e4ab
sql_select.cc:
...
my_message_sql does not tolerate a NullS argument (segfault)
2004-11-25 01:06:37 +01:00
serg@serg.mylan
e80bd82e83
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-24 23:47:14 +01:00
serg@serg.mylan
e8203e437a
bug#6784
...
mi_flush_bulk_insert (on dup key error in mi_write)
was mangling info->dupp_key_pos
2004-11-24 23:16:16 +01:00
heikki@hundin.mysql.fi
213e61d339
lowercase_table3.result:
...
Correct InnoDB's result output in test; the pseudo-file-extension for InnoDB tables '.InnoDB' was replaced by a more realistic '.ibd' extension
2004-11-25 00:04:03 +02:00
brian@avenger.(none)
71f31d1c94
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into avenger.(none):/export/brian/mysql/merge/5.0
2004-11-24 13:34:35 -08:00
brian@avenger.(none)
2b0b6ec20c
Merging 4.1 to 5.0
2004-11-24 12:34:44 -08:00
bell@sanja.is.com.ua
bce05e9aab
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
2004-11-24 21:25:36 +02:00
ram@gw.mysql.r18.ru
bc231c3d27
A fix. Why didn't we use UINT_MAX32?
2004-11-24 22:18:28 +04:00
bell@sanja.is.com.ua
3fa511ff54
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
2004-11-24 20:01:34 +02:00
bell@sanja.is.com.ua
6d5d5ff941
fixed problem in MacOS
...
correct printing of aliases
2004-11-24 19:48:30 +02:00
heikki@hundin.mysql.fi
bd6ccd46fc
configure.in:
...
Fix linking error in 5.0: the build system for Linux/S390 does not have inlining working in the compiler; remove inlining on that system
2004-11-24 19:41:38 +02:00
tomas@poseidon.ndb.mysql.com
c22266886c
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-24 17:41:37 +00:00
tomas@poseidon.ndb.mysql.com
489b411640
added explanation of error code 4335
2004-11-24 17:40:40 +00:00
joerg@mysql.com
9e467cc009
Merge from 4.0 for immediate use in the current 5.0 builds.
2004-11-24 17:32:11 +01:00
gluh@gluh.mysql.r18.ru
3256fd704e
Fixed bug related to lower case table names on Power Mac
...
'information_schema' test is splitted because of innodb
2004-11-24 19:32:10 +03:00
bar@mysql.com
0f79f61480
Bug#6787 LIKE not working properly with _ and utf8 data
2004-11-24 20:09:54 +04:00
joreland@mysql.com
de031d0e5a
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-24 17:09:53 +01:00
serg@serg.mylan
582d10b510
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-24 17:09:53 +01:00
tomas@poseidon.ndb.mysql.com
f43408b819
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-24 16:09:52 +00:00
tomas@poseidon.ndb.mysql.com
7b601bd984
also backup needs triggers
2004-11-24 16:04:11 +00:00
tomas@poseidon.ndb.mysql.com
ebc7c9cb99
calculation of noOfTriggers
2004-11-24 15:51:59 +00:00
joreland@mysql.com
005123f98d
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-11-24 16:51:15 +01:00
joreland@mysql.com
6f458bddac
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-24 16:47:08 +01:00
joreland@mysql.com
dfe4e29a4c
bug#6775 - ndb
...
Queue scan on real fragment.
Index fragment for range scans
Table fragment for table scans
2004-11-24 16:36:18 +01:00
joerg@mysql.com
c356b37b0c
Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/mysql-4.1
2004-11-24 15:29:35 +01:00
joerg@mysql.com
cf722bc3f5
Ensure consistent sources up to 5.0 where a C++ problem occurs.
2004-11-24 15:24:23 +01:00
tomas@poseidon.ndb.mysql.com
003b28d04f
added mgmapi/mgmapi_config_parameters.h, mgmapi/mgmapi_config_parameters_debug.h
...
to distribution
2004-11-24 13:59:03 +00:00
joreland@mysql.com
31a1d668e6
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-24 13:21:41 +01:00
joerg@mysql.com
48db510b40
Merged 4.0 change into 4.1
2004-11-24 13:04:13 +01:00
joreland@mysql.com
b22e9a0b0b
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-11-24 12:40:04 +01:00
joreland@mysql.com
40354004f5
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2004-11-24 12:34:31 +01:00