msvensson@pilot.blaudden
d2c02cd10d
Add "append_file" command to mysqltest
2007-02-19 16:39:50 +01:00
msvensson@pilot.blaudden
c2c4604580
Don't output escape char from 'do_eval' on windows. "It" won't
...
know it's an escape char.
Replace /dev/null with NUL
Replace "closed stdout" with "not open fd"
2007-02-19 12:00:17 +01:00
msvensson@pilot.blaudden
dc6f9d5d1b
Merge 192.168.0.10:mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-02-16 15:23:06 +01:00
msvensson@neptunus.(none)
8931166e55
Workaround for problem where cygwin's bash/sh randomly fails with error 128 which
...
mainly occurs on win2003 64bit.
- Execute "exec" commands directly with cmd.exe and replace "--exec echo ..." with "--exec .\echo.exe ..."
2007-02-16 15:19:38 +01:00
msvensson@pilot.blaudden
5349dffb36
Merge 192.168.0.10:mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-02-15 15:56:05 +01:00
msvensson@neptunus.(none)
68158c982d
Merge neptunus.(none):/home/msvensson/mysql/bug10777/my41-bug10777
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2007-02-15 15:04:53 +01:00
cmiller@calliope.local.cmiller/calliope.local
80a35bfd39
Merge calliope.local.cmiller:/Volumes/Source/src/mysql-4.1-maint--bug25126
...
into calliope.local.cmiller:/Volumes/Source/src/mysql-4.1-maint
2007-02-14 12:24:11 -05:00
msvensson@pilot.mysql.com
9f720bb733
Use my_vsnprintf instead of vsnprintf
2007-02-14 16:49:41 +01:00
ibabaev@bk-internal.mysql.com
cf9aca84b3
Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
...
into bk-internal.mysql.com:/data0/bk/mysql-4.1-opt
2007-02-13 21:25:22 +01:00
msvensson@pilot.mysql.com
410939b664
Write some debug info to result log file before dying in 'do_exec'
2007-02-13 18:59:46 +01:00
msvensson@pilot.mysql.com
a0e3ca046b
Reset value of variable "escaped" in "default" label causing $variables not
...
to be expanded in same cases
2007-02-13 16:59:58 +01:00
cmiller@zippy.cornsilk.net
11e8f48734
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2007-02-13 10:54:04 -05:00
holyfoot/hf@mysql.com/hfmain.(none)
ff6119bfba
Merge bk@192.168.21.1:mysql-4.1-opt
...
into mysql.com:/home/hf/work/25492/my41-25492
2007-02-13 01:18:52 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
0004fa3c5b
bug #25492 (Invalid deallocation in mysql_stmt_fetch)
2007-02-13 00:55:45 +04:00
tnurnberg@mysql.com/sin.azundris.com
8dc8e07fcf
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/home/tnurnberg/24660/41-24660
2007-02-12 14:39:45 +01:00
tnurnberg@mysql.com/sin.azundris.com
db7ac2c0c7
Bug#24660: "enum" field type definition problem
...
ENUMs weren't allowed to have character 0xff, a perfectly good character in some locales.
This was circumvented by mapping 0xff in ENUMs to ',', thereby prevent actual commas from
being used. Now if 0xff makes an appearance, we find a character not used in the enum and
use that as a separator. If no such character exists, we throw an error.
Any solution would have broken some sort of existing behaviour. This solution should
serve both fractions (those with 0xff and those with ',' in their enums), but
WILL REQUIRE A DUMP/RESTORE CYCLE FROM THOSE WITH 0xff IN THEIR ENUMS. :-/
That is, mysqldump with their current server, and restore when upgrading to one with
this patch.
2007-02-12 14:31:44 +01:00
cmiller@calliope.local.cmiller/calliope.local
0733ea7462
Bug#25126: Reference to non-existant column in UPDATE...ORDER BY... crashes server
...
"update existingtable set anycolumn=nonexisting order by nonexisting" would crash
the server.
Though we would find the reference to a field, that doesn't mean we can then use
it to set some values. It could be a reference to another field. If it is NULL,
don't try to use it to set values in the Item_field and instead return an error.
Over the previous patch, this signals an error at the location of the error, rather
than letting the subsequent deref signal it.
2007-02-09 11:05:36 +01:00
tsmith@siva.hindu.god
4579445b2a
Merge siva.hindu.god:/home/tsmith/m/bk/41
...
into siva.hindu.god:/home/tsmith/m/bk/maint/41
2007-02-08 16:01:13 -07:00
gluh@mysql.com/eagle.(none)
da9f2149de
Merge mysql.com:/home/gluh/MySQL/Merge/4.1
...
into mysql.com:/home/gluh/MySQL/Merge/4.1-opt
2007-02-08 14:54:49 +04:00
tomas@poseidon.mysql.com
097c8431e2
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.mysql.com:/home/tomas/mysql-4.1-ndb
2007-02-08 00:25:30 +07:00
msvensson@neptunus.(none)
72408c88bd
Bug#10777 ERROR File = sql_lex.cc, Line = 93 The identifier "symbols" is undefined.
...
- Protect againt empty/corrupt lex_hash-h by writing output from gen_lex_hash to
a temporary file first.
2007-02-07 09:46:20 +01:00
msvensson@pilot.mysql.com
b6da082559
Merge 192.168.0.10:mysql/mysql-4.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
2007-02-06 23:01:01 +01:00
msvensson@neptunus.(none)
2fb664cb38
Bug#25344 Segmentation violation when try to run the perror utility
...
- strerror might return NULL on some platforms
2007-02-06 23:00:18 +01:00
msvensson@pilot.mysql.com
256cb08ba9
Merge 192.168.0.10:mysql/mysql-4.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
2007-02-06 14:44:05 +01:00
msvensson@neptunus.(none)
6502f4300b
Merge neptunus.(none):/home/msvensson/mysql/my41-nmj
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2007-02-06 14:42:40 +01:00
msvensson@pilot.mysql.com
36207f8088
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
2007-02-06 14:27:43 +01:00
msvensson@pilot.mysql.com
3f06339d7c
Merge 192.168.0.10:mysql/mysql-4.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
2007-02-06 14:27:00 +01:00
msvensson@neptunus.(none)
8c37b28c0b
Bug#8983 one place that isn't strict-aliasing-safe
...
- Backport fix from 5.0
2007-02-06 14:07:40 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
d69e5063b2
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug23938/my41-bug23938
2007-02-06 14:58:07 +04:00
jani@a88-113-38-195.elisa-laajakaista.fi
1dd93dda08
Test and bug fixes and removed unneccessary files.
2007-02-05 17:09:44 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
64a728ce0c
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug10798/my41-bug10798
2007-02-05 10:20:47 +04:00
istruewing@chilla.local
972df14cc6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-02-02 20:23:03 +01:00
istruewing@chilla.local
177a366e53
After merge fix
2007-02-02 20:19:13 +01:00
gluh@mysql.com/eagle.(none)
938de5eee4
another valgrind error fix for 4.1(backport from 5.0)
2007-02-02 17:18:42 +04:00
gluh@mysql.com/eagle.(none)
31c3059ae9
Valgrind errors
...
added valgrind.supp to EXTRA_SCRIPTS(for pushbuild)
2007-02-02 15:01:11 +04:00
istruewing@chilla.local
3a664472de
After merge fix
2007-02-02 10:01:44 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
2c45e72e04
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/home/ram/work/b26012/b26012.4.1
2007-02-01 19:56:14 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
d710853fb8
Fix for bug #26012 : missed Field_double::size_of()
...
As we have Field_double::not_fixed we must have Field_double::size_of().
2007-02-01 19:51:02 +04:00
lzhou/zhl@dev3-63.(none)
e208018f75
Merge dev3-63.(none):/home/zhl/mysql/tree-merge/4.1/mysql-4.1-ndb-bj
...
into dev3-63.(none):/home/zhl/mysql/tree-merge/4.1/mysql-4.1-ndb
2007-02-01 15:48:23 +00:00
istruewing@chilla.local
33e1d1091a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-02-01 15:51:25 +01:00
gluh@mysql.com/eagle.(none)
010dc0b55c
Valgrind error fixes
...
Notes:
This patch doesn't fix all issues in the tree and we need jani's fix for that
This patch shoud not be merged into 5.0
2007-02-01 18:00:24 +04:00
istruewing@chilla.local
73e61944f7
Merge chilla.local:/home/mydev/mysql-4.0-axmrg
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-02-01 08:09:36 +01:00
istruewing@chilla.local
97cf413d55
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-02-01 07:52:28 +01:00
cmiller@zippy.cornsilk.net
a795b7097f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2007-01-31 16:26:12 -05:00
cmiller@zippy.cornsilk.net
85896c0af5
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2007-01-31 16:23:10 -05:00
mtaylor@qualinost.(none)
777c5de911
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
2007-01-31 15:35:26 -05:00
svoj@mysql.com/june.mysql.com
a69107598e
Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/WL3567/mysql-4.1-engines
2007-01-31 16:17:27 +04:00
svoj@mysql.com/june.mysql.com
a51aae601d
WL#3567 - MERGE engine: a check for underlying table conformance
...
When a merge table is opened compare column and key definition of
underlying tables against column and key definition of merge table.
If any of underlying tables have different column/key definition
refuse to open merge table.
2007-01-31 16:15:20 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
10dda8e248
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/home/ram/work/b19690/b19690.4.1
2007-01-31 14:47:06 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
eb415e4920
fix for bug #19690 : ORDER BY eliminates rows from the result
...
Depending on the queries we use different data processing methods
and can lose some data in case of double (and decimal in 4.1) fields.
The fix consists of two parts:
1. double comparison changed, now double a is equal to double b
if (a-b) is less than 5*0.1^(1 + max(a->decimals, b->decimals)).
For example, if a->decimals==1, b->decimals==2, a==b if (a-b)<0.005
2. if we use a temporary table, store double values there as is
to avoid any data conversion (rounding).
2007-01-31 09:51:05 +04:00