mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 02:30:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
15932 commits 2786 branches 343 tags 1.7 GiB
Commit graph

15932 commits

This branch
This branch
All branches
Author SHA1 Message Date
dlenev@mysql.com
4e52cc2ded Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg6266
 2004-11-19 21:51:37 +03:00
dlenev@mysql.com
aaee135243 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg6439
 2004-11-19 21:38:51 +03:00
petr@mysql.com
bc0f2ea51c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/cps/mysql/trees/mysql-4.1
 2004-11-19 20:21:28 +03:00
tomas@poseidon.ndb.mysql.com
65d31b3e92 Makefile.am, mysqladmin.cc: 
reverting linking ndbclisnt to mysqladmin.cc
 2004-11-19 17:21:27 +00:00
tomas@poseidon.ndb.mysql.com
fcb5742696 acinclude.m4: 
reverting my last fix
 2004-11-19 17:18:46 +00:00
tomas@poseidon.ndb.mysql.com
14d4ea8882 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-11-19 17:04:40 +00:00
tomas@poseidon.ndb.mysql.com
12744adc4b corrected some erroneous size calculations in tup 
fixed erroneous error message - set auto increment was done even if create table failed so real error message got lost behind "table not found"
    and simplified code a bit
 2004-11-19 16:58:02 +00:00
dlenev@mysql.com
5627dddb93 Manual merge of fix for bug #6439 "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
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 #6266 "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 #6658 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
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
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
bar@mysql.com
6de458c232 Reuse ctype_common.inc instead of retyping 
the same queries.
 2004-11-19 14:33:55 +04: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
guilhem@mysql.com
631f6f3c30 Merge 2004-11-18 23:31:23 +01: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
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
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
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
mskold@mysql.com
3a63cac113 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-11-18 18:21:20 +01:00
pekka@mysql.com
c273fda5ed ndb: new arbitrator behaviour for >=3-way: < 1/2 nodes can survive 2004-11-18 16:44:50 +01:00
marko@hundin.mysql.fi
766adf172b row0ins.c: 
row_ins_scan_sec_index_for_duplicate(),
  row_ins_duplicate_error_in_clust():
  remove unused variables "ptr"
 2004-11-18 17:01:33 +02:00
mskold@mysql.com
7bbee8c95d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-11-18 15:55:18 +01:00
timour@mysql.com
5d1f920ba7 correct name of function in synopsis 2004-11-18 16:52:45 +02:00
pekka@mysql.com
22973f11c7 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41
 2004-11-18 13:39:47 +01:00
bar@mysql.com
fe3b359b74 Check that the third UNION part with COLLATE 
clause resolves collation conflict for the
first and the second parts pair.
 2004-11-18 16:15:48 +04:00
mskold@mysql.com
a4d061a5d9 Fix for bug#4312 ndb table, wrong behaviour on insert .. on duplicate key .. 2004-11-18 12:11:56 +01:00
pekka@mysql.com
bc31325180 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41
 2004-11-18 11:55:53 +01:00
pekka@mysql.com
b2b7bf0eaa ndb: charset fix from Bar (strxfrm_multiply can be 0) 2004-11-18 11:48:21 +01:00
tomas@poseidon.ndb.mysql.com
15621600b3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
 2004-11-18 08:43:00 +00:00
tomas@poseidon.ndb.mysql.com
f2110823d5 ifdef'd unused table reorg code 2004-11-18 08:42:26 +00:00