magnus@shellback.(none)
19787199ec
Correct merge problem
2004-09-28 08:53:21 +02:00
magnus@shellback.(none)
94b305b226
Merge
2004-09-26 16:21:15 +02:00
magnus@shellback.(none)
059941db21
WL#1424 Updated after review
...
* Changed the implementation of ndbcluster_find_files to be more efficient, using only one mutex lock
* Moved ha_find_files to end of mysql_find_files so that it can be passed the list that we are interested to find.
2004-09-26 16:11:24 +02:00
tomas@poseidon.ndb.mysql.com
71d5ea8f85
fix for invalidating table if mismatch with frm
...
removed debug printout
new test in alter table for dictionay update test with multiple connections
added coice of setting MaxNoOfOrderedIndexes
added option to run "--small-bench"
2004-09-24 16:58:25 +00:00
tomas@poseidon.ndb.mysql.com
0273e84b7f
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
2004-09-24 11:07:55 +00:00
bar@noter.intranet.mysql.r18.ru
b5b7801917
logging_ok:
...
Logging to logging@openlogging.org accepted
sql_show.cc, type_enum.test, type_enum.result:
Bug #5628 German characters in field-defs will be '?' with some table definitions
2004-09-24 13:14:44 +05:00
konstantin@mysql.com
aa80184072
A fix and test case for bug#5688 "Upgraded 4.1.5 Server seg faults"
2004-09-23 18:01:55 +04:00
dlenev@mysql.com
12f7fb8233
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-memroot
2004-09-23 16:41:35 +04:00
hf@deer.(none)
7f7f7b0d5f
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.5371
2004-09-23 17:01:30 +05:00
guilhem@mysql.com
00d2e803dc
Fix for BUG#5705: "SET CHARATER_SET_SERVERetc will be lost if STOP SLAVE before following query":
...
we do not increment rli->group_master_log_pos if we are just after a SET ONE_SHOT (it's not a standalone event)
2004-09-23 12:16:56 +02:00
hf@deer.(none)
5301a08091
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.5371
2004-09-23 15:12:32 +05:00
dlenev@mysql.com
d2a2904719
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-memroot
2004-09-23 13:52:00 +04:00
dlenev@brandersnatch.localdomain
f5d1b711c6
Implementation of Monty's idea about clear_alloc_root() optimization and cleanup of work
...
with memory roots in THD/Statement/Item_arena.
Added assertions preventing memory allocation on bzero'ed MEM_ROOT since it is worked by
pure luck and was very ineffective.
2004-09-23 13:48:17 +04:00
hf@deer.(none)
d8c626eb53
Additional fix for bug #5136 (Geometry object is corrupted when queried)
...
CREATE TABLE t1 SELECT POINT(1,2); fixed
2004-09-22 22:36:53 +05:00
konstantin@mysql.com
36548b10ca
A fix and test case for Bug#5315 "mysql_change_user() doesn't free
...
prepared statements."
2004-09-22 15:50:07 +04:00
tomas@poseidon.ndb.mysql.com
a0317069e5
Merge
2004-09-21 12:56:05 +00:00
tomas@poseidon.ndb.mysql.com
b2c696393d
bug#5591
2004-09-21 12:52:56 +00:00
magnus@neptunus.(none)
61be5a9c27
Merge
2004-09-21 14:19:42 +02:00
tomas@poseidon.ndb.mysql.com
b1fa0304e8
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
2004-09-21 12:19:41 +00:00
magnus@neptunus.(none)
58899f0137
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into neptunus.(none):/home/magnus/mysql/wl/wl1424_discover_2
2004-09-21 12:23:27 +02:00
magnus@neptunus.(none)
0097c6d9b2
Changed WL#1424 to use the function ha_find_files. This is a simpler implementation and all handler specific code is hidden in the appropriate handler.
2004-09-21 12:13:58 +02:00
brian@private-client-ip-101.oz.net
ce218b9b99
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into private-client-ip-101.oz.net:/Users/brian/mysql/mysql-4.1
2004-09-21 10:18:33 +02:00
brian@brian-akers-computer.local
9dbe9d533e
The major change for this changeset is the addition of code to handle:
...
OPTIMIZE TABLE <archive table>
This recompresses the table, thus removing any additional gzip headers caused by opening/closing or flushing the table.
2004-09-21 03:33:22 +02:00
joreland@mysql.com
b5fe917271
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-20 20:56:16 +02:00
joreland@mysql.com
ee75c45d9d
fix updated signature
2004-09-20 20:50:48 +02:00
tomas@poseidon.ndb.mysql.com
3473effec4
suggested fix for bug 5591 adn corrct select count() with several clients
2004-09-20 15:52:19 +00:00
magnus@neptunus.(none)
08312bfb32
Merge changes
2004-09-20 17:34:32 +02:00
magnus@neptunus.(none)
2a344c0bc1
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into neptunus.(none):/home/magnus/mysql/wl/wl1424_discover_2
2004-09-20 17:32:40 +02:00
joreland@mysql.com
efb0ae38af
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-20 17:25:55 +02:00
magnus@neptunus.(none)
cdc7a32f37
Merged Thd_ndb
2004-09-20 14:28:43 +02:00
mysql@mc04.(none)
f4721210db
Hand merge
2004-09-20 14:20:01 +02:00
joreland@mysql.com
b931460546
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-20 13:36:23 +02:00
magnus@neptunus.(none)
9aab724d6c
Ues buf pointer in get_ndb_value
...
Merge fixes
2004-09-20 12:40:53 +02:00
magnus@neptunus.(none)
47168d1219
Merged new ndb_insert.test and .result
2004-09-20 11:14:31 +02:00
konstantin@mysql.com
4230eae857
A fix and test case for bug#5510 "inserting Null in AutoIncrement primary
...
key Column Fails".
2004-09-18 01:10:09 +04:00
tomas@poseidon.ndb.mysql.com
4c45731881
Preparation for batching
2004-09-17 14:58:08 +00:00
tomas@poseidon.(none)
4bfe7efeb0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
2004-09-17 00:14:40 +00:00
tomas@poseidon.(none)
87ba45e99b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
2004-09-16 23:36:48 +00:00
igor@rurik.mysql.com
c12c9af224
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2004-09-16 13:53:22 -07:00
marko@hundin.mysql.fi
a660499cd9
Merge marko@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-09-16 19:09:38 +03:00
bell@sanja.is.com.ua
b1374836b3
wording fixed
2004-09-16 18:37:26 +03:00
bell@sanja.is.com.ua
97a1418d16
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-update-4.1
2004-09-16 17:47:53 +03:00
bell@sanja.is.com.ua
f6dba131eb
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-sum-4.1
2004-09-16 16:24:46 +03:00
jani@rhols221.adsl.netsonic.fi
ac55486644
A fix for MetroWerks compiler.
2004-09-16 16:24:45 +03:00
bar@mysql.com
7c4ab566d2
Return character strings in table, type, possible_keys, key fields
...
of EXPLAIN SELECT, rather than binary strings.
2004-09-16 14:47:39 +05:00
igor@rurik.mysql.com
c9265171dc
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2004-09-16 01:23:38 -07:00
mysql@mc04.(none)
d905188230
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into mc04.(none):/space/mysql/mysql-4.1-ndb
2004-09-16 09:21:49 +02:00
igor@rurik.mysql.com
cfbd2b7f7a
opt_sum.cc:
...
Slightly improved the fix for bug #5406 .
2004-09-15 23:52:46 -07:00
bar@mysql.com
e39a5033f2
item.cc:
...
Bug #5561 No BINARY_FLAG in metadata
2004-09-16 11:12:49 +05:00
mskold@mysql.com
251fe25bf8
Optimzed handling of NO_AUTO_VALUE_ON_ZERO
2004-09-16 04:55:22 +02:00