Commit graph

54795 commits

Author SHA1 Message Date
Jonathan Perkin
bccaffb0f1 Try different sp1 suffix for NDB. 2008-06-27 18:13:50 +02:00
Gleb Shchepa
790edf009a backport 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 20:56:41 +05: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
Jonathan Perkin
5e27237a15 Version number bump for 5.0.60sp1 2008-06-27 12:58:07 +02:00
Gleb Shchepa
c896190892 backport to 5.1 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 15:23:40 +05:00
Joerg Bruehe
1c75fd44a6 Merge the first part of the 5.1.26 changes to 5.1-build 2008-06-26 18:46:45 +02:00
Joerg Bruehe
2cf7c86ad2 Merge an empty merge changeset == no change, just bookkeeping. 2008-06-26 18:30:57 +02:00
Joerg Bruehe
6892d9650b Merge from main 5.1 to 5.1-build 2008-06-26 18:11:01 +02:00
Joerg Bruehe
ba4d154382 Merge the main 5.0 tree into 5.0-build. 2008-06-26 18:01:28 +02:00
Matthias Leich
81e7bd8679 Upmerge 5.0 -> 5.1 2008-06-25 19:01:17 +02:00
Matthias Leich
69a1c78eba Fix for
Bug#37492 timing bug in subselect.test
+ similar weaknesses found during testing
+ replace error numbers by error names
2008-06-25 16:59:38 +02:00
Gleb Shchepa
6cf0fcbf9e auto merge 5.1-main --> 5.1-bugteam 2008-06-25 14:44:55 +05:00
Timothy Smith
0632a93e08 Bug #20748: Configuration files should not be read more than once
Normalize directory names before adding them to default_directories.
2008-06-24 19:25:23 -06:00
Gleb Shchepa
f3978f77cb auto merge 5.0-bugteam --> 5.1-bugteam 2008-06-24 21:15:00 +05:00
Gleb Shchepa
748a9b1a4b back-port from 5.1.
Bug#35480: BOM detection code crashes mysql CLI with zero-sized input
      
MySQL client crashed if no input was passed to it.
2008-06-24 21:05:56 +05:00
Gleb Shchepa
9ffe2c02bf back-port from 5.1.
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-24 21:03:17 +05:00
Gleb Shchepa
7ad63a7202 Bug #36244: MySQL CLI doesn't recognize standalone --
as a commentary

mysql client has been modified to interpret EOL after
standalone -- commentary strings like whitespace
character (according to
http://dev.mysql.com/doc/refman/5.0/en/ansi-diff-comments.html)
2008-06-24 19:32:06 +05:00
Joerg Bruehe
c3b3d621a7 Merge from 5.1 main tree. 2008-06-24 16:07:59 +02:00
Tatiana A. Nurnberg
23176f8f23 auto merge 2008-06-21 11:12:41 +02:00
Joerg Bruehe
3f33b44aaa Correct the version number, after cloning 5.1.26 the next one is 27 2008-06-20 19:06:03 +02:00
Tatiana A. Nurnberg
5128b787c4 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:58:14 +02: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
Matthias Leich mleich@mysql.com
12846f416e Automatic merge 2008-06-20 14:55:17 +02:00
Joerg Bruehe
a51718eeb6 Raise version number after cloning 5.1.26 2008-06-20 14:54:48 +02:00
Joerg Bruehe
58e08f2526 Pull some bug fixes from the main tree. 2008-06-20 13:32:08 +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
Davi Arnaut
8254727b44 Silence unused variable warning by printing the variables value. 2008-06-19 13:00:53 -03:00
Joerg Bruehe
9435858a7e Pull main tree into build team tree. 2008-06-19 17:33:00 +02:00
Gleb Shchepa
56ef6a235d auto merge 2008-06-19 19:26:00 +05:00
Davi Arnaut
e7f3c5fc44 Bug#37003 Tests sporadically crashes with embedded server
Another problem is that the backtrace facility wasn't being
enabled for non-Linux targets even if the target OS has the
backtrace functions. Also, the stacktrace functions inside
mysqltest were being used without proper checks for their
presence in the build.
2008-06-19 11:02:32 -03:00
Gleb Shchepa
e2d1351bd4 auto merge with local tree (bug #37076) 2008-06-19 18:32:14 +05:00
Gleb Shchepa
954fba4739 Fixed bug #37076: TIMESTAMP/DATETIME/DATE values are not
replicated correctly between machines with
                  mixed endiannes
2008-06-19 18:02:04 +05: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
Magnus Svensson
079fa90b8d Turn off timestamping 2008-06-19 11:20:45 +02:00
Magnus Svensson
101b4f2e7b Merge parallel mtr 2008-06-19 10:10:37 +02:00
Magnus Svensson
ce4b99857b Instruct mysql_upgrade what tmpdir to use 2008-06-19 10:07:55 +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
Kristofer Pettersson
71be65dd11 Bug#30087 Set query_cache_size, if the value is too small, get a unclear warning
This bugs clarifies a warning message issued when the query cache data
size becomes smaller than the minium allowed size.
2008-06-19 02:40:35 +02:00
Matthias Leich mleich@mysql.com
8b0689f0ef 1. Upmerge of fix for the bugs
37167 funcs_1: Many tests fail if the embedded
                  server is used.
   37164 funcs_1: Some tests fail if an optional
                  character set is missing.
   + some cleanup within the testsuite related to the
     fixes above
   + some adjustments to open bugs on Mac OS X
2. Skip tests which suffer from bug
   37456 funcs_1: Several tests crash when used
                  with embedded server
3. Minor cleanup in some tests
2008-06-18 19:23:55 +02:00
Davi Arnaut
30bd1d7cb3 Bug#37003 Tests sporadically crashes with embedded server
The problem was that when a embedded linked version of mysqltest
crashed there was no way to obtain a stack trace if no core file
is available. Another problem is that the embedded version of
libmysql was not behaving (crash) the same as the non-embedded with
respect to sending commands to a explicitly closed connection.

The solution is to generate a mysqltest's stack trace on crash
and to enable "reconnect" if the connection handle was explicitly
closed so the behavior matches the non-embedded one.
2008-06-18 13:17:15 -03:00
Magnus Svensson
755e015787 Fix paths 2008-06-18 17:49:32 +02:00
Matthias Leich mleich@mysql.com
9b6a012ce5 Fix for
Bug#37167 funcs_1: Many tests fail if the embedded server is used.
     Bug#37164 funcs_1: Some tests fail if an optional character set is missing.
+ some cleanup within the testsuite related to the fixes above
+ some adjustments to open bugs on Mac OS X
2008-06-18 17:02:19 +02:00
Magnus Svensson
cafa042a29 Merge 2008-06-18 16:09:53 +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