Commit graph

39422 commits

Author SHA1 Message Date
Joerg Bruehe
d9289b8832 Merge from main 5.0 to 5.0-build. 2008-07-09 13:17:53 +02:00
Georgi Kodinov
28e02b178f fixed a compilation warning on windows 64. 2008-07-09 13:03:48 +03:00
Georgi Kodinov
ed30164161 automatic merge of 5.0-bugteam into the 5.0.66 release clone. 2008-07-09 12:59:28 +03:00
kent@mysql.com
443698a56d Raise version number after cloning 5.0.66 2008-07-09 08:23:30 +02:00
Jonathan Perkin
38ae5d102a Merge from trunk. 2008-07-08 16:39:44 +02:00
Mats Kindahl
a129837f66 Manual merge with mysql-5.0-bugteam 2008-07-08 10:37:42 +02:00
Marc Alff
68925ec2b8 Merge 2008-07-07 13:59:07 -06:00
Marc Alff
f3ff1aeb9c Bug#26030 (Parsing fails for stored routine w/multi-statement execution
enabled)

Before this fix, the lexer and parser would treat the ';' character as a
different token (either ';' or END_OF_INPUT), based on convoluted logic,
which failed in simple cases where a stored procedure is implemented as a
single statement, and used in a multi query.

With this fix:
- the character ';' is always parsed as a ';' token in the lexer,
- parsing multi queries is implemented in the parser, in the 'query:' rules,
- the value of thd->client_capabilities, which is the capabilities
  negotiated between the client and the server during bootstrap,
  is immutable and not arbitrarily modified during parsing (which was the
  root cause of the bug)
2008-07-07 10:00:08 -06:00
Mats Kindahl
b9d6d4c0d8 Bug #37150 Risk for crash in User_var_log_event::exec_event()
On certain kinds of errors (e.g., out of stack), a call to Item_func_
set_user_var::fix_fields() might fail.  Since the return value of this
call was not checked inside User_var_log_event::exec_event(), continuing
execution after this will cause a crash inside Item_func_set_user_var::
update_hash().

The bug is fixed by aborting execution of the event with an error if
fix_fields() fails, since it is not possible to continue execution anyway.
2008-07-07 09:58:27 +02:00
Daniel Fischer
43af930e71 ild can not be expected on all matching installs 2008-07-05 09:44:10 +02:00
Chad MILLER
8e222b0d22 Merge bug. 2008-07-04 13:30:26 -04:00
Chad MILLER
43ba41548e Bug#30563: Is not possible to create rpl_ or innodb test if needed \
to use ANSI_QUOTES

Make all have_* tests universally safe by using ANSI quotes.
2008-07-04 12:41:27 -04:00
Timothy Smith
bbdcf6ca21 Fix "C++ code in C file" syntax error in mysys/default.c 2008-07-02 16:37:29 +02:00
Patrick Crews
8d5dc3a5f5 Bug#37380 - Test funcs_1.is_columns_myisam_embedded fails on OS X
Test was failing due to the addition of a '\x05' character in result sets
Latest builds of the server have shown this problem to have disappeared.
Removing code within the test that disables the test on Mac OS X.

Recommit due to tree error on earlier, approved patch.
2008-07-01 14:44:47 -04:00
Matthias Leich
dd7bc1a662 Fix for
Bug#36787 Test funcs_1.charset_collation_1 failing
Details:
1. Skip charset_collation_1 if charset "ucs2_bin" is
   missing (property which distincts "vanilla" builds
   from the others)
2. Let builds with version_comment LIKE "%Advanced%"
   (found them for 5.1) execute charset_collation_3.
3. Update comments charset_collation.inc so that they
   reflect the current experiences.
2008-06-30 22:16:06 +02:00
Timothy Smith
7553eecefd Merge from upstream (my:5.0-bugteam) 2008-06-27 16:30:44 -06:00
Joerg Bruehe
e346a69074 Take the fix for bug#37623 (Suffix "-64bit" is duplicated)
into the 5.0-build team tree.
2008-06-27 19:42:31 +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
Jonathan Perkin
104071ac12 Revert NDB version bump completely. 2008-06-27 18:43:45 +02:00
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
Jonathan Perkin
5e27237a15 Version number bump for 5.0.60sp1 2008-06-27 12:58:07 +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
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
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
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
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
Kristofer Pettersson
ccd534c3ea Bug#21226 FLUSH PRIVILEGES does not provided feedback when it fails.
If during a FLUSH PRIVILEGES the server fails to load the new privilege
tables, the error message is lost. This patch is a back port from 5.1 which
adresses this issue by setting the server in an error state if a failure
occurrs.
  
This patch also corrects an incorrect variable assignment which might
cause an error state to be reverted by coincidence.
2008-06-18 21:09:30 +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
Georgi Kodinov
22bd6d9de6 auto merge 2008-06-17 11:42:17 +03:00
Tatiana A. Nurnberg
28d27983a7 merge 2008-06-17 10:09:25 +02:00
Tatiana A. Nurnberg
6d2f2873c0 Bug#36492: make dist and make install fails
Ignore BitKeeper SCCS folders in make-dist
2008-06-17 09:31:29 +02:00
Matthias Leich mleich@mysql.com
00c19cd837 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

