mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-07 19:53:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
17068 commits 2857 branches 349 tags 1.6 GiB
Commit graph

17068 commits

Author SHA1 Message Date
dlenev@mysql.com
5627dddb93 Manual merge of fix for bug "from_unixtime() function returns 
wrong datetime values for too big argument" from 4.0 tree to 4.1 tree.
 2004-11-19 19:19:45 +03:00
pekka@mysql.com
1a432513ee Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41
 2004-11-19 16:54:41 +01:00
pekka@mysql.com
ad8dad86a8 ndb: do not crash on config mismatch if release compiled 2004-11-19 16:49:17 +01:00
bar@mysql.com
3b0fd7fe96 func_str.result: 
This test was moved into func_group.
 2004-11-19 19:35:37 +04:00
dlenev@mysql.com
cb7e272e46 Manual merge of fix for bug "Invalid DATETIME value is not handled 
properly" with main tree.
 2004-11-19 18:35:36 +03:00
petr@mysql.com
edc868e397 Added --disable-log-bin option to the mysqlbinlog (WL1787) 2004-11-19 18:35:36 +03:00
bar@mysql.com
770c9be8c2 Bug MAX(column) returns incorrect coercibility 
Also, Item_sum_hybrid->charset was removed as redundant,
and switched to use collation.collation instead.
 2004-11-19 19:35:36 +04:00
tomas@poseidon.ndb.mysql.com
03c28bf12f correct some linking problem 2004-11-19 15:35:35 +00:00
dlenev@mysql.com
40083741ee Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/dlenev/src/mysql-4.0-bg6439
 2004-11-19 17:54:14 +03:00
tomas@poseidon.ndb.mysql.com
0de3a28048 Merge tulin@bk-internal.mysql.com:/tmp/my4.1-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
 2004-11-19 14:25:59 +00:00
tomas@poseidon.ndb.mysql.com
744a18eb5f Merge 2004-11-19 14:18:24 +00:00
tomas@poseidon.ndb.mysql.com
eb3e306f38 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-11-19 13:55:55 +00:00
tomas@poseidon.ndb.mysql.com
da7c9e26a0 set sizes array sizes correctly in ndb blocks configuration 2004-11-19 13:52:21 +00:00
tomas@poseidon.ndb.mysql.com
7805cb4df8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
 2004-11-19 13:25:31 +00:00
joreland@mysql.com
80fb79f507 Merge mysql.com:/home/jonas/src/mysql-4.1-fix 
into mysql.com:/home/jonas/src/wl2077
 2004-11-19 13:52:26 +01:00
joreland@mysql.com
56a59cf301 wl2077: ndb, disable scanning of backup fragments 
(temporary)
 2004-11-19 13:52:01 +01:00
joreland@mysql.com
4dead3b68d Merge joreland@bk-internal.mysql.com:/tmp/my4.1-ndb 
into mysql.com:/home/jonas/src/wl2077
 2004-11-19 13:35:14 +01:00
joreland@mysql.com
155265a79c Merge mysql.com:/home/jonas/src/mysql-4.1-fix 
into mysql.com:/home/jonas/src/wl2077
 2004-11-19 13:31:50 +01:00
pekka@mysql.com
8bfa05f2fc Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41
 2004-11-19 13:26:47 +01:00
tomas@poseidon.ndb.mysql.com
0e3c284b0a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-11-19 12:26:46 +00:00
pekka@mysql.com
f99d980749 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41
 2004-11-19 12:20:57 +01:00
tomas@poseidon.ndb.mysql.com
2a98452679 fixed error messages for some error codes 2004-11-19 11:19:27 +00:00
joreland@mysql.com
b254e69a38 wl2077 - scan optimizations 
(recommit in clean clone)
 2004-11-19 11:37:16 +01:00
bar@mysql.com
6de458c232 Reuse ctype_common.inc instead of retyping 
the same queries.
 2004-11-19 14:33:55 +04:00
