Commit graph

22278 commits

Author SHA1 Message Date
kent@mysql.com/kent-amd64.(none)
ab30949123 mysql.spec.sh:
- Aligned copyright headers and text with 5.0
  - Don't strip binaries on SuSE 9
  - Formatting alignment with spec file in 5.0
  - Run full test on "normal" binary, and less on "Max"
  - Let test runs on "Max" identify the runs with "max" and "max+ps"
2008-03-01 18:25:41 +01:00
cmiller@zippy.cornsilk.net
c3a92a661c Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint--bug33841
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-build
2008-01-29 17:18:27 -05:00
joerg@trift2.
e0db1853e8 Merge trift2.:/MySQL/M41/mysql-4.1
into  trift2.:/MySQL/M41/push-4.1
2008-01-28 15:03:19 +01:00
cmiller@zippy.cornsilk.net
b040a97c2a Bug#33841: mysql client crashes when returning results for long-\
running queries

Bug#33976: buffer overflow of variable time_buff in function com_go()

An internal buffer was too short.  Overextending could smash the 
stack on some architectures and cause SEGVs.  This is not a problem
that could be exploited to run arbitrary code.

To fix, I expanded one buffer to cover all the size that could be
written to (we know the abolute max).
2008-01-25 10:53:21 -05:00
tsmith@ramayana.hindu.god
289d3e824d Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
2008-01-22 15:43:06 -07:00
joerg@trift2.
7967cdff8f Merge trift2.:/MySQL/M41/mysql-4.1
into  trift2.:/MySQL/M41/push-4.1
2008-01-21 19:54:14 +01:00
joerg@trift2.
dc1fb0750a scripts/make_binary_distribution.sh:
Fix the code to get the "libgcc" file name so that the failure of Intel's ICC
to provide this information does not cause any problems.

This fixes  bug#33536  Option "--print-libgcc-file" does not work with ICC compiler
2007-12-27 19:51:06 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
b89fabe164 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
into  mysql.com:/misc/mysql/31752_/41-31752_
2007-12-17 14:06:15 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
93894a444e Bug#31752: check strmake() bounds
fix test program
2007-12-17 12:09:21 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
b2f867155f Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
into  mysql.com:/misc/mysql/31752_/41-31752_
2007-12-17 09:42:55 +01:00
gluh@mysql.com/eagle.(none)
4e50bb0ebe Merge mysql.com:/home/gluh/MySQL/Merge/4.1
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
2007-12-13 14:38:01 +04:00
tsmith@ramayana.hindu.god
a19cac9305 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-bug15815
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
2007-12-10 16:58:16 -07:00
df@pippilotta.erinye.com
353cd3300a Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
2007-12-10 10:41:34 +01:00
tsmith@ramayana.hindu.god
44d74f631f ctype-simple.c: Backport quick fix to remove Windows compiler warnings 2007-12-06 15:05:24 -07:00
tnurnberg@mysql.com/white.intern.koehntopp.de
dddced964b Bug#31752: check strmake() bounds
post-fixes: prevent semi-related overflow, additional comments
2007-12-06 11:48:27 +01:00
tsmith@ramayana.hindu.god
6453025165 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
2007-12-04 19:16:22 -07:00
tnurnberg@mysql.com/white.intern.koehntopp.de
d713527b0c Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
into  mysql.com:/misc/mysql/32707/41-32707
2007-12-01 13:07:27 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
dd4fc01714 Merge bk@192.168.21.1:mysql-4.1-opt
into  mysql.com:/home/hf/work/mrg/my41-mrg
2007-12-01 13:09:57 +04:00
mleich@four.local.lan
ebe28cdc97 Merge four.local.lan:/work/merge/mysql-4.1-dev
into  four.local.lan:/work/trees/mysql-4.1-build-src-clean
2007-11-30 19:12:09 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
d02855d915 Merge mysql.com:/home/hf/work/31900/my41-31900
into  mysql.com:/home/hf/work/mrg/my41-mrg
2007-11-30 22:08:29 +04:00
mleich@four.local.lan
c3b8d8972f Fix for
Bug#31030 rpl000015.test fails if $MYSQL_TCP_PORT != 3306
Note:
  This bug does not occur in MySQL 5.0 and up, because
  ChangeSet 1.2328.2.1 2006/11/27 for MySQL 5.0 prevents this.
  The 5.0 fix uses the environment variable DEFAULT_MASTER_PORT
  which is set by mysql-test-run.pl.
  mysql-test-run.pl in 4.1 does not set this variable.
  There are two alternatives:
  1) Backport the 5.0 fix for this test including modifications
     to mysql-test-run.pl and mysql-test-run-shell.
     This is a not acceptable impact on an old MySQL version.
  2) Fix the problem different than in 5.0 like in the current
     ChangeSet + do not apply these changes when upmerging to 5.0
