1. 25 May, 2011 2 commits
  2. 24 May, 2011 3 commits
    • Bjorn Munch's avatar
      merge from 5.5 main · 829a418a
      Bjorn Munch authored
      829a418a
    • Bjorn Munch's avatar
      Bug#11831031: MTR SHOULD FIND TEST SUITES FROM FEATURE TREES OUTSIDE MYSQL-TEST · b0a74097
      Bjorn Munch authored
      Backported from trunk-mtr
      b0a74097
    • Marko Mäkelä's avatar
      Backport an InnoDB Bug #58815 (Bug #11765812) work-around from mysql-trunk: · b2270aed
      Marko Mäkelä authored
      ------------------------------------------------------------
      revno 2876.244.305
      revision id marko.makela@oracle.com-20110413082211-e6ouhjz5rmqxcqap
      parent  marko.makela@oracle.com-20110413075948-kvytmc37ye1nt7d9
      committer  Marko Mäkelä <marko.makela@oracle.com>
      branch nick 5.6-innodb
      timestamp Wed 2011-04-13 11:22:11 +0300
      message:
        Suppress the Bug #58815 (Bug #11765812) assertion failure.
      
        buf_page_get_gen(): Introduce BUF_GET_POSSIBLY_FREED for suppressing the
        check that the file page must not have been freed.
      
        btr_estimate_n_rows_in_range_on_level(): Pass BUF_GET_POSSIBLY_FREED and
        explain in the comments why this is needed and why it should be mostly
        harmless to ignore the problem. If InnoDB had always initialized all
        unused fields in data files, no problem would exist.
      
        This change does not fix the bug, it just "shoots the messenger".
      
        rb:647 approved by Jimmy Yang
      b2270aed
  3. 23 May, 2011 3 commits
  4. 22 May, 2011 3 commits
  5. 21 May, 2011 4 commits
  6. 20 May, 2011 4 commits
    • Dmitry Shulga's avatar
      34d731ef
    • Dmitry Shulga's avatar
      Fixed bug#11749345 (formerly bug#38813) - increasing memory consumption · 967cf758
      Dmitry Shulga authored
      when selecting from I_S and views exist, in SP.
      
      Symptoms: re-execution of prepared statement (or statement in a stored
      routine) which read from one of I_S tables and which in order to fill
      this I_S table had to open a view led to increasing memory consumption.
      
      What happened in this situation was that during the process of view
      opening for purpose of I_S filling view-related structures (like its
      LEX) were allocated on persistent MEM_ROOT of prepared statement (or 
      stored routine). Since this MEM_ROOT is not freed until prepared
      statement deallocation (or expulsion of stored routine from the cache)
      and code responsible for filling I_S is not able to re-use results of
      view opening from previous executions this allocation ended up in
      memory hogging.
      
      This patch solves the problem by ensuring that when a view opened
      for the purpose of I_S filling all its structures are allocated on
      non-persistent runtime MEM_ROOT. This is achieved by activating a
      temporary Query_arena bound to this MEM_ROOT.
      Since this step makes impossible linking of view structures into
      LEX of our prepared statement (or stored routine statement) this
      patch also changes code filling I_S table to install a proxy LEX
      before trying to open a view or a table. Consequently some code
      which was responsible for backing-up/restoring parts of LEX when
      view/table was opened during filling of I_S table became redundant
      and was removed.
      
      This patch doesn't contain test case for this bug as it is hard
      to test memory hogging in our test suite.
      967cf758
    • Bjorn Munch's avatar
      merge from 5.5 main · 791bcea6
      Bjorn Munch authored
      791bcea6
    • Mayank Prasad's avatar
      resolved pending merge conflicts from 5.1 · a1ad86ce
      Mayank Prasad authored
      a1ad86ce
  7. 19 May, 2011 4 commits
    • Luis Soares's avatar
      BUG#11746302 · b14c541a
      Luis Soares authored
      Manual merged mysql-5.1-gca into latest mysql-5.5.
      
      Conflicts
      =========
      Text conflict in mysql-test/suite/rpl/r/rpl_relayspace.result
      Text conflict in mysql-test/suite/rpl/t/rpl_relayspace.test
      b14c541a
    • Luis Soares's avatar
      BUG#11746302 · f633e6f5
      Luis Soares authored
      Automerge mysql-5.1-gca into latest mysql-5.1.
      f633e6f5
    • Luis Soares's avatar
      BUG#11746302: 25228: RPL_RELAYSPACE.TEST FAILS ON POWERMACG5, · 21163d68
      Luis Soares authored
                    VM-WIN2003-32-A, SLES10-IA64-A 
            
      The test case waits for master_pos_wait not to timeout, which
      means that the deadlock between SQL and IO threads was 
      succesfully and automatically dealt with.
            
      However, very rarely, master_pos_wait reports a timeout. This
      happens because the time set for master_pos_wait to wait was
      too small (6 seconds). On slow test env this could be a 
      problem.
            
      We fix this by setting the timeout inline with the one used
      in sync_slave_with_master (300 seconds). In addition we 
      refactored the test case and refined some comments.
      21163d68
    • Mikael Ronström's avatar
      merge · 84af7972
      Mikael Ronström authored
      84af7972
  8. 18 May, 2011 7 commits
    • Mayank Prasad's avatar
      Bug#11764633 : 57491: THD->MAIN_DA.IS_OK() ASSERT IN EMBEDDED · 55d3381c
      Mayank Prasad authored
      Issue:
      While running embedded server, if client issues TEE command (\T foo/bar) and
      "foo/bar" directory doesn't exist, it is suppose to give error. But it was
      aborting.  This was happening because wrong error handler was being called.
      
      Solution:
      Modified calls to correct error handler. In embedded server case, there are 
      two error handler (client and server) which are supposed to be called based 
      on which context code is in. If it is in client context, client error handler
      should be called otherwise server.
      
      Test case:
      Test case automation is not possible as current (following) code doesn't 
      allow '\T' to be executed from command line (OR command read from a file):
      [client/mysql.cc]
      ...
       static int
       com_tee(String *buffer __attribute__((unused)),
               char *line __attribute__((unused)))
       {
         char file_name[FN_REFLEN], *end, *param;
      
         if (status.batch) << THIS IS TRUE WHILE EXECUTING FROM COMMAND LINE.
            return 0;
       ...
      So, not adding test case in GA. WIll add a test case in mysql-trunk after 
      removing above code so that this could be properly tested before GA.
      55d3381c
    • Mayank Prasad's avatar
      merge from 5.1 for bug#11764633 · 359549be
      Mayank Prasad authored
      359549be
    • Marko Mäkelä's avatar
      Fix a bogus UNIV_SYNC_DEBUG failure in the fix of Bug #59641 · 262668e3
      Marko Mäkelä authored
      or Oracle Bug #11766513.
      
      trx_undo_free_prepared(): Do not acquire or release trx->rseg->mutex.
      This code is invoked in the single-threaded part of shutdown, therefore
      a mutex is not needed.
      262668e3
    • Mikael Ronström's avatar
      merge · 54574a52
      Mikael Ronström authored
      54574a52
    • Mikael Ronström's avatar
      215ce05a
    • Sergey Glukhov's avatar
      5.1 -> 5.5 merge · a48bff1d
      Sergey Glukhov authored
      a48bff1d
    • Sergey Glukhov's avatar
      Bug#12403504 AFTER FIX FOR #11889186 : ASSERTION FAILED: DELSUM+(INT) Y/4-TEMP > 0 · a7cd008e
      Sergey Glukhov authored
      There are two problems:
      1. There is a missing check for 'year' parameter(year can not be greater than 9999) in
         makedate function. fix: added check that year can not be greater than 9999.
      2. There is a missing check for zero date in from_days() function.
         fix: added zero date check into Item_func_from_days::get_date()
         function.
      a7cd008e
  9. 17 May, 2011 1 commit
    • Marko Mäkelä's avatar
      Bug#12543706 - innodb-fast-shutdown=2: Assert · 2646dd96
      Marko Mäkelä authored
      node->modification_counter == node->flush_counter
      
      This bug (an assertion failure during a crash-like shutdown)
      was introduced by the fix of
      Bug#12323643 Clean up the InnoDB thread shutdown and assertions (WL#5136).
      
      fil_node_close_file(): Relax the failing assertion
      when innodb_fast_shutdown=2.
      2646dd96
  10. 16 May, 2011 7 commits
    • Marc Alff's avatar
      Local merge · b1ad5f2e
      Marc Alff authored
      b1ad5f2e
    • Marc Alff's avatar
      Fixed code review comments · b5d91d34
      Marc Alff authored
      b5d91d34
    • Guilhem Bichot's avatar
      Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'. · 25221ccc
      Guilhem Bichot authored
      In sql_class.cc, 'row_count', of type 'ha_rows', was used as last argument for
      ER_TRUNCATED_WRONG_VALUE_FOR_FIELD which is
      "Incorrect %-.32s value: '%-.128s' for column '%.192s' at row %ld".
      So 'ha_rows' was used as 'long'.
      On SPARC32 Solaris builds, 'long' is 4 bytes and 'ha_rows' is 'longlong' i.e. 8 bytes.
      So the printf-like code was reading only the first 4 bytes.
      Because the CPU is big-endian, 1LL is 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x01
      so the first four bytes yield 0. So the warning message had "row 0" instead of
      "row 1" in test outfile_loaddata.test:
      -Warning	1366	Incorrect string value: '\xE1\xE2\xF7' for column 'b' at row 1
      +Warning	1366	Incorrect string value: '\xE1\xE2\xF7' for column 'b' at row 0
      
      All error-messaging functions which internally invoke some printf-life function
      are potential candidate for such mistakes.
      One apparently easy way to catch such mistakes is to use
      ATTRIBUTE_FORMAT (from my_attribute.h).
      But this works only when call site has both:
      a) the format as a string literal
      b) the types of arguments.
      So:
        func(ER(ER_BLAH), 10);
      will silently not be checked, because ER(ER_BLAH) is not known at
      compile time (it is known at run-time, and depends on the chosen
      language).
      And
        func("%s", a va_list argument);
      has the same problem, as the *real* type of arguments is not
      known at this site at compile time (it's known in some caller).
      Moreover,
        func(ER(ER_BLAH));
      though possibly correct (if ER(ER_BLAH) has no '%' markers), will not
      compile (gcc says "error: format not a string literal and no format
      arguments").
      
      Consequences:
      1) ATTRIBUTE_FORMAT is here added only to functions which in practice
      take "string literal" formats: "my_error_reporter" and "print_admin_msg".
      2) it cannot be added to the other functions: my_error(),
      push_warning_printf(), Table_check_intact::report_error(),
      general_log_print().
      
      To do a one-time check of functions listed in (2), the following
      "static code analysis" has been done:
      1) replace
        my_error(ER_xxx, arguments for substitution in format)
      with the equivalent
        my_printf_error(ER_xxx,ER(ER_xxx), arguments for substitution in
      format),
      so that we have ER(ER_xxx) and the arguments *in the same call site*
      2) add ATTRIBUTE_FORMAT to push_warning_printf(),
      Table_check_intact::report_error(), general_log_print()
      3) replace ER(xxx) with the hard-coded English text found in
      errmsg.txt (like: ER(ER_UNKNOWN_ERROR) is replaced with
      "Unknown error"), so that a call site has the format as string literal
      4) this way, ATTRIBUTE_FORMAT can effectively do its job
      5) compile, fix errors detected by ATTRIBUTE_FORMAT
      6) revert steps 1-2-3.
      The present patch has no compiler error when submitted again to the
      static code analysis above.
      It cannot catch all problems though: see Field::set_warning(), in
      which a call to push_warning_printf() has a variable error
      (thus, not replacable by a string literal); I checked set_warning() calls
      by hand though.
      
      See also WL 5883 for one proposal to avoid such bugs from appearing
      again in the future.
      
      The issues fixed in the patch are:
      a) mismatch in types (like 'int' passed to '%ld')
      b) more arguments passed than specified in the format.
      This patch resolves mismatches by changing the type/number of arguments,
      not by changing error messages of sql/share/errmsg.txt. The latter would be wrong,
      per the following old rule: errmsg.txt must be as stable as possible; no insertions
      or deletions of messages, no changes of type or number of printf-like format specifiers,
      are allowed, as long as the change impacts a message already released in a GA version.
      If this rule is not followed:
      - Connectors, which use error message numbers, will be confused (by insertions/deletions
      of messages)
      - using errmsg.sys of MySQL 5.1.n with mysqld of MySQL 5.1.(n+1)
      could produce wrong messages or crash; such usage can easily happen if
      installing 5.1.(n+1) while /etc/my.cnf still has --language=/path/to/5.1.n/xxx;
      or if copying mysqld from 5.1.(n+1) into a 5.1.n installation.
      When fixing b), I have verified that the superfluous arguments were not used in the format
      in the first 5.1 GA (5.1.30 'bteam@astra04-20081114162938-z8mctjp6st27uobm').
      Had they been used, then passing them today, even if the message doesn't use them
      anymore, would have been necessary, as explained above.
      25221ccc
    • Kent Boortz's avatar
      - Changes needed to use newer WiX version (Bug#60029) · de91727e
      Kent Boortz authored
      - Added an alterantive search path for WiX components
      - Added a custom welcome dialog to include the copyright line (Bug#59805 and Bug#59512)
      - Excluded some binaries to make package smaller, in effect makig the
        "essentials" package obsolete
      - Added a bit more error checking when running the WiX tools
      
      WiX XML changes done by Johannes Taxacher
      de91727e
    • Andrei Elkin's avatar
      Bug 12535301 - SYS_VARS.RPL_INIT_SLAVE_FUNC MISMATCHES IN DAILY-5.5 · 68e6a24d
      Andrei Elkin authored
      notifying PB2 the test fails through mysql-test/collections/default.experimental.
      68e6a24d
    • Alexander Nozdrin's avatar
      Ignore auto-generated files. · 19523cae
      Alexander Nozdrin authored
      19523cae
    • Alexander Nozdrin's avatar
      A patch for Bug#12429877: QUERY_TABLES_LIST::SROUTINES IS NOT · da96e915
      Alexander Nozdrin authored
      FREED IN FLUSH_READ_LOCK (VALGRIND WARNING).
      
      The problem was that under some circustances the memory allocated
      for Query_tables_list::sroutines was not freed properly.
      The cause of this problem was the absence of
      LEX::restore_backup_query_tables_list() call in one of the branches
      in mysql_table_grant() function.
      da96e915
  11. 14 May, 2011 2 commits