joreland@mysql.com
9e924a4902 wl2077 - ndb scan optimizations 2004-11-19 11:31:20 +01:00
bar@mysql.com
f9d1a5a1c6 Incorrect response with partial utf8 index 2004-11-19 14:25:25 +04:00
tomas@poseidon.ndb.mysql.com
b67491ee41 ignore fix 2004-11-19 09:38:41 +00:00
tomas@poseidon.ndb.mysql.com
73f098836f added to ignore list 2004-11-19 09:35:12 +00:00
tomas@poseidon.ndb.mysql.com
fdfc731155 ha_ndbcluster.cc: 
merge error
 2004-11-19 09:27:16 +00:00
tomas@poseidon.ndb.mysql.com
2048819f7a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-11-19 09:18:36 +00:00
tomas@poseidon.ndb.mysql.com
287fe9e313 ndb_grant.result, ndb_grant.test: 
new file
 2004-11-19 09:17:36 +00:00
guilhem@mysql.com
6c438ba9a4 log_event.cc: 
post-conflict-merge fix (duplicate comment)
 2004-11-19 00:57:26 +01:00
tomas@poseidon.ndb.mysql.com
eb11d34403 moved ndb_use_transactions out of opts and to be set default true in THD::init 2004-11-18 22:45:48 +00:00
tomas@poseidon.ndb.mysql.com
3a8a6d4457 merge error 2004-11-18 22:44:34 +00:00
guilhem@mysql.com
631f6f3c30 Merge 2004-11-18 23:31:23 +01:00
tomas@poseidon.ndb.mysql.com
bcd7f9a907 Merge 2004-11-18 22:06:51 +00:00
guilhem@mysql.com
7743dbbb56 When mysqlbinlog prints LOAD DATA INFILE, let it print the thread id. Some customer would have benefited 
much from this in his recovery. All this change does is adding one commented (#) line before the LOAD DATA
command, so it is quite innocuous.
 2004-11-18 22:59:17 +01:00
tomas@poseidon.ndb.mysql.com
2ec794a970 Merge 2004-11-18 21:54:53 +00:00
tomas@poseidon.ndb.mysql.com
22577e87e4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
 2004-11-18 21:43:03 +00:00
joreland@mysql.com
15dab6323e Merge mysql.com:/home/jonas/src/mysql-4.1-fix 
into mysql.com:/home/jonas/src/wl2077
 2004-11-18 22:42:43 +01:00
tomas@poseidon.ndb.mysql.com
554ae2336e change file name to avoid conflict 
corrected mistake in previous patch
 2004-11-18 21:42:25 +00:00
joreland@mysql.com
64382cdcf3 wl2077 - ndb scan optimizations 2004-11-18 22:41:31 +01:00
tomas@poseidon.ndb.mysql.com
21e8a09056 bug#6677 bug#6684 2004-11-18 21:15:18 +00:00
konstantin@mysql.com
fec630622b Some comments regarding Bug#6275 ""client_test" fail in 4.1.7 make test" 2004-11-18 23:35:45 +03:00
tomas@poseidon.ndb.mysql.com
f30ce1ecaf adopted testprograms to changes in mgmapi 2004-11-18 20:35:19 +00:00
joreland@mysql.com
b5a59ca804 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/wl2077
 2004-11-18 21:28:38 +01:00
heikki@hundin.mysql.fi
acc0317bb7 fil0fil.h, fil0fil.c: 
Fix bug introduced in 4.1.1: InnoDB no longer respected the data file max size given in :autoextend:max:
 2004-11-18 22:28:37 +02:00
tomas@poseidon.ndb.mysql.com
3f36910639 fix for mysqladmin link problem 
.c -> .cc
    fix source dist problem for ndb
    fix type check problem for mysqladmin
 2004-11-18 20:28:36 +00:00
joreland@mysql.com
ffad3d6b7a Merge mysql.com:/home/jonas/src/mysql-4.1-fix 
into mysql.com:/home/jonas/src/wl2077
 2004-11-18 20:56:56 +01:00
joreland@mysql.com
5e0d7711c2 wl2077 moved inline to .hpp file 2004-11-18 20:54:35 +01:00