gshchepa/uchum@gshchepa.loc
fbed482689
Patch to eliminate compilation errors under VC after bug #13191 fix.
2007-04-29 11:56:23 +05:00
gshchepa/uchum@gshchepa.loc
87c6ef4c30
Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-4.1-opt
...
into gshchepa.loc:/home/uchum/work/bk-trees/mysql-4.1-opt-13191
2007-04-29 05:31:53 +05:00
gshchepa/uchum@gshchepa.loc
bdebe3f5b4
Adjusted results after the fix for bug #20710 .
2007-04-29 05:06:14 +05:00
gshchepa/uchum@gshchepa.loc
3adcb94ede
Fixed bug #13191 .
...
INSERT...ON DUPLICATE KEY UPDATE may cause error 1032:
"Can't find record in ..." if we are inserting into
InnoDB table unique index of partial key with
underlying UTF-8 string field.
This error occurs because INSERT...ON DUPLICATE uses a wrong
procedure to copy string fields of multi-byte character sets
for index search.
2007-04-29 04:16:17 +05:00
gshchepa/uchum@gshchepa.loc
3322b3c0b9
Fixed bug #20710 .
...
This bug occurs when error message length exceeds allowed limit: my_error()
function outputs "%s" sequences instead of long string arguments.
Formats like %-.64s are very common in errmsg.txt files, however my_error()
function simply ignores precision of those formats.
2007-04-29 00:50:33 +05:00
df@pippilotta.erinye.com
d769072236
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build-work
2007-04-28 20:26:15 +02:00
svoj@mysql.com/june.mysql.com
0c7631e763
BUG#27998 - mysqld crashed when executing INSERT DELAYED
...
on a BLACKHOLE table
Using INSERT DELAYED on BLACKHOLE tables could lead to server
crash.
This happens because delayed thread wants to upgrade a lock,
but BLACKHOLE tables do not have locks at all.
This patch rejects attempts to use INSERT DELAYED on MERGE
tables.
2007-04-28 14:37:40 +05:00
df@pippilotta.erinye.com
94f710f750
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build-work
2007-04-27 08:33:28 +02:00
svoj@mysql.com/april.(none)
f698977298
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-build
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
2007-04-27 00:32:51 +05:00
joerg@trift-lap.fambruehe
69d39592b9
Merge trift-lap.fambruehe:/MySQL/M41/mysql-4.1
...
into trift-lap.fambruehe:/MySQL/M41/push-4.1
2007-04-26 16:09:19 +02:00
df@pippilotta.erinye.com
085a3d55ef
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build-work
2007-04-24 11:50:13 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
1d0f9bed85
Merge mysql.com:/home/ram/work/mysql-4.1-maint
...
into mysql.com:/home/ram/work/b27515/b27515.4.1
2007-04-24 14:33:15 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
250ae972e7
Merge mysql.com:/home/ram/work/mysql-4.1-maint
...
into mysql.com:/home/ram/work/b27515/b27515.4.1
2007-04-24 14:20:28 +05:00
tsmith@quadxeon.mysql.com
12147d9553
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
2007-04-23 21:36:46 +02:00
joerg@debian.(none)
e791812895
Merge debian.(none):/M41/mysql-4.1
...
into debian.(none):/M41/push-4.1
2007-04-23 11:36:30 +02:00
msvensson@pilot.blaudden
d26965c361
Protect against killing pid's that would "killall" or "kill self"
2007-04-23 11:01:22 +02:00
df@pippilotta.erinye.com
1e3988ecfe
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build-work
2007-04-20 14:20:22 +02:00
gshchepa/uchum@gshchepa.loc
f5a229b3d1
Bug#27704: incorrect comparison of rows with NULL components
...
Support for NULL components was incomplete for row comparison,
fixed. Added support for abort_on_null at compare_row() like
in 5.x
2007-04-20 15:14:09 +05:00
svoj@mysql.com/june.mysql.com
d55cddad93
Fixed a warning on win64.
2007-04-19 11:53:25 +05:00
msvensson@pilot.blaudden
905996141d
Use my_snprintf instead of snprintf
2007-04-18 18:38:03 +02:00
msvensson@pilot.blaudden
e9a9107f4f
Add mysql builtin $MYSQL_SERVER_VERSION and some function to make
...
it easier to set a variable from string or int
2007-04-18 16:56:17 +02:00
msvensson@pilot.blaudden
a247bd582e
Make it possible to define how many slaves to start by
...
writing --slave-num=n in <testname>-master.opt file
2007-04-18 13:50:54 +02:00
svoj@mysql.com/june.mysql.com
aa432f0ffb
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG24342/mysql-4.1-engines
2007-04-18 16:16:58 +05:00
tsmith@siva.hindu.god
024aed165d
Merge siva.hindu.god:/home/tsmith/m/bk/41
...
into siva.hindu.god:/home/tsmith/m/bk/maint/41
2007-04-17 15:38:59 -06:00
joerg@trift2.
97d1cd0fed
Merge trift2.:/MySQL/M41/test-help-4.1
...
into trift2.:/MySQL/M41/push-4.1
2007-04-17 19:48:18 +02:00
df@pippilotta.erinye.com
f001a21e68
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build-work
2007-04-17 16:08:31 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
f4060b4b81
Fix for bug #27515 : DROP previlege is not required anymore for RENAME TABLE
...
Added missed DROP privilege check on the original table for RENAME TABLE command.
2007-04-17 16:52:50 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
cf18d38c83
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/d2/hf/mrg/mysql-4.1-opt
2007-04-14 14:54:28 +05:00
msvensson@pilot.blaudden
7df5e05b4d
Add missing option --manual-ddd
...
Change syntax to start manual gdb/ddd to avoid having to
cd to the mysql-test directory before calling the command
2007-04-13 14:40:52 +02:00
svoj@mysql.com/april.(none)
005d8c5284
BUG#25951 - ignore/use index does not work with fulltext
...
IGNORE/USE/FORCE INDEX hints were honored when choosing FULLTEXT
index.
With this fix these hints are ignored. For regular indexes we may
perform table scan instead of index lookup when IGNORE INDEX was
specified. We cannot do this for FULLTEXT in NLQ mode.
2007-04-13 02:31:34 +05:00
tomas@whalegate.ndb.mysql.com
8a98276ba7
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-opt
2007-04-12 19:49:21 +02:00
igor@olga.mysql.com
520b144007
Fixed bug #27484 : a crash when incompatible row expressions with nested rows
...
are used as arguments of the IN predicate.
Added a function to check compatibility of row expressions. Made sure that this
function to be called for Item_func_in objects by fix_length_and_dec().
2007-04-11 11:41:12 -07:00
jonas@perch.ndb.mysql.com
d76e039ae7
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2007-04-11 08:26:52 +02:00
jonas@perch.ndb.mysql.com
bb1adff862
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2007-04-11 08:26:23 +02:00
jonas@perch.ndb.mysql.com
f52b0e3768
ndb - bug#27748
...
fix commit trigger on multi-update
2007-04-11 08:23:16 +02:00
df@pippilotta.erinye.com
6ed189d09f
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build-work
2007-04-11 08:12:02 +02:00
kent@mysql.com/kent-amd64.(none)
c92faf9d61
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kent/bk/tmp3/mysql-4.1-build
2007-04-11 01:51:33 +02:00
svoj@mysql.com/april.(none)
bcbcacb8da
BUG#24342 - Incorrect results with query over MERGE table
...
MERGE engine may return incorrect values when several representations
of equal keys are present in the index. For example "groß" and "gross"
or "gross" and "gross " (trailing space), which are considered equal,
but have different lengths.
The problem was that key length was not recalculated after key lookup.
Only MERGE engine is affected.
2007-04-11 01:40:35 +05:00
msvensson@pilot.blaudden
8d0755ba47
Update result(which mysterioulsy got lost)
2007-04-10 17:33:04 +02:00
msvensson@pilot.blaudden
9917d018a6
Take into account wether vertical_results are in effect
2007-04-10 17:09:35 +02:00
msvensson@pilot.blaudden
73c6cde9d4
Init dying to 1 just after passing the guard
2007-04-10 17:06:36 +02:00
msvensson@pilot.blaudden
da2a216895
Add OPT_LOG_DIR
2007-04-10 17:05:22 +02:00
msvensson@pilot.blaudden
f194cbe62a
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-04-10 14:58:55 +02:00
msvensson@pilot.blaudden
5c5271754b
Add --logdir option ot mysqltest
2007-04-10 14:45:13 +02:00
msvensson@pilot.blaudden
60eb839e77
Merge 192.168.0.4:mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-04-10 13:51:32 +02:00
joerg@trift2.
da80df125a
Merge trift2.:/MySQL/M41/mysql-4.1
...
into trift2.:/MySQL/M41/push-4.1
2007-04-07 20:58:01 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
df913ae06a
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/d2/hf/mrg/mysql-4.1-opt
2007-04-07 11:35:14 +05:00
msvensson@shellback.(none)
2df8524391
Add "query_sorted" command to mysqltest
...
Usage:
query_sorted <query>;
2007-04-05 20:12:56 +02:00
msvensson@pilot.blaudden
9cd8b2b8fb
Protect against dying twice
...
Cleanup exit handling
2007-04-05 13:53:44 +02:00
kent@mysql.com/kent-amd64.(none)
8cc67c011e
Deleted reject files accidently checked in
...
configure.in.rej
include/my_global.h.rej
BUILD/SETUP.sh.rej
mysys/thr_alarm.c.rej
include/my_pthread.h.rej
2007-04-05 08:30:16 +02:00