1. 20 May, 2011 6 commits
    • Sergey Petrunya's avatar
      e3cfbb39
    • Sergey Petrunya's avatar
      4d7c06b3
    • Sergey Petrunya's avatar
      Merge fix for BUG#784723 · 23cfe126
      Sergey Petrunya authored
      23cfe126
    • Igor Babaev's avatar
      Merge · 3d34cada
      Igor Babaev authored
      3d34cada
    • Igor Babaev's avatar
      Merged the fix for bug 777745 into 5.3. · 8e33aa9a
      Igor Babaev authored
      8e33aa9a
    • Igor Babaev's avatar
      Fixed LP bug #777745. · 016a09cb
      Igor Babaev authored
      Fields belonging to views in general cannot be substituted for 
      equal items, in particular for constants, because all references
      to a view field refer to the same Item_field object while they 
      could be used in different OR parts of the where condition and
      belong to different equivalence classes (to different Item_equals).
      That's why substitution for equal items in any context is allowed
      only in place of Item_direct_view_ref objects, but not in place of
      Item_fields these objects refer to.
      Due to some erroneous code in the patch for bug 717577 substitution
      for view fields were allowed in some context.This could lead
      to wrong results returned by queries using views.
      
      The fix prohibits substitution of view fields for equal items 
      in any context.
      
      The patch also changes slightly the compile method for the Item_func
      class. Now if the analyze method returns NULL in his parameter the
      compile method is not called for the arguments of the function
      at all. A similar change was made for the Item_ref class.     
      016a09cb
  2. 19 May, 2011 7 commits
  3. 18 May, 2011 10 commits
    • unknown's avatar
      automatic merge · 9036233c
      unknown authored
      9036233c
    • Michael Widenius's avatar
      Original idea from Zardosht Kasheff to add HA_CLUSTERED_INDEX · 36311464
      Michael Widenius authored
      - Added a lot of code comments
      - Updated get_best_ror_intersec() to prefer index scan on not clustered keys before clustered keys.
      - Use HA_CLUSTERED_INDEX to define if one should use HA_MRR_INDEX_ONLY
      - For test of using index or filesort to resolve ORDER BY, use HA_CLUSTERED_INDEX flag instead of primary_key_is_clustered()
      - Use HA_TABLE_SCAN_ON_INDEX instead of primary_key_is_clustered() to decide if ALTER TABLE ... ORDER BY will have any effect.
      
      sql/ha_partition.h:
        Added comment with warning for code unsafe to use with multiple storage engines at the same time
      sql/handler.h:
        Added HA_CLUSTERED_INDEX.
        Documented primary_key_is_clustered()
      sql/opt_range.cc:
        Added code comments
        Updated get_best_ror_intersec() to ignore clustered keys.
        Optimized away cpk_scan_used and one instance of current_thd (Simpler code)
        Use HA_CLUSTERED_INDEX to define if one should use HA_MRR_INDEX_ONLY
      sql/sql_select.cc:
        Changed comment to #ifdef
        For test of using index or filesort to resolve ORDER BY, use HA_CLUSTERED_INDEX flag instead of primary_key_is_clustered()
        (Change is smaller than what it looks beause of indentation change)
      sql/sql_table.cc:
        Use HA_TABLE_SCAN_ON_INDEX instead of primary_key_is_clustered() to decide if ALTER TABLE ... ORDER BY will have any effect.
      storage/innobase/handler/ha_innodb.h:
        Added support for HA_CLUSTERED_INDEX
      storage/innodb_plugin/handler/ha_innodb.cc:
        Added support for HA_CLUSTERED_INDEX
      storage/xtradb/handler/ha_innodb.cc:
        Added support for HA_CLUSTERED_INDEX
      36311464
    • unknown's avatar
      automerge · d270325a
      unknown authored
      d270325a
    • unknown's avatar
      Rewritten patch of percona - switching query cache on and off, removing comments. · 1177bea2
      unknown authored
      client/mysqltest.cc:
        Column names.
      mysql-test/r/grant_cache_no_prot.result:
        fix of text.
      mysql-test/r/grant_cache_ps_prot.result:
        Fix of test.
      mysql-test/r/query_cache.result:
        Switching on and off query cache.
      mysql-test/t/query_cache.test:
        Switching on and off query cache.
      mysys/charset.c:
        Fix of parser.
      sql/handler.cc:
        thd added to parameters.
      sql/log_event.cc:
        thd added to parameters.
      sql/log_event_old.cc:
        thd added to parameters.
      sql/mysql_priv.h:
        Fixed functions definitions.
      sql/mysqld.cc:
        Comments stripping.
      sql/set_var.cc:
        Switching on and off query cache.
      sql/set_var.h:
        Switching on and off query cache.
      sql/share/errmsg.txt:
        New errors.
      sql/sql_cache.cc:
        Switching query cache on and off, removing comments.
      sql/sql_cache.h:
        thd added to parameters.
      sql/sql_class.h:
        Comments stripping.
      sql/sql_db.cc:
        thd added to parameters.
      sql/sql_lex.cc:
        lex fixed.
      sql/sql_parse.cc:
        thd added to parameters.
      1177bea2
    • unknown's avatar
      3622983a
    • unknown's avatar
      automerge · fd855154
      unknown authored
      fd855154
    • unknown's avatar
      automerge · 4ea53bc2
      unknown authored
      4ea53bc2
    • unknown's avatar
      Fix mysqltest printing of include stack. · e55fb3bb
      unknown authored
      The printing of include stack in the error case in mysqltest omitted the
      bottom of the stack (the line number in original test case file), and instead
      printed the top of the stack twice. Fix to print each element on the stack
      once and only once.
      e55fb3bb
    • Michael Widenius's avatar
      Added HA_ERR_DISK_FULL handler error · 5c70f813
      Michael Widenius authored
      Original code by Zardosht Kasheff
      
      sql/handler.cc:
        Added HA_ERR_DISK_FULL and ENOSPC (for handler that uses normal errno).
        This sets 'fatal_error' to ensure that the error is logged to err file (which hopefully is on another disk...)
      5c70f813
    • Vladislav Vaintroub's avatar
      Fix compile warning. · 2c1c18ed
      Vladislav Vaintroub authored
      2c1c18ed
  4. 17 May, 2011 1 commit
    • Michael Widenius's avatar
      Removed some alias warnings · 0da2df24
      Michael Widenius authored
      Fixed alias bug when compiling with gcc 4.2.4 that caused subselect.test to fail
      
      sql/item.cc:
        Removed alias warnings by changing type from char * to const char*
      sql/item.h:
        Removed alias warnings by changing type from char * to const char*
      sql/item_subselect.cc:
        Fixed alias bug when compiling with gcc 4.2.4 that caused subselect.test to fail
      sql/sql_string.h:
        Removed alias warnings by changing type from char * to const char*
      storage/heap/hp_test2.c:
        Removed SAFEMALLOC to get rid of compiler error
        Fixed test case as we can't anymore use heap_rlast() on a HASH key entry.
      0da2df24
  5. 16 May, 2011 6 commits
  6. 15 May, 2011 1 commit
    • Vladislav Vaintroub's avatar
      Small CMake fixes : · 19f0d6b2
      Vladislav Vaintroub authored
      - add version info for the client library, dynamic plugins and some utilities
      - do not recompile client library sources 3 times (for mysqlclient , mysqlclient_notls and libmysql)
        One time is sufficient, so get rid of mysqlclient_notls, and link  static client library  to  the shared.
      - remove incremental linking flag
      19f0d6b2
  7. 14 May, 2011 5 commits
  8. 13 May, 2011 4 commits
    • Vladislav Vaintroub's avatar
      Fix PBXT bugs found while testing with Application Verifier : · 218c7665
      Vladislav Vaintroub authored
      LPBUG#782269 : critical sections are initialized twice in   xt_xn_init_db() 
      LPBUG#782431: active lock in memory released by   xt_ind_exit()
      LPBUG#782433 : xt_heap_release() does not release spinlock  hp->h_lock initialized in xt_heap_new().
      LPBUG#782435: xt_exit_row_locks() tries to release unallocated locks
      218c7665
    • Vladislav Vaintroub's avatar
    • Oleksandr Byelkin's avatar
      Directories with .dylib files added to DYLD_LOIBRARY_PATH to allow plugins to use them. · bcee6652
      Oleksandr Byelkin authored
      mysql-test/mysql-test-run.pl:
        Directories added for mac to lybrary search paths.
      plugin/handler_socket/libhsclient/Makefile.am:
        Static build of library removed.
      bcee6652
    • Michael Widenius's avatar
      Made test-unit run in parlallel. This was achived by having all aria tests... · 5933619c
      Michael Widenius authored
      Made test-unit run in parlallel. This was achived by having all aria tests that uses temporary files to create the temporary file in an unique tempdirectory.
      aria_chk now returns 1 if one got any warnings during check and 2 if one got errors.
      lp:728919 maria_chk should fail on all detected corruptions
      
      mysql-test/lib/My/SafeProcess.pm:
        Removed ^M lines from the file
      storage/maria/ma_check.c:
        Fixed indentation
      storage/maria/maria_chk.c:
        aria_chk now returns 1 if one got any warnings during check and 2 if one got errors.
      storage/maria/unittest/ma_control_file-t.c:
        Use unique sub directory for test results
      storage/maria/unittest/ma_maria_log_cleanup.c:
        Added help function create_tmpdir()
      storage/maria/unittest/ma_pagecache_consist.c:
        Use unique sub directory for test results
      storage/maria/unittest/ma_pagecache_rwconsist.c:
        Use unique sub directory for test results
      storage/maria/unittest/ma_pagecache_rwconsist2.c:
        Use unique sub directory for test results
      storage/maria/unittest/ma_pagecache_single.c:
        Use unique sub directory for test results
      storage/maria/unittest/ma_test_all-t:
        Use unique sub directory for test results
      storage/maria/unittest/ma_test_loghandler-t.c:
        Use unique sub directory for test results
      storage/maria/unittest/ma_test_loghandler_first_lsn-t.c:
        Use unique sub directory for test results
        remove delete of files that are already deleted by maria_log_remove()
      storage/maria/unittest/ma_test_loghandler_max_lsn-t.c:
        Use unique sub directory for test results
      storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
        Use unique sub directory for test results
      storage/maria/unittest/ma_test_loghandler_multithread-t.c:
        Use unique sub directory for test results
      storage/maria/unittest/ma_test_loghandler_noflush-t.c:
        Use unique sub directory for test results
        remove delete of files that are already deleted by maria_log_remove()
      storage/maria/unittest/ma_test_loghandler_nologs-t.c:
        Use unique sub directory for test results
      storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
        Use unique sub directory for test results
        remove delete of files that are already deleted by maria_log_remove()
      storage/maria/unittest/ma_test_loghandler_purge-t.c:
        Use unique sub directory for test results
      support-files/compiler_warnings.supp:
        Supress some warnings
      unittest/unit.pl:
        Run 4 unittests in parallel
      5933619c