2007-11-30 18:06:28 +01:00
kent@mysql.com/kent-amd64.(none)
666ec84bca my_global.h:
Added 64 bit Mac OS X hard coded settings, for universal binaries
2007-11-30 01:36:05 +01:00
kent@mysql.com/kent-amd64.(none)
611b737af3 Excluded verbose and bad change to Mac OS X universal binaries handling 2007-11-30 01:22:15 +01:00
kent@mysql.com/kent-amd64.(none)
369d75dc75 my_global.h:
Added 64 bit Mac OS X hard coded settings, for universal binaries
2007-11-29 23:42:04 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
b0d63e8dac Bug #29085 A small double precision number becomes zero.
Denormalized DOUBLE-s can't be properly handled by old MIPS processors.
So we need to enable specific mode for them so IRIX will do use
software round to handle such numbers.
2007-11-29 14:52:36 +04:00
tnurnberg@mysql.com/white.intern.koehntopp.de
46ee271e8f Bug#32707: misdimensioned buffer in protocol layer
Miscalculation in protocol-layer: size buffer correctly so
even really long error messages cannot overflow our buffer.
2007-11-27 18:24:24 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
68c6031472 Bug #31900 Wrong confusing comment in mysql_com.h header file.
comment fixed as we truly need const_item to be 1 to mark
constant function
2007-11-26 16:25:18 +04:00
tnurnberg@mysql.com/white.intern.koehntopp.de
1a95ed1df2 Bug#31752: check strmake() bounds
strmake() calls are easy to get wrong. Add checks in extra
debug mode to identify possible exploits.

Remove some dead code.

