1. 05 Apr, 2012 2 commits
  2. 04 Apr, 2012 4 commits
  3. 03 Apr, 2012 2 commits
    • Michael Widenius's avatar
      Merge with 5.1 · 17822d08
      Michael Widenius authored
      17822d08
    • Michael Widenius's avatar
      Fixed lp:970528 "Server crashes in my_strnncollsp_simple on LEFT JOIN with CSV table, TEXT field" · c83b59d9
      Michael Widenius authored
      The main problem was a bug in CSV where it provided wrong statistics (it claimed the table was empty when it wasn't)
      I also fixed wrong freeing of blob's in the CSV handler. (Any call to handler::read_first_row() on a CSV table with blobs would fail)
      
      
      
      mysql-test/r/csv.result:
        Added new test case
      mysql-test/r/partition_innodb.result:
        Updated test results after fixing bug with impossible partitions and const tables
      mysql-test/t/csv.test:
        Added new test case
      sql/sql_select.cc:
        Cleaned up code for handling of partitions.
        Fixed also a bug where we didn't threat a table with impossible partitions as a const table.
      storage/csv/ha_tina.cc:
        Allocate blobroot onces.
      c83b59d9
  4. 02 Apr, 2012 1 commit
  5. 30 Mar, 2012 4 commits
  6. 29 Mar, 2012 3 commits
  7. 28 Mar, 2012 2 commits
    • Michael Widenius's avatar
      Merge with 5.1 · fbd6b0c7
      Michael Widenius authored
      fbd6b0c7
    • Michael Widenius's avatar
      Fixed lp:944422 "mysql_upgrade destroys Maria tables?" · 0a190b6b
      Michael Widenius authored
      The issue was that check/optimize/anaylze did not zerofill the table before they started to work on it.
      Added one more element to not often used function handler::auto_repair() to allow handler to decide when to auto repair.
      
      
      mysql-test/suite/maria/r/maria-autozerofill.result:
        Test case for lp:944422
      mysql-test/suite/maria/t/maria-autozerofill.test:
        Test case for lp:944422
      sql/ha_partition.cc:
        Added argument to auto_repair()
      sql/ha_partition.h:
        Added argument to auto_repair()
      sql/handler.h:
        Added argument to auto_repair()
      sql/table.cc:
        Let auto_repair() decide which errors to trigger auto-repair
      storage/archive/ha_archive.h:
        Added argument to auto_repair()
      storage/csv/ha_tina.h:
        Added argument to auto_repair()
      storage/maria/ha_maria.cc:
        Give better error & warning messages for auto-repaired tables.
      storage/maria/ha_maria.h:
        Added argument to auto_repair()
        Always auto-repair in case of moved table.
      storage/maria/ma_open.c:
        Remove special handling of HA_ERR_OLD_FILE (this is now handled in auto_repair())
      storage/myisam/ha_myisam.h:
        Added argument to auto_repair()
      0a190b6b
  8. 21 Mar, 2012 2 commits
  9. 15 Mar, 2012 1 commit
  10. 14 Mar, 2012 2 commits
  11. 12 Mar, 2012 3 commits
  12. 09 Mar, 2012 4 commits
    • Igor Babaev's avatar
      Fixed LP bug #930814. · ea3ffc7f
      Igor Babaev authored
      This bug was introduced into mariadb 5.2 in the December 2010 with
      the patch that added a new engine property: the ability to support
      virtual columns.    
      As a result of this bug the information from frm files for tables 
      that contained virtual columns did not appear in the information schema
      tables.
      ea3ffc7f
    • Michael Widenius's avatar
      Added test case for lp:905782 "Assertion `pageno < ((1ULL) << 40)' failed at... · 9598f1c5
      Michael Widenius authored
      Added test case for lp:905782 "Assertion `pageno < ((1ULL) << 40)' failed at ma_pagecache.c:3438: pagecache_read or table corruption on INSERT into a ucs2 table"
      The orignal bug has been fixed earlier
      9598f1c5
    • unknown's avatar
      160eb5b0
    • Igor Babaev's avatar
      Fixed LP bug #884175. · a8cbfd38
      Igor Babaev authored
      If in the where clause of the a query some comparison conditions on the
      field under a MIN/MAX aggregate function contained constants whose sizes
      exceeded the size of the field then the query could return a wrong result
      when the optimizer had chosen to apply the MIN/MAX optimization.
      With such conditions the MIN/MAX optimization still could be applied, yet
      it would require a more thorough analysis of the keys built to find
      the value of MIN/MAX aggregate functions with index look-ups.   
      The current patch just prohibits using the MIN/MAX optimization in this
      situation.
      a8cbfd38
  13. 06 Mar, 2012 2 commits
  14. 02 Mar, 2012 2 commits
  15. 01 Mar, 2012 1 commit
  16. 28 Feb, 2012 5 commits
    • Karen Langford's avatar
      AIX builds fail for comments using // · 44875c86
      Karen Langford authored
      44875c86
    • Michael Widenius's avatar
      Automatic merge · 7c9a8780
      Michael Widenius authored
      7c9a8780
    • Joerg Bruehe's avatar
      c6cb12dd
    • Joerg Bruehe's avatar
      The current year is 2012, and nobody noticed ... · bec78be0
      Joerg Bruehe authored
      Update the year in the copyright notice, file "README".
      bec78be0
    • Michael Widenius's avatar
      Fixed lp:905716 "Assertion `page->size <= share->max_index_block_size'" · 8bd65762
      Michael Widenius authored
      The issue was that Aria allowed too long keys to be created (so that the internal buffer was not big enough to hold the whole key).
      Key lengths is now limited to HA_MAX_KEY_LENGTH (1000), as for MyISAM.
      Fixed failure in  "_ma_apply_redo_index: Assertion `new_page_length == 0", as found by buildbot.
      
      mysql-test/suite/maria/r/maria.result:
        Updated results
      mysql-test/suite/maria/r/maria3.result:
        Updated results. Added test for bug fix
      mysql-test/suite/maria/t/maria3.test:
        Updated results. Added test for bug fix
      mysql-test/suite/maria/t/optimize.test:
        Updated test for new max key length
      storage/maria/ha_maria.cc:
        Limit key to HA_MAX_KEY_LENGTH.
      storage/maria/ma_key_recover.c:
        Limit used page length to max page size (this is in line with the code that writes the entry to the log).
        This fixes failure in  "_ma_apply_redo_index: Assertion `new_page_length == 0", as found by buildbot.
      storage/maria/ma_search.c:
        Extra DBUG
      storage/maria/ma_write.c:
        Added test to detect errors earlier.
      8bd65762