Commit graph

54248 commits

Author SHA1 Message Date
Mats Kindahl
2a089557a6 BUG#37426: RBR breaks for CHAR() UTF-8 fields > 85 chars
In order to handle CHAR() fields, 8 bits were reserved for
the size of the CHAR field. However, instead of denoting the
number of characters in the field, field_length was used which
denotes the number of bytes in the field.

Since UTF-8 fields can have three bytes per character (and
has been extended to have four bytes per character in 6.0),
an extra two bits have been encoded in the field metadata
work for fields of type Field_string (i.e., CHAR fields).

Since the metadata word is filled, the extra bits have been
encoded in the upper 4 bits of the real type (the most 
significant byte of the metadata word) by computing the
bitwise xor of the extra two bits. Since the upper 4 bits
of the real type always is 1111 for Field_string, this 
means that for fields of length <256, the encoding is
identical to the encoding used in pre-5.1.26 servers, but
for lengths of 256 or more, an unrecognized type is formed,
causing an old slave (that does not handle lengths of 256
or more) to stop.
2008-06-30 22:11:18 +02:00
Joerg Bruehe
5672b953cc Merge the fix for bug#37623 (Suffix "-64bit" is duplicated)
from 5.0 into the 5.1.26 release clone.
2008-06-27 19:36:45 +02:00
Joerg Bruehe
07268a15a1 OS X 10.5 is now a supported platform,
so Apple's internal name ("darwin9") must be translated to ours ("osx10.5").
2008-06-27 19:12:42 +02:00
Gleb Shchepa
afa3d1207b buckport to 5.1.26 from 6.0
Bug#35658 (An empty binary value leads to mysqld crash)
  
Before this fix, the following token
  b''
caused the parser to crash when reading the binary value from the empty string.
The crash was caused by:
  ptr+= max_length - 1;
because max_length is unsigned and was 0, causing an overflow.
  
With this fix, an empty binary literal b'' is parsed as a binary value 0,
in Item_bin_string.
2008-06-27 18:22:23 +05:00
Georgi Kodinov
44811bbaa0 Bug#33812: mysql client incorrectly parsing DELIMITER
Remove unnecessary and incorrect code that tried to pull delimiter commands out of the
middle of statements
2008-06-20 18:08:24 +03:00
Joerg Bruehe
6e179694e3 No 'rc' status any more 2008-06-20 15:00:11 +02:00
Andrei Elkin
e06de90ecc merging prior to push Bug #36443 2008-06-20 13:57:25 +03:00
Andrei Elkin
b8d449505d Bug#36443 Server crashes when executing insert when insert trigger on table
The crash appeared to be a result of allocating an instance of Discrete_interval 
      automatically that that was referred in out-of-declaration scope.
                        
      Fixed with correcting backing up and restoring scheme of
      auto_inc_intervals_forced, introduced by bug#33029, by means of shallow copying;
      added simulation code that forces executing those fixes of the former bug that
      targeted at master-and-slave having incompatible bug#33029-prone versions.
