1. 01 Apr, 2010 18 commits
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 294e2f1e
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6346 | marko | 2009-12-21 12:03:25 +0200 (Mon, 21 Dec 2009) | 2 lines
      branches/zip: recv_recovery_from_checkpoint_finish():
      Revert a change that was accidentally committed in r6345.
      294e2f1e
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · c66c8628
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6345 | marko | 2009-12-21 10:46:14 +0200 (Mon, 21 Dec 2009) | 7 lines
      branches/zip: recv_scan_log_recs(): Non-functional change: Replace a
      debug assertion ut_ad(len > 0) with ut_ad(len >= OS_FILE_LOG_BLOCK_SIZE).
      
      This change is only for readability, for Issue #428.  Another
      assertion on len being an integer multiple of OS_FILE_LOG_BLOCK_SIZE
      already ensured together with the old ut_ad(len > 0) that actually len
      must be at least OS_FILE_LOG_BLOCK_SIZE.
      c66c8628
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 6bad8379
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6321 | marko | 2009-12-16 16:16:33 +0200 (Wed, 16 Dec 2009) | 4 lines
      branches/zip: row_merge_drop_temp_indexes(): Revert a hack to
      transaction isolation level that was made unnecessary by r5826 (Issue #337).
      When this function is called, any active data dictionary transaction
      should have been rolled back.
      6bad8379
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 89bcaa84
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6312 | marko | 2009-12-16 10:10:36 +0200 (Wed, 16 Dec 2009) | 6 lines
      branches/zip: fil_close(): Add #ifndef UNIV_HOTBACKUP around a debug
      assertion on mutex.magic_n.  InnoDB Hot Backup is a single-threaded
      program and does not contain mutexes.  This change allows InnoDB Hot
      Backup to be compiled with UNIV_DEBUG.
      
      Suggested by Michael Izioumtchenko.
      89bcaa84
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 6bdfc9bf
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6309 | marko | 2009-12-15 14:05:50 +0200 (Tue, 15 Dec 2009) | 3 lines
      branches/zip: lock_rec_insert_check_and_lock(): Avoid casting away constness.
      Use page_rec_get_next_const() instead. This silences a gcc 4.2.4 warning.
      Reported by Sunny Bains.
      6bdfc9bf
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 195346ab
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6305 | marko | 2009-12-14 13:03:57 +0200 (Mon, 14 Dec 2009) | 2 lines
      branches/zip: row_undo_mod_del_unmark_sec_and_undo_update(): Add a missing
      const qualifier.
      195346ab
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 4f3e2fd1
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6285 | marko | 2009-12-09 09:24:50 +0200 (Wed, 09 Dec 2009) | 13 lines
      branches/zip: row_sel_fetch_columns(): Remove redundant code that was
      accidentally added in r1591, which introduced dfield_t::ext in order
      to make the merge sort of fast index creation support externally
      stored columns,
      
      Initially, I tried to allocate the bit for dfield_t::ext from
      dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
      to something that would fit in it.  Then I decided that it would be
      too risky.  The redundant check was part of the mapping.  The
      condition may have been dfield_is_null() initially.
      
      This redundant code was noticed by Sergey Petrunya on the MySQL
      internals list.
      r6288 | marko | 2009-12-09 09:51:00 +0200 (Wed, 09 Dec 2009) | 15 lines
      branches/zip: row_upd_copy_columns(): Remove redundant code that was
      accidentally added in r1591, which introduced dfield_t::ext in order
      to make the merge sort of fast index creation support externally
      stored columns.
      
      Initially, I tried to allocate the bit for dfield_t::ext from
      dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
      to something that would fit in it.  Then I decided that it would be
      too risky.  The redundant check was part of the mapping.  The
      condition may have been dfield_is_null() initially.
      
      This is similar to the redundant code in row_sel_fetch_columns() that
      was noticed by Sergey Petrunya on the MySQL internals list and removed
      in r6285.  As far as I can tell, there are no redundant UNIV_SQL_NULL
      assignments remaining after this change.
      4f3e2fd1
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · ec0ff291
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6277 | marko | 2009-12-08 11:13:36 +0200 (Tue, 08 Dec 2009) | 1 line
      branches/zip: fsp0fsp.c: Add some missing in/out and const qualifiers.
      ec0ff291
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 36097ba9
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6275 | pekka | 2009-12-03 18:32:47 +0200 (Thu, 03 Dec 2009) | 10 lines
      branches/zip: Minor changes which allow build with UNIV_HOTBACKUP
      defined to succeed:
      
      include/trx0sys.h: Allow Hot Backup build to see some
                         TRX_SYS_DOUBLEWRITE_... macros. 
      trx/trx0sys.c:     Exclude trx_sys_close() function from Hot Backup build.
      log/log0recv.[ch]: Exclude recv_sys_var_init() function from Hot Backup build.
      
      This change should not affect !UNIV_HOTBACKUP build.
      36097ba9
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 72af03ae
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6274 | marko | 2009-12-03 14:47:12 +0200 (Thu, 03 Dec 2009) | 6 lines
      branches/zip: dict_table_check_for_dup_indexes(): Assert that the
      data dictionary mutex is being held while table->indexes is accessed.
      This is already the case.
      
      Currently, only dict_table_get_next_index() and dict_table_get_first_index()
      are being invoked without holding dict_sys->mutex.
      72af03ae
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 99d5100a
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6272 | marko | 2009-12-02 11:46:05 +0200 (Wed, 02 Dec 2009) | 1 line
      branches/zip: Revert changes that were accidentally committed in r6271.
      99d5100a
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 1905eda9
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6271 | marko | 2009-12-02 11:43:49 +0200 (Wed, 02 Dec 2009) | 2 lines
      branches/zip: ChangeLog: Document that since r6270, the zlib version number
      will be displayed at start-up.
      1905eda9
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 7eab32b7
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6270 | marko | 2009-12-02 11:36:47 +0200 (Wed, 02 Dec 2009) | 1 line
      branches/zip: innobase_start_or_create_for_mysql(): Log the zlib version.
      7eab32b7
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · f00af2f2
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6269 | marko | 2009-12-02 11:35:22 +0200 (Wed, 02 Dec 2009) | 2 lines
      branches/zip: innobase_start_or_create_for_mysql(): UNIV_IBUF_DEBUG
      should not break crash recovery, but UNIV_IBUF_COUNT_DEBUG will.
      f00af2f2
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 04955f50
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6264 | vasil | 2009-12-01 16:19:44 +0200 (Tue, 01 Dec 2009) | 1 line
      branches/zip: Add ChangeLog entry for the release of 1.0.6.
      04955f50
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 7ae37787
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6263 | vasil | 2009-12-01 14:49:05 +0200 (Tue, 01 Dec 2009) | 4 lines
      branches/zip: Increment version number from 1.0.6 to 1.0.7
      
      1.0.6 has been released
      7ae37787
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot, fixes BUG#41609. · 316180bb
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6252 | marko | 2009-11-30 12:50:11 +0200 (Mon, 30 Nov 2009) | 23 lines
      branches/zip: Suppress errors about non-found temporary tables.
      Write the is_temp flag to SYS_TABLES.MIX_LEN.
      
      dict_table_t::flags: Add a flag for is_temporary, DICT_TF2_TEMPORARY.
      Unlike other flags, this will not be written to the tablespace flags
      or SYS_TABLES.TYPE, but only to SYS_TABLES.MIX_LEN.
      
      dict_build_table_def_step(): Only pass DICT_TF_BITS to tablespaces.
      
      dict_check_tablespaces_and_store_max_id(), dict_load_table():
      Suppress errors about temporary tables not being found.
      
      dict_create_sys_tables_tuple(): Write the DICT_TF2_TEMPORARY flag
      to SYS_TABLES.MIX_LEN.
      
      fil_space_create(), fil_create_new_single_table_tablespace(): Add assertions
      about space->flags.
      
      row_drop_table_for_mysql(): Do not complain about non-found temporary tables.
      
      rb://160 approved by Heikki Tuuri.  This addresses the second part of
      Bug #41609 Crash recovery does not work for InnoDB temporary tables.
      316180bb
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · 931a511a
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6248 | marko | 2009-11-30 12:19:50 +0200 (Mon, 30 Nov 2009) | 1 line
      branches/zip: ChangeLog: Document r4922 that was forgotten.
      931a511a
  2. 31 Mar, 2010 1 commit
    • Ramil Kalimullin's avatar
      Fix for bug#52397: another crash with explain extended and group_concat · 8c8d834c
      Ramil Kalimullin authored
      Problem: EXPLAIN EXTENDED was trying to resolve references to 
      freed temporary table fields for GROUP_CONCAT()'s ORDER BY arguments.
      
      Fix: use stored original GROUP_CONCAT()'s arguments in such a case.
      
      
      mysql-test/r/func_gconcat.result:
        Fix for bug#52397: another crash with explain extended and group_concat
          - test result.
      mysql-test/t/func_gconcat.test:
        Fix for bug#52397: another crash with explain extended and group_concat
          - test case.
      sql/item_sum.cc:
        Fix for bug#52397: another crash with explain extended and group_concat
          - use "pargs", printing ORDER BY arguments in the 
        Item_func_group_concat::print() instead of "order" to avoid
        possible reference resolving to (freed) temporary table fields.
      8c8d834c
  3. 29 Mar, 2010 1 commit
  4. 30 Mar, 2010 2 commits
  5. 26 Mar, 2010 1 commit
    • Sergey Glukhov's avatar
      Bug#52177 crash with explain, row comparison, join, text field · e5284e03
      Sergey Glukhov authored
      The crash is the result of an attempt made by JOIN::optimize to evaluate
      the WHERE condition when no records have been actually read.
      The fix is to remove erroneous 'outer_join' variable check.
      
      
      mysql-test/r/join.result:
        test result
      mysql-test/t/join.test:
        test case
      sql/sql_select.cc:
        removed erroneous 'outer_join' variable check.
      e5284e03
  6. 24 Mar, 2010 1 commit
    • Sergey Glukhov's avatar
      Bug#48483 crash in get_best_combination() · 3e1ee393
      Sergey Glukhov authored
      The crash happens because greedy_serach
      can not determine best plan due to
      wrong inner table dependences. These
      dependences affects join table sorting
      which performs before greedy_search starting.
      In our case table which has real 'no dependences'
      should be put on top of the list but it does not
      happen as inner tables have no dependences as well.
      The fix is to exclude RAND_TABLE_BIT mask from
      condition which checks if table dependences
      should be updated.
      
      
      mysql-test/r/join.result:
        test result
      mysql-test/t/join.test:
        test case
      sql/sql_select.cc:
        RAND_TABLE_BIT mask should not be counted as it
        prevents update of inner table dependences.
        For example it might happen if RAND() function
        is used in JOIN ON clause.
      3e1ee393
  7. 23 Mar, 2010 1 commit
  8. 26 Mar, 2010 1 commit
  9. 29 Mar, 2010 1 commit
    • Tatiana A. Nurnberg's avatar
      Bug#48525: trigger changes "Column 'id' cannot be null" behaviour · 0d81b358
      Tatiana A. Nurnberg authored
      CHECK_FIELD_IGNORE was treated as CHECK_FIELD_ERROR_FOR_NULL;
      UPDATE...SET...NULL on NOT NULL fields behaved differently after
      a trigger.
      
      Now distinguishes between IGNORE and ERROR_FOR_NULL and save/restores
      check-field options.
      
      
      mysql-test/r/trigger.result:
        Show that UPDATE...SET...NULL on NOT NULL columns doesn't behave differently
        when run after a trigger.
      mysql-test/t/trigger.test:
        Show that UPDATE...SET...NULL on NOT NULL columns doesn't behave differently
        when run after a trigger.
      sql/field_conv.cc:
        CHECK_FIELD_IGNORE was treated as CHECK_FIELD_ERROR_FOR_NULL.
        Distinguish between the two.
      sql/sp_head.cc:
        Raise error as needed.
      sql/sql_class.cc:
        Save and restore check-fields options.
      sql/sql_class.h:
        Make room so we can save check-fields options.
      sql/sql_insert.cc:
        Raise error as needed.
      0d81b358
  10. 28 Mar, 2010 2 commits
    • unknown's avatar
      Bug #50407 mysqlbinlog --database=X produces bad output for SAVEPOINTs · 78557dd4
      unknown authored
      When mysqlbinlog was given the --database=X flag, it always printed
      'ROLLBACK TO', but the corresponding 'SAVEPOINT' statement was not
      printed. The replicated filter(replicated-do/ignore-db) and binlog
      filter (binlog-do/ignore-db) has the same problem. They are solved
      in this patch together.
      
      After this patch, We always check whether the query is 'SAVEPOINT'
      statement or not. Because this is a literal check, 'SAVEPOINT' and
      'ROLLBACK TO' statements are also binlogged in uppercase with no
      any comments.
      
      The binlog before this patch can be handled correctly except one case
      that any comments are in front of the keywords. for example:
       /* bla bla */ SAVEPOINT a;
       /* bla bla */ ROLLBACK TO a;
      78557dd4
    • unknown's avatar
      Bug #50095 Multi statement including CREATE EVENT causes rotten binlog entry · dbe41670
      unknown authored
      The log event of 'CREATE EVENT' was being binlogged with garbage
      at the end of the query if 'CREATE EVENT' is followed by another SQL statement
      and they were executed as one command.
      for example:
          DELIMITER |;
          CREATE EVENT e1 ON EVERY DAY DO SELECT 1; SELECT 'a';
          DELIMITER ;|
      When binlogging 'CREATE EVENT', we always create a new statement with definer
      and write it into the log event. The new statement is made from cpp_buf(preprocessed buffer).
      which is not a c string(end with '\0'), but it is copied as a c string.
      
      In this patch, cpp_buf is copied with its length.
      dbe41670
  11. 26 Mar, 2010 4 commits
    • Sergey Vojtovich's avatar
      Applying InnoDB snapshot · d5589f11
      Sergey Vojtovich authored
      Detailed revision comments:
      
      r6884 | vdimov | 2010-03-26 13:05:03 +0200 (Fri, 26 Mar 2010) | 6 lines
      branches/5.1:
      
      Fix a non-determinism in innodb_bug38231.
      
      Reported by:	Sergey Vojtovich <svoj@Sun.COM>
      
      r6884 | vdimov | 2010-03-26 13:05:03 +0200 (Fri, 26 Mar 2010) | 6 lines
      branches/5.1:
      
      Fix a non-determinism in innodb_bug38231.
      
      Reported by:	Sergey Vojtovich <svoj@Sun.COM>
      d5589f11
    • Sergey Vojtovich's avatar
      52d50e49
    • Sergey Vojtovich's avatar
      eba2b340
    • Sergey Glukhov's avatar
      Bug#52164 Assertion failed: param.sort_length, file .\filesort.cc, line 149 · 2992f3d4
      Sergey Glukhov authored
      The crash happens because of incorrect max_length calculation
      in QUOTE function(due to overflow). max_length is set
      to 0 and it leads to assert failure.
      The fix is to cast expression result to
      ulonglong variable and adjust it if the
      result exceeds MAX_BLOB_WIDTH.
      
      
      mysql-test/r/func_str.result:
        test case
      mysql-test/t/func_str.test:
        test case
      sql/item_strfunc.h:
        cast expression result to ulonglong variable and
        adjust it if the result exceeds MAX_BLOB_WIDTH.
      2992f3d4
  12. 25 Mar, 2010 7 commits
    • Sergey Vojtovich's avatar
      BUG#46565 - repair of partition fail for archive engine · fc0c7408
      Sergey Vojtovich authored
      There was no way to repair corrupt ARCHIVE data file,
      when unrecoverable data loss is inevitable.
      
      With this fix REPAIR ... EXTENDED attempts to restore
      as much rows as possible, ignoring unrecoverable data.
      
      Normal REPAIR is still able to repair meta-data file
      only.
      
      mysql-test/r/archive.result:
        A test case for BUG#46565.
      mysql-test/std_data/bug46565.ARZ:
        A test case for BUG#46565.
      mysql-test/std_data/bug46565.frm:
        A test case for BUG#46565.
      mysql-test/t/archive.test:
        A test case for BUG#46565.
      storage/archive/ha_archive.cc:
        Allow unrecoverable data loss when extended repair
        is requested.
      fc0c7408
    • Ramil Kalimullin's avatar
      An addition to fix for BUG#51866 - crash with repair · 94750197
      Ramil Kalimullin authored
      by sort and fulltext keys.
      
      Min value for myisam_sort_buffer_size is 4096.
      94750197
    • Andrei Elkin's avatar
      merge from 5.1-bt rep · c8c1dd66
      Andrei Elkin authored
      c8c1dd66
    • Sergey Vojtovich's avatar
    • Andrei Elkin's avatar
      merging bug#52304 to 5.1-bt,pe · 244b2e98
      Andrei Elkin authored
      244b2e98
    • Sergey Vojtovich's avatar
      2aeaf309
    • Sergey Vojtovich's avatar
      BUG#51866 - crash with repair by sort and fulltext keys · e99136cf
      Sergey Vojtovich authored
      Repairing MyISAM table with fulltext indexes and low
      myisam_sort_buffer_size may crash the server.
      
      Estimation of number of index entries was done incorrectly,
      causing further assertion failure or server crash.
      
      Docs note: min value for myisam_sort_buffer_size has been
      changed from 4 to 4096.
      
      mysql-test/r/fulltext.result:
        A test case for BUG#51866.
      mysql-test/r/myisam.result:
        Min value for myisam_sort_buffer_size is 4096.
      mysql-test/r/variables.result:
        Min value for myisam_sort_buffer_size is 4096.
      mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_32.result:
        Min value for myisam_sort_buffer_size is 4096.
      mysql-test/t/fulltext.test:
        A test case for BUG#51866.
      sql/mysqld.cc:
        Min value for myisam_sort_buffer_size is 4096.
      storage/myisam/mi_check.c:
        When estimating number of index entries for external
        fulltext parser, take into account that key_length may
        be bigger than myisam_sort_buffer_size. Reuse logic
        from _create_index_by_sort(): force MIN_SORT_BUFFER to
        be min value for myisam_sort_buffer_size.
        
        Another problem is that ftkey_nr has no other meaning
        than serial number of fulltext index starting with 1.
        We can't say if this key using built-in or external
        parser basing on it's value. In other words we always
        entered if-branch for external parser. At this point,
        the only way to check if we use default parser is to
        compare keyinfo::parser with &ft_default_parser.
      storage/myisam/sort.c:
        Get rid of MIN_SORT_MEMORY, use MIN_SORT_BUFFER instead
        (defined in myisamdef.h, has the same value and purpose).
      e99136cf