Remove some off-by-one errors identified with new checks.
2007-11-26 08:20:40 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
c6f65c8b48 Merge bk@192.168.21.1:mysql-4.1-opt
into  mysql.com:/home/hf/work/30284/my41-30284
2007-11-24 14:59:48 +04:00
istruewing@stella.local
ca95af018e Merge stella.local:/home2/mydev/mysql-4.1-amain
into  stella.local:/home2/mydev/mysql-4.1-axmrg
2007-11-21 20:27:16 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
366a87cdaf Merge mysql.com:/home/hf/work/32063/my41-32063
into  mysql.com:/home/hf/work/31868/my41-31868
2007-11-20 14:47:39 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
140dd4f322 Bug #30284 spatial key corruption.
SPATIAL key is fine actually, but the chk_key() function
mistakenly returns error. It tries to compare checksums
of btree and SPATIAL keys while the checksum for the SPATIAL isn't
calculated (always 0). Same thing with FULLTEXT keys is handled
using full_text_keys counter, so fixed by counting both
SPATIAL and FULLTEXT keys in that counter.
2007-11-19 11:03:03 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
df5b0297fd Merge bk@192.168.21.1:mysql-4.1-opt
into  mysql.com:/home/hf/work/31158/my41-31158
2007-11-17 20:24:22 +04:00
istruewing@stella.local
1e435dce80 Merge stella.local:/home2/mydev/mysql-4.1-amain
into  stella.local:/home2/mydev/mysql-4.1-axmrg
2007-11-16 13:04:17 +01:00
joerg@trift2.
4ede405d87 Merge trift2.:/MySQL/M41/mysql-4.1
into  trift2.:/MySQL/M41/push-4.1
2007-11-16 10:34:36 +01:00
joerg@trift2.
96aaa245e2 Merge trift2.:/MySQL/M40/mysql-4.0
into  trift2.:/MySQL/M41/push-4.1
2007-11-14 15:22:55 +01:00
joerg@trift2.
02464c6868 Merge trift2.:/MySQL/M41/mysql-4.1
into  trift2.:/MySQL/M41/push-4.1
2007-11-14 15:11:37 +01:00
gluh@mysql.com/eagle.(none)
ea3bfdb26d Merge mysql.com:/home/gluh/MySQL/Merge/4.1
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
2007-11-14 17:22:03 +04:00
svoj@mysql.com/june.mysql.com
107822cf87 Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines
into  mysql.com:/home/svoj/devel/mysql/BUG31277/mysql-4.1-engines
2007-11-14 14:30:21 +04:00
svoj@mysql.com/june.mysql.com
7f9298b919 Merge mysql.com:/home/svoj/devel/mysql/BUG29083/mysql-4.1-engines
into  mysql.com:/home/svoj/devel/mysql/BUG31277/mysql-4.1-engines
2007-11-14 14:29:49 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
0c15068ff8 Merge bk@192.168.21.1:mysql-4.1-opt
into  mysql.com:/home/hf/work/31305/my41-31305
2007-11-13 23:12:55 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
7d111abf0e Bug #31158 Spatial, Union, LONGBLOB vs BLOB bug (crops data)
max_length parameter for BLOB-returning functions must be big enough
for any possible content. Otherwise the field created for a table
will be too small.
2007-11-13 10:51:47 +04:00
kent@mysql.com/kent-amd64.(none)
b94de5d1d6 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1-build
into  mysql.com:/home/kent/bk/bug30069/mysql-4.1-build
2007-11-12 18:57:50 +01:00
svoj@mysql.com/june.mysql.com
ed8f506d29 symlink.test, symlink.result:
Use proper variable for test.
2007-11-12 21:52:30 +04:00
svoj@mysql.com/june.mysql.com
417669f9e8 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.0
into  mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.0
2007-11-12 17:28:02 +04:00
kent@mysql.com/kent-amd64.(none)
3bb7cac84b bigint.test, bigint.result:
Test case for Bug#30069
2007-11-12 12:52:03 +01:00
svoj@mysql.com/june.mysql.com
40a78cd390 After merge fix. 2007-11-12 15:15:16 +04:00
svoj@mysql.com/june.mysql.com
a6def1f4ab Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.0
into  mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-engines
2007-11-12 15:02:42 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
91e2f91897 Bug #31305 myisam tables crash when they are near capacity.
When we insert a record into MYISAM table which is almost 'full',
we first write record data in the free space inside a file, and then
check if we have enough space after the end of the file.
So if we don't have the space, table will left corrupted.
Similar error also happens when we updata MYISAM tables.

Fixed by modifying write_dynamic_record and update_dynamic_record functions
to check for free space before writing parts of a record
2007-11-12 13:00:22 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
afb9ecaff9 Bug #32063 "create table like" works case-significant only in "embedded" server (libmysqld)
in mysql_creata_like_table() we 'downcase' the complete path to the
.frm file. It works fine in standalone case as there usually
we only have './' as a path to the datahome, but doesn't work in
the embedded server where we add the real path there, so if a
directory has uppercase letters in it's name, it won't be found.

Fixed by 'downcasing' only database/table pair.
2007-11-10 16:54:25 +04:00