Details:
- Remove the initial loading of data from tests if these data
  are not somewhere retrieved
- Remove any use of columns with attribute unicode
  (-> UCS2 is no more needed) from tests where unicode
  properties are not checked or somehow required
- Create a separate branch of the Character maximum length test
  (CML). If UCS2 is available than this test gets applied to
  every available type of string column with attribute unicode
  This prevents any loss of coverage by the points above.
- Disable the execution of is_tables_ndb which gives wrong
  results because of a bug. Correct the exepected results of
  this test.
- In case of tests failing when applied to the embedded server
    1) Create a variant of this test for the embedded server
  or
    2) Skip the test in case of embedded server
  depending on purpose and complexity of test.
- Skip the tests which could suffer from
  Bug 28309 First insert violates unique constraint - was "memory" table empty ?
  Bug 37380 Test funcs_1.is_columns_myisam_embedded fails on OS X
  (both bugs Mac OS X, embedded server, MySQL 5.0 only)
- Minor improvements like remove typos
2008-06-16 20:39:58 +02:00
Hakan Kuecuekyilmaz
d6700c7e5a Fix for Bug#16902. 2008-06-16 10:05:00 +02:00
Joerg Bruehe
889a669f68 Merging bug fixes for 34995 and 35543 into the main tree,
and the build tag for 5.0.62.
2008-06-13 15:22:58 +02:00
joerg@trift-lap.fambruehe
013d746de8 No change - hack to force BZR conversion 2008-06-13 14:47:24 +02:00
Georgi Kodinov
a8bdb4b3c5 atuomatically merged 5.0 main to 5.0-bugteam 2008-06-12 17:32:31 +03:00
Jonathan Perkin
2244456ddf Use skip-federated by default in all example configs. 2008-06-10 21:10:56 +02:00
mysqldev
5e9ce47992 Raise version number after cloning 5.0.64 2008-06-10 14:25:21 +02:00
Georgi Kodinov
9bc98e8df2 Bug#37069 (5.0): implement --skip-federated 2008-06-03 13:12:37 +03:00
Matthias Leich mleich@mysql.com
be574a3a57 Bug#36788 Multiple funcs_1 'trig' tests are failing on vanilla builds
Fix for this bug and additional improvements/fixes
In detail:
- Remove unicode attribute from several columns
  (unicode properties were nowhere needed/tested)
  of the table tb3
  -> The runnability of these tests depends no more on
     the availibility of some optional collations.
- Use a table tb3 with the same layout for all
  engines to be tested and unify the engine name
  within the protocols.
  -> <engine>_trig_<abc>.result have the same content
- Do not load data into tb3 if these rows have no
  impact on result sets
- Add tests for NDB (they exist already in 5.1)
- "--replace_result" at various places because
  NDB variants of tests failed with "random" row
  order in results
  This fixes a till now unknown weakness within the
  funcs_1 NDB tests existing in 5.1 and 6.0
- Fix the expected result of ndb_trig_1011ext
  which suffered from Bug 32656
  + disable this test
- funcs_1 could be executed with the mysql-test-run.pl
  option "--reorder", which saves some runtime by
  optimizing server restarts.
  Runtimes on tmpfs (one attempt only):
  with    reorder 132 seconds
  without reorder 183 seconds
- Adjust two "check" statements within func_misc.test
  which were incorrect (We had one run with result set
  difference though the server worked good.)
- minor fixes in comments
2008-06-02 21:57:11 +02:00
Matthias Leich mleich@mysql.com
361dcb1a90 Bug#36345 Test 'func_misc' fails on RHAS3 x86_64
Fix for this bug and a second similar problem
found during experimenting.

This replaces the first fix (already pushed to 5.1
and merged to 6.0) which
- failed in runs with the embedded server
- cannot be ported back to 5.0
2008-05-29 18:38:10 +02:00
Georgi Kodinov
9aa8ba55f0 automatically merged 2008-05-28 17:26:26 +03:00
Alexander Barkov
ca1860c36c Updating charset doc files.
Thanks to Paul for preparing the up-to-date files
reflecting 4.1 changes.
2008-05-28 15:03:47 +05:00
Georgi Kodinov
afcdf5ad83 Bug #36887: Typo in mysql_client_test.c uses bind instead of my_bind
There was a typo in a error check causing wrong thing to be ckecked 
and a possible error not being caught.
Fixed by using the correct variable to test for malloc() errors.
2008-05-27 14:33:08 +03:00
joerg@trift-lap.fambruehe
0085566961 Merge trift-lap.fambruehe:/MySQL/M50/mysql-5.0
into  trift-lap.fambruehe:/MySQL/M50/work-5.0
2008-05-25 15:13:30 +02:00
Chad MILLER
585d205dfe Merge from 5.0 trunk. Adding mailer metainfo. 2008-05-23 20:56:39 +02:00
Chad Miller
8e15e3da89 Merge metainfo for mailer plugin. 2008-05-22 17:57:41 +02:00