Commit graph

29874 commits

Author SHA1 Message Date
aelkin@mysql.com
b033da87fa Bug#19097: rpl_view failed on some platforms
removing comments from the opt file.
2006-04-14 12:13:26 +03:00
bar@mysql.com
941e529c59 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b18691
2006-04-14 13:30:47 +05:00
bell@sanja.is.com.ua
5c7955bd54 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-04-14 02:02:28 +03:00
konstantin@mysql.com
b5863b3987 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge
2006-04-14 02:38:41 +04:00
bell@sanja.is.com.ua
8136b25811 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-04-14 00:17:50 +03:00
bell@sanja.is.com.ua
efb8b990e4 The check for recursive view definitions added. (BUG#14308) 2006-04-13 23:12:26 +03:00
konstantin@mysql.com
6f51b4199f Merge mysql.com:/opt/local/work/mysql-5.0-root
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge
2006-04-14 00:07:04 +04:00
mleich@mysql.com
9ee2a76be3 Merge three.local.lan:/home/matthias/Arbeit/mysql-4.1/src-1
into  three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1
2006-04-13 21:09:26 +02:00
aelkin@dl145j.mysql.com
b6992dd4c5 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  dl145j.mysql.com:/tmp/andrei/5.0-bug18715_drop_view_slave
2006-04-13 20:55:51 +02:00
mleich@mysql.com
3ca1ec8fdc Fixes for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs related to
MySQL 4.1
  and Bug#16920 rpl_deadlock_innodb fails in show slave status (reported for MySQL 5.1)
  - backport of several fixes done in MySQL 5.0 to 4.1
  - fix for new discovered instability (see comment on Bug#12429 + Bug#16920)
  - reenabling of testcases
2006-04-13 20:42:48 +02:00
bell@sanja.is.com.ua
df69944e73 postmerge fix: added tinfo support. 2006-04-13 16:06:52 +03:00
bell@sanja.is.com.ua
014914cbcf Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-04-13 16:01:08 +03:00
bell@sanja.is.com.ua
cb81389aef Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-04-13 15:07:50 +03:00
grog@mysql.com
da6210ee61 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/MySQL/5.0-Bug-17248a
2006-04-13 21:37:49 +09:30
sergefp@mysql.com
34b2ed5f7f Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/psergey/mysql-5.0-csc9139
2006-04-13 16:07:48 +04:00
sergefp@mysql.com
1d3a0c0ec8 BUG#19021, Crash in ROR-index_merge optimizer:
get_best_covering_ror_intersect() was copying ror_scans starting from the 
end of the array and not from its beginning.
2006-04-13 16:05:32 +04:00
ramil@mysql.com
2398882097 Fix for bug #18643: crazy UNCOMPRESS(). 2006-04-13 16:19:21 +05:00
svoj@april.(none)
d1969bcfe0 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
into  april.(none):/home/svoj/devel/mysql/BUG17917/mysql-4.1
2006-04-13 15:40:12 +05:00
konstantin@mysql.com
b915f054cf Fix a typo in the help message. 2006-04-13 14:06:46 +04:00
svoj@april.(none)
f78fdf6621 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
into  april.(none):/home/svoj/devel/mysql/BUG17917/mysql-4.1
2006-04-13 14:38:36 +05:00
svoj@april.(none)
7412db5e56 BUG#17917 - SELECT from compressed MyISAM table crashes MySQL server
Retrieving data from compressed MyISAM table which is bigger than 4G on 32-bit box
with mmap() support results in server crash.

mmap() accepts length of bytes to be mapped in second param, which is 32-bit
size_t. But we pass data_file_length, which is 64-bit my_off_t. As a result only
first data_file_length % 4G were mapped.

This fix adds additional condition for mmap() usage, that is use mmap() for
compressed table which size is no more than 4G on 32-bit platform.
2006-04-13 14:37:03 +05:00
grog@mysql.com[grog]
3eb783813f foo2 2006-04-13 17:22:56 +09:30
grog@mysql.com[grog]
b2cd3a963a foo1 2006-04-13 17:20:33 +09:30
bar@mysql.com
45293fc346 Bug#18691: Converting number to UNICODE string returns invalid result.
Conversion from int and real numbers to UCS2 didn't work fine: 
CONVERT(100, CHAR(50) UNICODE)
CONVERT(103.9, CHAR(50) UNICODE)

The problem appeared because numbers have binary charset, so,
simple charset recast binary->ucs2 was performed
instead of real conversion.

Fixed to make numbers pretend to be non-binary.
2006-04-13 10:55:48 +05:00
igor@rurik.mysql.com
316eeff690 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-04-12 16:14:20 -07:00
konstantin@mysql.com
c49e6f8869 Post-merge fixes. Add a new error message for max_prepared_stmt_count
limit.
2006-04-13 01:46:44 +04:00
kroki@mysql.com
2caec302fa Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug15933
2006-04-13 00:04:22 +04:00
evgen@moonbone.local
ac54aa2aee Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was
used

In a simple queries a result of the GROUP_CONCAT() function was always of 
varchar type.
But if length of GROUP_CONCAT() result is greater than 512 chars and temporary
table is used during select then the result is converted to blob, due to
policy to not to store fields longer than 512 chars in tmp table as varchar
fields.

In order to provide consistent behaviour, result of GROUP_CONCAT() now
will always be converted to blob if it is longer than 512 chars.
Item_func_group_concat::field_type() is modified accordingly.
2006-04-12 23:05:38 +04:00
kroki@mysql.com
c8e22ff70b Bug#16461: connection_id() does not work properly inside trigger
CONNECTION_ID() was implemented as a constant Item, i.e. an instance of
Item_static_int_func class holding value computed at creation time.
Since Items are created on parsing, and trigger statements are parsed
on table open, the first connection to open a particular table would
effectively set its own CONNECTION_ID() inside trigger statements for
that table.

Re-implement CONNECTION_ID() as a class derived from Item_int_func, and
compute connection_id on every call to fix_fields().
2006-04-12 19:31:00 +04:00
konstantin@mysql.com
75792fc0dc Merge mysql.com:/opt/local/work/mysql-4.1-16365
into  mysql.com:/opt/local/work/mysql-5.0-merge
2006-04-12 18:30:54 +04:00
kroki@mysql.com
8881e660d0 Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug15933
2006-04-12 17:39:24 +04:00
kroki@mysql.com
4a81c0dfb9 In test for bug#15933 we have to wait for all disconnects to finish to avoid
a race between updating and checking Max_used_connections.  This is done in
a loop until either disconnect finished or timeout expired.  In a latter case
the test will fail.
2006-04-12 17:37:57 +04:00
knielsen@mysql.com
408599af84 Fix broken --valgrind-options option. 2006-04-12 14:32:34 +02:00
aelkin@mysql.com
a219eb292e #BUG18715 create view with replicate*ignore-table
Fixed in parser. rpl_view gained no changes but rpl_view-slave.opt.
2006-04-12 12:50:12 +03:00
joerg@mysql.com
4fae605be5 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2006-04-12 11:37:49 +02:00
msvensson@neptunus.(none)
7c70159097 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-04-12 09:09:22 +02:00
cmiller@zippy.(none)
a1e78b3d36 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__ready
2006-04-11 16:39:09 -04:00
igor@rurik.mysql.com
abc16b5b00 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-04-11 11:46:28 -07:00
ramil@mysql.com
62b85c1388 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b14360
2006-04-11 23:46:27 +05:00
aivanov@mysql.com
cb011af0b0 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/bugs/mysql-5.0-merge
2006-04-11 22:46:26 +04:00
msvensson@neptunus.(none)
a4b19285e5 Bug#18474 Unlistable directories yield no info from information_schema, part2
- Improved solution by adding an else stetment so that do find next is avoided if erorr occurs, but we still return zero files found instaed of an error
2006-04-11 20:41:05 +02:00
igor@rurik.mysql.com
dfd8f0211c Fixed bug #18618.
If the second or the third argument of a BETWEEN predicate was
a constant expression, like '2005.09.01' - INTERVAL 6 MONTH,
while the other two arguments were fields then the predicate 
was evaluated incorrectly and the query returned a wrong
result set.
The bug was introduced in 5.0.17 when in the fix for 12612.
2006-04-11 10:03:37 -07:00
ingo@mysql.com
750af5a848 Merge mysql.com:/home/mydev/mysql-4.0
into  mysql.com:/home/mydev/mysql-4.0-bug5390
2006-04-11 18:55:24 +02:00
ingo@mysql.com
76a122d0c3 Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-bug5390
2006-04-11 17:10:04 +02:00
ingo@mysql.com
2ef6034165 Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-bug5390
2006-04-11 15:18:16 +02:00
ramil@mysql.com
094c4290ca Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b14360
2006-04-11 18:14:34 +05:00
bell@sanja.is.com.ua
b4980d4383 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2006-04-11 14:49:33 +03:00
ramil@mysql.com
1e29244200 Fix for bug #14360: Date Between Interval Broken. 2006-04-11 16:13:57 +05:00
joerg@mysql.com
92d7ae0580 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2006-04-11 13:07:58 +02:00
ingo@mysql.com
fff2bc4d46 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug5390
2006-04-11 12:41:26 +02:00