1. 18 May, 2011 8 commits
    • unknown's avatar
      automatic merge · 9036233c
      unknown authored
      9036233c
    • 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
    • Vladislav Vaintroub's avatar
      Fix compile warning. · 2c1c18ed
      Vladislav Vaintroub authored
      2c1c18ed
  2. 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
  3. 16 May, 2011 6 commits
  4. 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
  5. 14 May, 2011 5 commits
  6. 13 May, 2011 5 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
    • Michael Widenius's avatar
      Fixed test differences on windows · 3a6da123
      Michael Widenius authored
      3a6da123
  7. 12 May, 2011 7 commits
  8. 11 May, 2011 7 commits
    • Michael Widenius's avatar
      Fixed bug when accessing wrong decimal value in dynamic string (Fixed lp:781233) · 4c81cef7
      Michael Widenius authored
      Store decimal 0.0 in zero bytes in dynamic strings.
      mysqltest: Don't ignore error from mysql_stmt_fetch;  This could cause rows to be missing from log when running with --ps-protocol
      Fixed wrong result length for CAST(... as TIME)
      
      
      
      
      
      
      client/mysqltest.cc:
        Don't ignore error from mysql_stmt_fetch;  This could cause rows to be missing from log when running with --ps-protocol
      libmysql/libmysql.c:
        The max length for a TIME column is 17, not 15.
      mysql-test/r/dyncol.result:
        More tests
      mysql-test/t/dyncol.test:
        More tests
      mysys/ma_dyncol.c:
        Check content of decimal value on read and store to not get assert in decimal_bin_size().
        Store decimal 0.0 in zero bytes in dynamic strings. This also solves a problem where decimal 0 had different internal representations.
      sql-common/my_time.c:
        Fixed DBUG_PRINT
      sql/item_timefunc.h:
        Fixed wrong result length for CAST(... as TIME). This was the cause of failures in buildbot when doing cast(... as time);
      sql/protocol.cc:
        More DBUG_PRINT
      4c81cef7
    • unknown's avatar
      Automatic merge with MWL148 · 88408233
      unknown authored
      88408233
    • unknown's avatar
      Post review fixes of MWL#148 (moving max/min optimization in optimize phase). · 18d08eea
      unknown authored
      sql/item_subselect.cc:
        Cleanup. Comments added.
      sql/item_subselect.h:
        Cleanup.
      sql/mysql_priv.h:
        Comments added.
      sql/opt_subselect.cc:
        The function renamed and turned to method.
        Comments added.
      sql/opt_subselect.h:
        The function turned to method of JOIN.
      sql/sql_select.cc:
        Comment added. The function turned to method.
      sql/sql_select.h:
        The function turned to method.
      18d08eea
    • Michael Widenius's avatar
      automatic merge · 3a537679
      Michael Widenius authored
      3a537679
    • Michael Widenius's avatar
      Fixed a memory overrun in dynamic columns when sending in a mailformed (too... · f940c2ca
      Michael Widenius authored
      Fixed a memory overrun in dynamic columns when sending in a mailformed (too short in this case) string.
      
      mysql-test/t/dyncol.test:
        Added test case for mailformed string usage
      mysys/ma_dyncol.c:
        Added test for wrong dynamic string data
      f940c2ca
    • unknown's avatar
      Bugfix: New table creation/renaming block added if old encoded table present. · 520927a7
      unknown authored
      mysql-test/r/create.result:
        test of renaming
      mysql-test/r/upgrade.result:
        Now such behaviour prohibited to avoid problems.
      mysql-test/t/create.test:
        test of renaming
      mysql-test/t/upgrade.test:
        Now such behaviour prohibited to avoid problems.
      sql/mysql_priv.h:
        Function to test table name presence added.
      sql/sql_rename.cc:
        Rename fixed.
      sql/sql_table.cc:
        Function to test table name presence added.
        Create fixed.
      520927a7
    • Michael Widenius's avatar
      Fixed compiler warnings and test cases problems found by buildbot · 8d52c2cf
      Michael Widenius authored
      
      mysql-test/r/dyncol.result:
        Updated test results
      mysql-test/r/index_intersect.result:
        Updated results
      mysql-test/r/index_intersect_innodb.result:
        Updated results
      mysql-test/t/dyncol.test:
        Added replace_result for floating point results that are different on windows
        Added round() around a result to get same result on all platforms.
      mysql-test/t/index_intersect.test:
        Added replace_result to fix that index_merge may put key names in different order.
      mysys/ma_dyncol.c:
        Fixed compiler warnings on Solaris
      sql/key.cc:
        Fixed compiler warnings on Solaris
      sql/mysqld.cc:
        Fixed compiler warning on windows
      support-files/compiler_warnings.supp:
        Suppressed an unintersting warning on Solaris
      8d52c2cf