2008-06-19 21:47:59 +03:00
Tatiana A. Nurnberg
0905d04071 re 36818: rpl_server_id1 fails expecting slave has stopped
On a slow environment like valgrind the test is vulnerable
because it does not check if slave has stopped at time
of the new session is requested `start slave;' -- disabling
test till it is fixed.
2008-06-19 12:39:48 +02:00
Tatiana A. Nurnberg
5d7c155c6e Bug#36434: ha_innodb.so is installed in the wrong directory
ha_innodb.so was incorrectly installed in the lib/mysql
directory rather than in lib/mysql/plugin.

Amending CS for 31736.
2008-06-19 06:44:22 +02:00
Tatiana A. Nurnberg
40e413636e Bug#35480: BOM detection code crashes mysql CLI with zero-sized input
MySQL client crashed if no input was passed to it.
2008-06-19 05:12:28 +02:00
Tatiana A. Nurnberg
d6c476b8c8 Fixed bug #37004.
The value of JOIN::tables must be set to 0 when there
is no matching min/max row.
2008-06-19 05:08:41 +02:00
Timothy Smith
69662273cc Merge changes from mysql 5.1.25 release clone (BK), applied manually into bzr. 2008-06-17 19:20:09 -06:00
Timothy Smith
3847e5c820 fix typo
This change was committed to the 5.1.25 release clone, but never
made it to the mysql-5.1 BK tree.  I'm committing it to mysql-5.1
bzr now.
2008-06-17 19:05:56 -06:00
Timothy Smith
aa45d0c01f Bug #37024: Wrong location of messagefiles
make_binary_distribution.sh got clobbered by the 5.0 version during a merge.
This caused a few packaging problems, including message files put in the wrong
place and some missing files.  Fix is just to revert back to the 5.1 version
from before the merge.

Problem introduced in
ChangeSet 1.2606.2.1 2008/05/13 15:56:07 kent@kent-amd64.(none)

This change was made in the 5.1.25 release clone in BK, but never made it to the main mysql-5.1 BK tree.  I am adding it to mysql-5.1 bzr.
2008-06-17 19:04:10 -06:00
Georgi Kodinov
a757d1c12d null merge 2008-06-03 16:06:05 +03:00
Georgi Kodinov
9bc98e8df2 Bug#37069 (5.0): implement --skip-federated 2008-06-03 13:12:37 +03:00
Georgi Kodinov
bd4c6d9b8c Bug#37069: Make federated disabled by default
The federated storage engine is now disabled by default.
mysql-test-run.pl is updated to enable it whenever it's required and available.
2008-05-30 13:21:45 +03:00
Chad MILLER
4215c0d625 Merge from 5.0. Update version. 2008-05-23 00:25:21 +02:00
Chad Miller
8e15e3da89 Merge metainfo for mailer plugin. 2008-05-22 17:57:41 +02:00
Chad MILLER
7648ea9e08 Add branch metainfo for mailer plugin. 2008-05-21 18:18:44 -04:00
dfischer/mysqldev@mysql.com/production.mysql.com
94d237b19c Raise version number after cloning 5.1.25-rc 2008-05-21 09:59:58 +02:00
kostja@bodhi.(none)
a9954110d8 Update test coverage for Bug#27430 "Crash in subquery code when in PS
and table DDL changed after PREPARE" to pass in embedded mode.
2008-05-20 22:43:26 +04:00
kostja@bodhi.(none)
87a75bdf30 A number of fixes after a merge from the main 5.1 tree:
the local tree contains a fix for 
Bug#32748 "Inconsistent handling of assignments to 
general_log_file/slow_query_log_file",
which changes output of a number of tests.
2008-05-20 22:23:58 +04:00
kostja@bodhi.(none)
a746411816 Bug#27430 "Crash in subquery code when in PS and table DDL changed
after PREPARE"
Update test results after a merge with the main tree: the new minimum for 
the table definition cache is 256.
2008-05-20 21:07:11 +04:00
kostja@bodhi.(none)
6ae3bca94e Bug#27430 "Crash in subquery code when in PS and table DDL changed after
PREPARE", review fixes:
- make the patch follow the specification of WL#4166 and remove  
the new error that was originally introduced.
Now the client never gets an error from reprepare, unless it failed.
I.e. even if the statement at hand returns a completely different
result set, this is not considered a server error.
The C API library, that can not handle this situation, was modified to
return a client error.
Added additional test coverage.
2008-05-20 20:36:26 +04:00
kostja@bodhi.(none)
2c0ce2a832 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.(none):/opt/local/work/mysql-5.1-27430
2008-05-20 11:38:17 +04:00
kostja@bodhi.(none)
86396459ae Merge bk-internal.mysql.com:/home/bk/mysql-5.1-27430
into  bodhi.(none):/opt/local/work/mysql-5.1-27430
2008-05-20 11:33:27 +04:00
kostja@bodhi.(none)
6e4af99f5d Bug#27430 "Crash in subquery code when in PS and table DDL changed after
PREPARE": rename members, methods, classes to follow the spec 
(a code review request)
2008-05-20 11:29:16 +04:00
davi@skynet.(none)
2f770c91d2 Bug#27430 Crash in subquery code when in PS and table DDL changed after PREPARE
Add test target to the makefile that will cause all
statements to be re-prepared before execution.
2008-05-19 13:39:31 -03:00
holyfoot/hf@hfmain.(none)
7ec38d1fa7 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into  mysql.com:/d2/hf/mysql-5.1-bugteam
2008-05-19 11:39:30 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
8718be7763 disabled.def:
rpl_innodb_bug28430 disabled
2008-05-19 11:38:53 +05:00
gshchepa/uchum@host.loc
d044d9f00b Merge host.loc:/work/bk/5.0-bugteam
into  host.loc:/work/bk/5.1-bugteam
2008-05-18 14:27:44 +05:00
gshchepa/uchum@host.loc
80b16212c3 Merge host.loc:/work/bugs/5.0-bugteam-36676
into  host.loc:/work/bk/5.0-bugteam
2008-05-18 14:27:17 +05:00
gshchepa/uchum@host.loc
2459d3a9ad Fixed bug#36676: multiupdate using LEFT JOIN updates only
first row or fails with an error:
  ERROR 1022 (23000): Can't write; duplicate key in table ''

The server uses intermediate temporary table to store updated
row data.  The first column of this table contains rowid.
Current server implementation doesn't reset NULL flag of that
column even if the server fills a column with rowid.
To keep each rowid unique, there is an unique index.
An insertion into an unique index takes into account NULL
flag of key value and ignores real data if NULL flag is set.
So, insertion of actually different rowids may lead to two
kind of problems.  Visible effect of each of these problems
depends on an initial engine type of temporary table:

1. If multiupdate initially creates temporary table as
a MyISAM table (a table contains blob columns, and the
create_tmp_table function assumes, that this table is
large), it inserts only one single row and updates
only rows with one corresponding rowid. Other rows are
silently ignored. 

2. If multiupdate initially creates MEMORY temporary
table, fills it with data and reaches size limit for
MEMORY tables (max_heap_table_size), multiupdate
converts MEMORY table into MyISAM table and fails
with an error:
  ERROR 1022 (23000): Can't write; duplicate key in table ''


Multiupdate has been fixed to update the NULL flag of
temporary table rowid columns.
2008-05-18 14:21:25 +05:00
gkodinov/kgeorge@magare.gmz
faa1330836 Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-bugteam
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
2008-05-18 11:42:55 +03:00
kostja@bodhi.(none)
aef39682d6 Fix mysql_client_test failure in pushbuild 5.1-27430
(Bug#27430)
2008-05-18 10:28:36 +04:00
kostja@bodhi.(none)
7aeeb8f667 Implement some code review fixes for the fix for Bug#27430
"Crash in subquery code when in PS and table DDL changed after PREPARE"
2008-05-18 01:51:18 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
f9d183b5dc Bug #36705 key_buffer_size of >= 2G allocates all availabel virtual memory on 64-bit wondo.
temporary variables of 'long' types were used to store ulong values,
that causes init_key_cache to receive distorted parameters
2008-05-17 12:53:47 +05:00
cmiller@zippy.cornsilk.net
c1f35308cb Merge bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-bugteam
2008-05-16 17:48:07 -04:00
cmiller@zippy.cornsilk.net
34deab48db Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my50-bug36570
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-bugteam
2008-05-16 17:40:01 -04:00
cmiller@zippy.cornsilk.net
fd6cce83fb Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-bugteam
2008-05-16 17:37:37 -04:00
gkodinov/kgeorge@magare.gmz
d24dffc819 subselect.result:
updated the testcase for bug 36011
2008-05-16 19:28:24 +03:00
gkodinov/kgeorge@magare.gmz
b98922b7cc Merge magare.gmz:/home/kgeorge/mysql/work/B36011-take2-5.0-bugteam
into  magare.gmz:/home/kgeorge/mysql/work/B36011-5.1-bugteam
2008-05-16 19:03:50 +03:00
gkodinov/kgeorge@magare.gmz
0b7abbecbe Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam
into  magare.gmz:/home/kgeorge/mysql/autopush/B36011-take2-5.0-bugteam
2008-05-16 18:56:43 +03:00
cmiller@zippy.cornsilk.net
e0ed56df0a Re-record results from unmerged file. 2008-05-16 11:38:13 -04:00
cmiller@zippy.cornsilk.net
d24b5fb4d2 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my50-bug36570
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570
2008-05-16 11:36:11 -04:00
cmiller@zippy.cornsilk.net
1e5fc1089f Fix merge problems and re-record output for legitimate changes. 2008-05-16 11:35:15 -04:00
cmiller@zippy.cornsilk.net
944f793b90 Add a test at Andrei's behest. Show the SHOW CREATE on the
master also, so that we can visually see the slave is the same.
2008-05-16 11:26:29 -04:00
mats@mats-laptop.(none)
3b42cf9096 Merge mats-laptop.(none):/home/bkroot/mysql-5.1-bugteam
into  mats-laptop.(none):/home/bk/b36197-mysql-5.1-bugteam
2008-05-16 16:13:13 +02:00