sergefp@mysql.com
60f2321b51
Merge
2006-02-05 23:49:32 +03:00
pekka@mysql.com
66c52cbdb8
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/space/pekka/ndb/version/my51
2006-02-05 19:13:05 +01:00
pekka@mysql.com
738db4f1a2
ndb - rbr blobs works now (or again)
2006-02-05 19:11:11 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
d955abd292
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2006-02-05 11:06:29 +02:00
aelkin@mysql.com
0c95fd2376
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/tmp_merge
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1-new
2006-02-04 11:06:17 +02:00
konstantin@mysql.com
a55b7a9f13
A post-merge fix.
2006-02-03 23:21:17 +03:00
konstantin@mysql.com
5e03bf7f93
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-03 21:10:03 +03:00
jonas@perch.ndb.mysql.com
420204c994
Merge perch.ndb.mysql.com:/home/jonas/src/51-new
...
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
2006-02-03 15:37:36 +01:00
jonas@perch.ndb.mysql.com
e9692dffa5
ndb dd
...
Fix a copule of dd bugs
typo in lgman, potential run-time crash
inconsistency in tup, potentially causing crash after SR
2006-02-03 15:30:24 +01:00
jonas@eel.(none)
e29db06753
ndb dd -
...
Fix possible deadlock when running with small log buffer, causing buffer to be full, but not page getting flushed
2006-02-03 10:53:43 +01:00
anozdrin@mysql.com
c6881fb936
Merge mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.1.6-release-15588
...
into mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.1-tree
The idea of this merge is to "synchronize" 5.1-release tree (5.1.6) and
the main 5.1 tree. A patch for BUG#15588/BUG#16621 was copied into
5.1-release from 5.0 since it is important. This patch is expected to
come into the 5.1 tree after resolving 5.0 -> 5.1 megrge logjam.
2006-02-03 11:59:55 +03:00
anozdrin@mysql.com
c69961ff7f
Copied patch for BUG#15588 (BUG#16621) from 5.0 into 5.1-release.
2006-02-03 01:49:33 +03:00
konstantin@mysql.com
9f0bb47f87
Merge mysql.com:/home/kostja/mysql/tmp_merge
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-02 23:27:06 +03:00
jonas@eel.(none)
4130141aed
Merge localhost:src/51-new
...
into eel.(none):/home/jonas/src/mysql-5.1-new
2006-02-02 20:18:50 +01:00
jonas@eel.(none)
200a0d8cf1
ndb - remove debug printouts
2006-02-02 20:15:51 +01:00
dlenev@mysql.com
36e9bd0344
Merge mysql.com:/home/dlenev/src/mysql-5.1-bfix
...
into mysql.com:/home/dlenev/src/mysql-5.1-merges
2006-02-02 22:12:06 +03:00
joerg@mysql.com
af396ba40f
storage/example/ha_example.cc
...
Copied from the general tree, to solve a build problem:
ChangeSet 1.2121.1.5 2006/02/02 11:02:09 stewart@mysql.com
build fix when building with example storage engine.
2006-02-02 19:40:58 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
3f53939299
Merge bk://localhost:6667
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2006-02-02 20:02:00 +02:00
konstantin@mysql.com
e3663e7659
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-02 20:54:07 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
29a87c4263
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2006-02-02 18:50:45 +02:00
jani@ua141d10.elisa.omakaista.fi
57beb6c10b
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new
2006-02-02 18:08:51 +02:00
tomas@poseidon.ndb.mysql.com
6e0d64565f
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-02-02 16:44:22 +01:00
tomas@poseidon.ndb.mysql.com
ce8308a503
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-02-02 16:19:49 +01:00
tomas@poseidon.ndb.mysql.com
8978db5ec6
added more logging in ndb handler
...
enable extra logging in ndb handler during test runs
2006-02-02 16:12:18 +01:00
tomas@poseidon.ndb.mysql.com
a4357007cd
disabled test because of bug, bug assigned and being worked on
2006-02-02 15:53:44 +01:00
tomas@poseidon.ndb.mysql.com
467720abf0
disbled sporadically failing testcase
2006-02-02 15:24:52 +01:00
jani@ua141d10.elisa.omakaista.fi
2dcc483e6c
Several Netware specific fixes.
2006-02-02 16:22:31 +02:00
konstantin@mysql.com
c2cc87aab7
Merge mysql.com:/home/kostja/mysql/tmp_merge1
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-02 17:20:44 +03:00
jonas@perch.ndb.mysql.com
fa585eb413
ndb dd - fix newly introduced bug in drop table
2006-02-02 15:08:25 +01:00
konstantin@mysql.com
92b41ba92a
Merge mysql.com:/home/kostja/mysql/tmp_merge
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-02 16:57:34 +03:00
jonas@perch.ndb.mysql.com
0b2825ec96
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-02-02 13:56:14 +01:00
jonas@perch.ndb.mysql.com
7fb2168081
ndb dd
...
Fix SR bug that extent pages was scanned before undo was run
Fix bug wrt page flushing/tsman and tup's dirty page list
2006-02-02 12:23:23 +01:00
dlenev@mysql.com
3fc6cf1494
Merge mysqldev@production.mysql.com:my/mysql-5.1-release/
...
into mysql.com:/home/dlenev/src/mysql-5.1-bfix
2006-02-02 13:53:35 +03:00
msvensson@neptunus.(none)
5e31bff387
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my50-mysqltest_float_result
...
into neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my51-mysqltest_float_result
2006-02-02 11:46:57 +01:00
msvensson@neptunus.(none)
01ddf96930
Convert exponent results for MYSQL_TYPE_FLOAT on Windows
2006-02-02 11:45:37 +01:00
dlenev@mysql.com
5845476009
Yet another addition to the fix for BUG#9412 "Triggers: should have trigger
...
privilege".
Corrected addition of TRIGGER privilege by "mysql_fix_privilege_tables" script.
Problem with it should have been caught by system_mysql_db/system_mysql_db_fix
tests but they were disabled. Enabled them back.
2006-02-02 13:36:07 +03:00
tomas@poseidon.ndb.mysql.com
b40c942509
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-release
...
into poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-02-02 11:13:36 +01:00
tomas@poseidon.ndb.mysql.com
c62ce023d2
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-02-02 11:09:12 +01:00
tomas@poseidon.ndb.mysql.com
92ffe8cf0d
Bug #16753 DD: mysqldump does not support Cluster Disk Data backups
2006-02-02 10:56:04 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
2b683b86b0
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2006-02-02 11:16:38 +02:00
konstantin@mysql.com
065f8066d5
Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-02 12:03:35 +03:00
stewart@mysql.com
bcb4178c73
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/stewart/Documents/MySQL/5.1/new
2006-02-02 18:11:10 +11:00
elliot@mysql.com
6d4c7e5741
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge
2006-02-02 01:46:10 -05:00
jonas@perch.ndb.mysql.com
9a94c4238c
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-02-02 07:22:20 +01:00
jonas@perch.ndb.mysql.com
772c1f3086
bug#10987 - ndb - remove extra printouts, used to track volatile bug
2006-02-02 07:21:23 +01:00
bar@mysql.com
5b3e50efb9
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1.new.ctype
2006-02-02 10:09:35 +04:00
bar@mysql.com
d7c773834b
WL#1386 - CTYPE table for unicode character sets
...
A prerequisite for several fulltext and XML bugs.
MY_CHARSET_HANDLER now has a new function "ctype"
to detect a type of the next character in a string
(i.e. digit, letter, space, punctuation, control, etc),
which now works correctly for both 8bit and multibyte charsets.
Previously only 8bit charsets worked correctly,
while any multibyte character was considered as letter
in multibyte charsets.
Many files:
Adding new function
Makefile.am:
Adding build rules for uctypedump,
a dump tool to create my_uctype.h
using Unicode Character Database file.
m_ctype.h:
Adding declaration of my_uni_ctype,
ctype data for Unicode.
Adding new member into MY_CHARSET_HANDLER
Makefile.am:
Adding my_uctype.h into noinst_HEADERS
my_uctype.h, uctypedump.c:
new files:
ctype data for unicode,
and the tool to generate it from
a Unicode Character Database file.
2006-02-02 10:07:47 +04:00
elliot@mysql.com
e1759fea1b
Post-merge fixes.
2006-02-02 00:37:42 -05:00
stewart@mysql.com
3ca777e443
build fix for solaris 10 sparc -max
2006-02-02 16:14:31 +11:00
elliot@mysql.com
d843b119d0
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge
2006-02-01 19:35:15 -05:00