Commit graph

32414 commits

Author SHA1 Message Date
bar@mysql.com
36e92839fc m_ctype.h:
Removing duplicate old definition.
  After merge fix for bug#15375
2006-03-23 13:05:13 +04:00
mskold@mysql.com
260270124e Added type tags to operations 2006-03-23 09:57:58 +01:00
mskold@mysql.com
25c149da04 Fix for Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transaction already aborted' 2006-03-23 09:48:46 +01:00
bar@mysql.com
1008146d86 Merge mysql.com:/usr/home/bar/mysql-4.1.b15376
into  mysql.com:/usr/home/bar/mysql-5.0
2006-03-23 12:41:28 +04:00
lars@mysql.com
9e357e7464 Merge mysql.com:/users/lthalmann/bk/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
2006-03-23 09:38:17 +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
a4d4ed9ec8 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0
2006-03-23 12:27:10 +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
lars@mysql.com
a35a81c7e5 New file to remove sleeps in mysql-test-run (backported from 5.1) 2006-03-23 09:19:01 +01:00
bar@mysql.com
6ed5cdfd57 ctype-czech.c:
Fixing wrong min_sort_char.
2006-03-23 12:15:13 +04:00
bar@mysql.com
d97d48cb26 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b17374
2006-03-23 11:51:46 +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)
bc4f7bfd74 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-23 08:23:33 +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
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