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
tomas@poseidon.ndb.mysql.com
b444c28e2a
bug#6684, error messages id wrong settings
2004-11-18 19:07:14 +00:00
tomas@poseidon.ndb.mysql.com
1ef2b36369
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 18:39:25 +00:00
tomas@poseidon.ndb.mysql.com
7ec0239162
changed mysqladmin.c to mysqladmin.cc
...
no need for dvlags to have DEFINE_CXA_PURE_VIRTUAL anymore
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
enabled multiple management servrs to fetch data configurations from eachother
2004-11-18 18:38:38 +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
serg@serg.mylan
19067008b8
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-17 17:54:15 +01:00
guilhem@mysql.com
f04832b52d
time independent test
2004-11-17 17:06:24 +01:00
guilhem@mysql.com
d34421c127
Fixes for compilation errors in Windows (casts from uint32* to uint*) in repl and charset code.
...
Moving the part of user_var.test using UCS2 to ctype_ucs.test
2004-11-17 16:41:30 +01:00
serg@serg.mylan
37e872de8c
merged
2004-11-17 15:28:37 +01:00
serg@serg.mylan
2d8c21f700
test for bug#5528
2004-11-17 13:38:35 +01:00
tomas@poseidon.ndb.mysql.com
2c677ed687
Merge
2004-11-17 10:59:16 +00:00
tomas@poseidon.ndb.mysql.com
1700bf3844
Enabled usage of new system variables for ndb
...
- ndb_use_exact_count
- ndb_autoincrement_prefetch_sz
- ndb_use_transactions
- ndb_force_send
moved "inlined" functions to .cc file since they are virtual anyways
enabled printout od ndb errors in warnings even if mapping existst to mysql error code
2004-11-17 08:15:53 +00:00
tomas@poseidon.ndb.mysql.com
0acc6f83b2
enabled having system tables in ndb
2004-11-17 08:10:26 +00:00
igor@rurik.mysql.com
078597564d
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2004-11-16 15:07:49 -08:00
sergefp@mysql.com
bfd6c218b2
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug
2004-11-17 01:26:23 +03:00
igor@rurik.mysql.com
e17073c4a2
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2004-11-16 14:01:40 -08:00
igor@rurik.mysql.com
9edff6c591
key_cache.result, key_cache.test:
...
Added a test case for bug #6447 .
mf_keycache.c:
Fixed bug #6447 . Erronious code in the key_cache_read function
caused problems when reading key blocks with offset>0 into
key cache. The code of key_cache_insert and key_cache_write
was modified similarly.
2004-11-16 13:58:49 -08:00
heikki@hundin.mysql.fi
2b1117702e
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2004-11-16 22:50:29 +02:00
heikki@hundin.mysql.fi
b560503386
ha_innodb.cc:
...
Anthony's http://lists.mysql.com/internals/18505 patch for DROP DATABASE broke caused it to return errno if .ibd files were present (bas_ext() was obsolete in ha_innodb.cc); fix this
2004-11-16 22:49:28 +02:00
konstantin@mysql.com
a38ac4b26d
Fix comment.
2004-11-16 23:27:31 +03:00
heikki@hundin.mysql.fi
ea59300d62
ha_innodb.cc:
...
Manually ported this bug fix from 4.0:
Fix InnoDB bug #6287 : if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
2004-11-16 20:45:52 +02:00
heikki@hundin.mysql.fi
dd64377dc2
ha_innodb.cc:
...
Fix InnoDB bug #6287 : if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
2004-11-16 20:37:42 +02:00
sergefp@mysql.com
1cc999fbd4
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug
2004-11-16 21:36:31 +03:00
tomas@poseidon.ndb.mysql.com
a69ddb033d
ha_ndbcluster.cc:
...
reverting previous patch
2004-11-16 13:56:25 +00:00
bar@mysql.com
ba5e76a83d
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1
2004-11-16 16:50:17 +04:00
bar@mysql.com
4e674084f6
ctype-tis620.c:
...
Space allocated didn't take in account trailing '\0' bytes.
2004-11-16 16:45:47 +04:00
ram@gw.mysql.r18.ru
f0355a6737
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6449
2004-11-16 16:10:45 +04:00
tomas@poseidon.ndb.mysql.com
8ee2a1836e
Also print warning if there is an ndb->mysql errorcode mapping, this since the warning provides valuable info to the user
2004-11-16 12:10:44 +00:00
ram@gw.mysql.r18.ru
dde88ea82b
A fix (bug #6449 : DO server-crashing bug).
2004-11-16 14:36:25 +04:00
tomas@poseidon.ndb.mysql.com
5b905808d9
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-16 09:28:17 +00:00
tomas@poseidon.ndb.mysql.com
4d89516226
Makefile.am:
...
changed link order to fix linking problems
2004-11-16 09:10:29 +00:00
