1. 19 Jul, 2010 1 commit
  2. 17 Jul, 2010 2 commits
    • Igor Babaev's avatar
      Merge · 4f564a54
      Igor Babaev authored
      4f564a54
    • Igor Babaev's avatar
      Fixed bug #604503. · 452860df
      Igor Babaev authored
      If the expression for a virtual column of table contained datetime
      comparison then the execution of the second query that used this
      virtual column caused a crash. It happened because the execution
      of the first query that used this virtual column inserted a cached
      item into the expression tree. The cached tree was allocated in
      the statement memory while the expression tree was allocated in
      the table memory.
      Now the cached items that are inserted into expressions for virtual
      columns with datetime comparisons are always allocated in the same
      mem_root as the expressions for virtual columns. So now the inserted
      cached items are valid for any queries that use these virtual columns. 
      452860df
  3. 16 Jul, 2010 5 commits
    • Michael Widenius's avatar
      Merge with MariaDB 5.1 · f58199f6
      Michael Widenius authored
      f58199f6
    • Michael Widenius's avatar
      Merge patch for ha_rnd_init() · 178f1846
      Michael Widenius authored
      178f1846
    • Michael Widenius's avatar
      Fix for LP#588251: doStartTableScan() result not checked. · e9166ca1
      Michael Widenius authored
      The issue was that we didn't always check result of ha_rnd_init() which caused a problem for handlers that returned an error in this code.
      - Changed prototype of ha_rnd_init() to ensure that we get a compile warning if result is not checked.
      - Added ha_rnd_init_with_error() that prints error on failure.
      - Checked all usage of ha_rnd_init() and ensure we generate an error message on failures.
      - Changed init_read_record() to return 1 on failure.
      
      
      
      
      sql/create_options.cc:
        Fixed wrong printf
      sql/event_db_repository.cc:
        Check result from init_read_record()
      sql/events.cc:
        Check result from init_read_record()
      sql/filesort.cc:
        Check result from ha_rnd_init()
      sql/ha_partition.cc:
        Check result from ha_rnd_init()
      sql/ha_partition.h:
        Fixed compiler warning
      sql/handler.cc:
        Added ha_rnd_init_with_error()
        Check result from ha_rnd_init()
      sql/handler.h:
        Added ha_rnd_init_with_error()
        Changed prototype of ha_rnd_init() to ensure that we get a compile warning if result is not checked
      sql/item_subselect.cc:
        Check result from ha_rnd_init()
      sql/log.cc:
        Check result from ha_rnd_init()
      sql/log_event.cc:
        Check result from ha_rnd_init()
      sql/log_event_old.cc:
        Check result from ha_rnd_init()
      sql/mysql_priv.h:
        init_read_record() now returns error code on failure
      sql/opt_range.cc:
        Check result from ha_rnd_init()
      sql/records.cc:
        init_read_record() now returns error code on failure
        Check result from ha_rnd_init()
      sql/sql_acl.cc:
        Check result from init_read_record()
      sql/sql_cursor.cc:
        Print error if ha_rnd_init() fails
      sql/sql_delete.cc:
        Check result from init_read_record()
      sql/sql_help.cc:
        Check result from init_read_record()
      sql/sql_plugin.cc:
        Check result from init_read_record()
      sql/sql_select.cc:
        Check result from ha_rnd_init()
        Print error if ha_rnd_init() fails.
      sql/sql_servers.cc:
        Check result from init_read_record()
      sql/sql_table.cc:
        Check result from init_read_record()
      sql/sql_udf.cc:
        Check result from init_read_record()
      sql/sql_update.cc:
        Check result from init_read_record()
      storage/example/ha_example.cc:
        Don't return error on rnd_init()
      storage/ibmdb2i/ha_ibmdb2i.cc:
        Removed not relevant comment
      e9166ca1
    • Michael Widenius's avatar
      Fixed wrong error message from federatedx (which could lead to assert in DBUG code) · 24c08f52
      Michael Widenius authored
      mysql-test/suite/federated/federated_server.result:
        Update to new error message
      mysql-test/suite/federated/federated_server.test:
        Update to new error message
      storage/federatedx/ha_federatedx.cc:
        Return real error code, not 0, as in some cases before.
      24c08f52
    • Michael Widenius's avatar
      mysql client: Ignore --comments at start of command line. This allows one to... · 9f96097a
      Michael Widenius authored
      mysql client: Ignore --comments at start of command line. This allows one to more easily run mysqltest tests trough the command line.
      Fixed bug: LP#603026 RQG: pagecache_read: Assertion `pageno < ((1ULL) << 40)' on OPTIMIZE TABLE of a Maria table  
      
      client/mysql.cc:
        Removed Oracle copyright from stdout, as Oracle doesn't have copyright to all code in this file.
        Ignore --comments at start of command line. This allows one to more easily run mysqltest tests trough the command line.
      mysql-test/suite/maria/r/optimize.result:
        Added test for LP#603026
      mysql-test/suite/maria/t/optimize.test:
        Added test for LP#603026
      sql/net_serv.cc:
        Removed DBUG_ASSERT(), as this code can happen during testing.
      storage/maria/ma_check.c:
        Fixed bug: LP#603026 RQG: pagecache_read: Assertion `pageno < ((1ULL) << 40)' on OPTIMIZE TABLE of a Maria table  
        The problem was duplicated memory usage with long packed keys.
      9f96097a
  4. 15 Jul, 2010 1 commit
    • Igor Babaev's avatar
      Fixed bug #603186. · 40901007
      Igor Babaev authored
      There were two problems that caused wrong results reported with this bug.
      1. In some cases stored(persistent) virtual columns were not marked
      in the write_set and in the vcol_set bitmaps.
      2. If the list of fields in an insert command was empty then the values of
      the stored virtual columns were set to default.
      
      To fix the first problem the function st_table::mark_virtual_columns_for_write
      was modified. Now the function has a parameter that says whether the virtual 
      columns are to be marked for insert or for update.  
      To fix the second problem a special handling of empty insert lists is
      added in the function fill_record().
      40901007
  5. 13 Jul, 2010 2 commits
    • Igor Babaev's avatar
      Fixed bug #603654. · 683154d1
      Igor Babaev authored
      If a virtual column was used in the ORDER BY clause of a query
      and some of the columns this virtual column was based upon were
      not referenced anywhere in the query then the execution of the
      query could cause an assertion failure.
      It happened because in this case the bitmap of the columns used
      for ordering keys was not formed correctly.
      683154d1
    • Igor Babaev's avatar
      Fixed bug #604549. · 73be27c0
      Igor Babaev authored
      There was no error thrown when creating a table with a virtual table
      computed by an expression returning a row.
      This caused a crash when inserting into the table.
      
      Removed periods at the end of the error messages for virtual columns.
      Adjusted output in test result files accordingly. 
      73be27c0
  6. 09 Jul, 2010 2 commits
  7. 07 Jul, 2010 1 commit
  8. 03 Jul, 2010 1 commit
    • Igor Babaev's avatar
      Fixed bug #601164. · b95bd9f5
      Igor Babaev authored
      The functions mysql_delete and mysql_update lacked calls of
      updated_virtual_fields(). This caused wrong results for
      some DELETEs/UPDATEs.
      Added test cases for this bug.
      b95bd9f5
  9. 02 Jul, 2010 1 commit
  10. 01 Jul, 2010 4 commits
  11. 30 Jun, 2010 1 commit
  12. 29 Jun, 2010 1 commit
  13. 28 Jun, 2010 4 commits
  14. 25 Jun, 2010 1 commit
  15. 24 Jun, 2010 1 commit
    • Hakan Kuecuekyilmaz's avatar
      Make MariaDB compile with VS 2010 · 4ee9e66d
      Hakan Kuecuekyilmaz authored
      Most of the changes are backports from MySQL 5.5. Please note
      that the 64-bit build fails with VS 2010 and the 32-bit build
      has problems running mysql-test-run.pl.
            
      * Added files for compiling with VS 2010 and added them
      to Makefile.am.
      * ifdef'ed ETIMEDOUT, because it is defined by VS 2010 now
      * Removed not needed /MAP's from cmake files
      4ee9e66d
  16. 23 Jun, 2010 2 commits
    • Michael Widenius's avatar
    • Michael Widenius's avatar
      Fixes for Opensolaris (to get buildbot green) · 5a2f40d4
      Michael Widenius authored
      - Fixed memory leaks in mysqldump
      - Fixed printf of NULL which caused crashes on OpenSolaris when using --debug
      - Fixed realloc() problem that caused out of memory when running mysqldump.test on OpenSolaris
      
      
      client/mysqldump.c:
        Fixed memory leaks
        Fixed printf of NULL which caused crashes on OpenSolaris when using --debug
      client/mysqltest.cc:
        Fixed printf of NULL which caused crashes on OpenSolaris when using --debug
      include/my_global.h:
        Added simple macro val_or_null() to simplify detecting of NULL strings for printf
      sql/handler.cc:
        Fixed printf of NULL which caused crashes on OpenSolaris when using --debug
      sql/sql_db.cc:
        Fixed printf of NULL which caused crashes on OpenSolaris when using --debug
        Removed testing of 'new_db_name' as this is guranteed never NULL
      sql/sql_show.cc:
        Fixed printf of NULL which caused crashes on OpenSolaris when using --debug
      storage/csv/ha_tina.cc:
        Fixed realloc() problem that caused out of memory when running mysqldump.test on OpenSolaris
        (OpenSolaris default malloc() can't handle a lot of reallocs() of strings that are growing one byte at a time)
        This did speed up logging to cvs with a magnitude for large strings.
      5a2f40d4
  17. 17 Jun, 2010 2 commits
  18. 16 Jun, 2010 3 commits
  19. 15 Jun, 2010 4 commits
  20. 14 Jun, 2010 1 commit