Commit graph

32125 commits

Author SHA1 Message Date
pekka@mysql.com
c54b8647d4 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/export/space/pekka/ndb/version/my51
2006-03-23 11:35:54 +01:00
bar@mysql.com
fb7826ed25 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-23 12:27:23 +04:00
bar@mysql.com
e4b6264f6c Merge mysql.com:/usr/home/bar/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-23 12:22:39 +04:00
bar@mysql.com
6ed5cdfd57 ctype-czech.c:
Fixing wrong min_sort_char.
2006-03-23 12:15:13 +04:00
msvensson@neptunus.(none)
40e6821e07 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-23 08:51:24 +01:00
msvensson@neptunus.(none)
ba2ddc869c Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-23 08:22:11 +01:00
msvensson@neptunus.(none)
c6e6c0d649 Move the replcae result to before the correct select 2006-03-23 08:21:16 +01:00
bar@mysql.com
b372b28e1f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-23 10:25:04 +04:00
bar@mysql.com
ddc37c547f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0
2006-03-23 10:20:40 +04:00
bar@mysql.com
6ab496ac06 Merge mysql.com:/usr/home/bar/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-23 10:19:55 +04:00
bar@mysql.com
82de23010b Merge mysql.com:/usr/home/bar/mysql-4.1.b17374
into  mysql.com:/usr/home/bar/mysql-5.0
2006-03-23 10:17:31 +04:00
pekka@mysql.com
a2263a1fbf ndb - bug#17813 schema.query => blob 2006-03-23 04:59:14 +01:00
monty@mysql.com
905dfa0375 Make usage of the MYSQL struct in shared libraries compatible with MySQL 5.0.17 and
5.0.18 by not reseting or accessing the info_buffer member
2006-03-23 00:37:40 +02:00
msvensson@neptunus.(none)
465b2d38db Fix unused variable warning 2006-03-22 22:37:32 +01:00
msvensson@neptunus.(none)
02b59fd317 Save core files before removing the data_dir 2006-03-22 22:34:48 +01:00
lars@mysql.com
68c2dffb02 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
2006-03-22 18:12:10 +01:00
tomas@poseidon.ndb.mysql.com
6a3b28c25e 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 18:12:09 +01:00
tomas@poseidon.ndb.mysql.com
8598539ea1 ndb: added debug printout to track down a bug 2006-03-22 18:10:56 +01:00
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
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
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
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