lars@mysql.com
9dbc6eac4c
Changed to real_sleep
2006-03-22 17:28:48 +01:00
lars@mysql.com
a8ba8a30a6
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
...
into mysql.com:/users/lthalmann/bk/mysql-5.1-new
2006-03-22 17:28:47 +01:00
msvensson@neptunus.(none)
123f513593
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-22 17:28:46 +01:00
lars@mysql.com
c07b9184aa
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
...
into mysql.com:/users/lthalmann/bk/mysql-5.1-new
2006-03-22 17:28:46 +01:00
tomas@poseidon.ndb.mysql.com
53317ff998
ndb: removed TransporterFacade singleton
2006-03-22 17:28:45 +01:00
msvensson@neptunus.(none)
7d3a809695
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-22 16:52:31 +01:00
msvensson@neptunus.(none)
13c5e780ed
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-22 16:48:35 +01:00
msvensson@neptunus.(none)
bbc4051826
Fix windows results using "replace_result"
2006-03-22 16:47:45 +01:00
tomas@poseidon.ndb.mysql.com
615699a82e
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-22 16:06:34 +01:00
tomas@poseidon.ndb.mysql.com
128cb5821e
changed comment in disabled.def
2006-03-22 16:04:38 +01:00
tomas@poseidon.ndb.mysql.com
e0b655d003
continued:
...
ha_partition should skip ndb specific flags used by sql apply thread to signal idempotency behaviour
2006-03-22 15:56:53 +01:00
jonas@perch.ndb.mysql.com
a9d67fdedc
ndb -
...
post merge fixes
2006-03-22 15:46:51 +01:00
jonas@perch.ndb.mysql.com
612e220115
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2006-03-22 15:24:32 +01:00
jonas@perch.ndb.mysql.com
0afd03f4fc
ndb -
...
fix obscure error lookup
2006-03-22 15:09:52 +01:00
jonas@perch.ndb.mysql.com
f835cc6a54
ndb -
...
Add per partition info (optionally to ndb_desc)
2006-03-22 15:06:44 +01:00
msvensson@neptunus.(none)
451a7129bb
Bug#18071 Result from MATCH() uses too many decimals
...
- Use FORMAT as a workaround to only output the first 6 decimals of the value returned
from MATCH
- This has been done before
2006-03-22 14:57:24 +01:00
jonas@perch.ndb.mysql.com
c0597ff61f
ndb - autotest
...
Update makefile for removed files
2006-03-22 13:38:03 +01:00
jonas@perch.ndb.mysql.com
7e654ee847
ndb -
...
some more ndb-autotest updates (previously uncommitted...but in use)
2006-03-22 12:18:07 +01:00
jonas@perch.ndb.mysql.com
8b9c724121
ndb -
...
minor update to ndb-autotest.sh and config files
2006-03-22 12:11:51 +01:00
bar@mysql.com
d735a60964
Merge mysql.com:/usr/home/bar/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-22 15:10:42 +04:00
msvensson@neptunus.(none)
46b5b6c644
Dsiable udf.test waiting for a check wheter udf_example.so exists
2006-03-22 12:03:15 +01:00
tomas@poseidon.ndb.mysql.com
940d0e8757
ha_partition should skip ndb specific flags used by sql apply thread to signal idempotency behaviour
2006-03-22 11:45:14 +01:00
jonas@perch.ndb.mysql.com
659933a2c3
ndb - bug#18414
...
Fix timeout during ABORT when ZABORT_TIMEOUT_BREAK is outstanding
2006-03-22 11:44:31 +01:00
tomas@poseidon.ndb.mysql.com
046944dea0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-22 11:13:29 +01:00
msvensson@neptunus.(none)
89a5b96ee4
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-22 11:12:28 +01:00
tomas@poseidon.ndb.mysql.com
886b1b8661
corrected previous patch
2006-03-22 10:54:55 +01:00
lars@mysql.com
ad7c20c7c4
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
...
into mysql.com:/users/lthalmann/bk/mysql-5.1-new
2006-03-22 10:50:46 +01:00
tomas@poseidon.ndb.mysql.com
c8131d283a
added config parameter InitialNoOfOpenFiles
2006-03-22 10:17:29 +01:00
bar@mysql.com
cab060d2e2
Merge mysql.com:/usr/home/bar/mysql-4.1.b18004
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-03-22 13:11:31 +04:00
bar@mysql.com
235c5d35a3
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.b18172
2006-03-22 13:01:16 +04:00
bar@mysql.com
1ddf3c2705
item_xmlfunc.cc:
...
After review fix.
Thanks to Gluh for suggestion.
Bug#18172: XML: Extractvalue() accepts mallformed XPath without a XPath syntax error
2006-03-22 12:57:41 +04:00
tomas@poseidon.ndb.mysql.com
1dc65faf16
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-22 09:36:53 +01:00
lars@mysql.com
e0e39bf656
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
...
into mysql.com:/users/lthalmann/bk/mysql-5.1-new
2006-03-22 08:42:45 +01:00
msvensson@neptunus.(none)
414242b338
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-22 07:59:55 +01:00
msvensson@neptunus.(none)
ffe694b831
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-22 07:57:56 +01:00
georg@lmy002.wdf.sap.corp
fe779f7a6f
Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.1
2006-03-22 05:51:12 +01:00
mats@mysql.com
cd550dd5db
Post-merge fixes after merging mysql-5.0 with mysql-5.1-new
2006-03-22 00:47:36 +01:00
georg@lmy002.wdf.sap.corp
556fbe7d68
fixed merge problem (bk commit - 5.1 tree (anozdrin:1.2163)
...
(approved by kostja)
2006-03-21 22:02:36 +01:00
mats@mysql.com
75834b6e01
Merge mysql.com:/home/bkroot/mysql-5.0
...
into mysql.com:/home/bk/b18293-mysql-5.1-new
2006-03-21 20:17:28 +01:00
msvensson@neptunus.(none)
dcceaae8b6
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-21 20:08:25 +01:00
msvensson@neptunus.(none)
91197c354b
Merge neptunus.(none):/home/msvensson/mysql/bug18310/my51-bug18310
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-21 20:05:55 +01:00
msvensson@neptunus.(none)
ede2943ea0
Merge neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-21 18:51:47 +01:00
msvensson@neptunus.(none)
31b52662a1
Merge neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-21 18:50:27 +01:00
lars@mysql.com
20290ee5f6
Made rpl_flushlog_loop use wait_slave_status instead of sleep.
...
This to save 5 seconds of test time.
More test to follow. :-)
2006-03-21 17:40:51 +01:00
msvensson@neptunus.(none)
033059d5b4
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/bug18310/my51-bug18310
2006-03-21 17:19:02 +01:00
msvensson@neptunus.(none)
81f83e5c0a
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/bug18310/my51-bug18310
2006-03-21 17:15:55 +01:00
msvensson@neptunus.(none)
1878f79bba
Merge neptunus.(none):/home/msvensson/mysql/bug18310/my50-bug18310
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-21 17:14:49 +01:00
msvensson@neptunus.(none)
b248885b02
Bug#18310 Server compiled with yassl crash
...
- Add protection so that 'show_ssl_get_cipher_list' does not write after end of "buff"
2006-03-21 17:02:46 +01:00
tomas@poseidon.ndb.mysql.com
f9c16f2682
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-21 16:56:11 +01:00
tomas@poseidon.ndb.mysql.com
bd9f9533fb
Bug #18395 dual mysqld's with binlog do not sync drop table binlog event correctly
...
- in ndb_binlog_thread_handle_schema_event make sure to postpone "slock achnowledgement" until event has been put into the binlog
+ some cleanup, Cluster_replication_schem -> Cluster_schema, indentation
2006-03-21 16:54:56 +01:00