1. 20 Apr, 2010 1 commit
  2. 12 Apr, 2010 3 commits
    • Alexander Nozdrin's avatar
      Fix compile error (different storage class for mysql_temp_dir_list) · 2283e1b5
      Alexander Nozdrin authored
      when trying to build innodb as plugin.
      
      The reason for the error is mismatch in mysql_temp_dir_list
      declaration between mysqld.h and usage in ha_innodb.cc
      
      Add missing MYSQL_PLUGIN_IMPORT to mysql_tmpdir_list
      (variables exported by the server and used by plugin need it).
      2283e1b5
    • Alexander Nozdrin's avatar
      A post-fix patch for WL#4877/WL#5030: · 50ff4515
      Alexander Nozdrin authored
      Fix tons of warnings about mismatch struct and class usage.
      50ff4515
    • Marc Alff's avatar
      Bug#52754 Build break in mysql-trunk, performance schema unit test · 7decb1b9
      Marc Alff authored
      Tree cleaup after the last major merges in mysql-trunk:
      
      The files sql/lex_hash.h and sql/sql_yacc.h are automatically
      generated, and should not be checked in the configuration management system.
      These files are now removed.
      No changes are required for .bzrignore, which already listed these files
      (and similar files in libmysqld/).
      
      The file storage/perfschema/unittest/pfs_timer-t.cc did not build
      after the header files refactoring affecting mysql_priv.h
      The file now builds properly using sql_priv.h
      7decb1b9
  3. 10 Apr, 2010 2 commits
  4. 07 Apr, 2010 1 commit
    • Mats Kindahl's avatar
      WL#5030: Splitting mysql_priv.h · 0768deeb
      Mats Kindahl authored
      Adding my_global.h first in all files using
      NO_EMBEDDED_ACCESS_CHECKS.
      
      Correcting a merge problem resulting from a changed definition
      of check_some_access compared to the original patches.
      0768deeb
  5. 06 Apr, 2010 4 commits
  6. 05 Apr, 2010 1 commit
  7. 01 Apr, 2010 1 commit
  8. 31 Mar, 2010 1 commit
    • Mats Kindahl's avatar
      WL#5030: Split and remove mysql_priv.h · e409d6f6
      Mats Kindahl authored
      This patch:
      
      - Moves all definitions from the mysql_priv.h file into
        header files for the component where the variable is
        defined
      - Creates header files if the component lacks one
      - Eliminates all include directives from mysql_priv.h
      - Eliminates all circular include cycles
      - Rename time.cc to sql_time.cc
      - Rename mysql_priv.h to sql_priv.h
      e409d6f6
  9. 26 Mar, 2010 1 commit
  10. 24 Mar, 2010 3 commits
    • Alexey Kopytov's avatar
    • Alexey Kopytov's avatar
      Manual merge of mysql-trunk into mysql-trunk-merge. · f1088567
      Alexey Kopytov authored
      Conflicts:
      
      Text conflict in client/mysqlbinlog.cc
      Text conflict in mysql-test/Makefile.am
      Text conflict in mysql-test/collections/default.daily
      Text conflict in mysql-test/r/mysqlbinlog_row_innodb.result
      Text conflict in mysql-test/suite/rpl/r/rpl_typeconv_innodb.result
      Text conflict in mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
      Text conflict in mysql-test/suite/rpl/t/rpl_row_create_table.test
      Text conflict in mysql-test/suite/rpl/t/rpl_slave_skip.test
      Text conflict in mysql-test/suite/rpl/t/rpl_typeconv_innodb.test
      Text conflict in mysys/charset.c
      Text conflict in sql/field.cc
      Text conflict in sql/field.h
      Text conflict in sql/item.h
      Text conflict in sql/item_func.cc
      Text conflict in sql/log.cc
      Text conflict in sql/log_event.cc
      Text conflict in sql/log_event_old.cc
      Text conflict in sql/mysqld.cc
      Text conflict in sql/rpl_utility.cc
      Text conflict in sql/rpl_utility.h
      Text conflict in sql/set_var.cc
      Text conflict in sql/share/Makefile.am
      Text conflict in sql/sql_delete.cc
      Text conflict in sql/sql_plugin.cc
      Text conflict in sql/sql_select.cc
      Text conflict in sql/sql_table.cc
      Text conflict in storage/example/ha_example.h
      Text conflict in storage/federated/ha_federated.cc
      Text conflict in storage/myisammrg/ha_myisammrg.cc
      Text conflict in storage/myisammrg/myrg_open.c
      f1088567
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-trunk-bugfixing. · c203c8da
      Alexander Nozdrin authored
      c203c8da
  11. 23 Mar, 2010 2 commits
  12. 22 Mar, 2010 9 commits
  13. 21 Mar, 2010 3 commits
  14. 20 Mar, 2010 3 commits
  15. 19 Mar, 2010 5 commits
    • Vladislav Vaintroub's avatar
      Fix errors when building release · 4a39f83f
      Vladislav Vaintroub authored
      - package some more perl scripts on Windows (mysqlhotcopy and mysqldumpslow)
      - do not try to pack .map files (no more produced)
      - (CMake-unrelated) fix debug build on FreeBSD, trying to use uninitialized attribute
      MY_MUTEX_INIT_FAST
      4a39f83f
    • Sergey Glukhov's avatar
      Bug#51242 HAVING clause on table join produce incorrect results · 84917914
      Sergey Glukhov authored
      The problem is that when we make conditon for
      grouped result const part of condition is cut off.
      It happens because some parts of 'having' condition
      which refer to outer join become const after
      make_join_statistics. These parts may be lost
      during further having condition transformation
      in JOIN::exec. The fix is adding 'having'
      condition check for const tables after
      make_join_statistics is performed.
      84917914
    • Andrei Elkin's avatar
      Bug #51648 DBUG_SYNC_POINT is not defined on all platforms and mtr cant pre-check that · 30df1890
      Andrei Elkin authored
      
      DBUG_SYNC_POINT has at least one strong limitation that it's not defined
      on all platforms. It has issues cooperating with @@debug.
      All in all its functionality is superseded by DEBUG_SYNC facility and
      there is no reason to maintain the old less flexible one.
      
      Fixed with adding debug_sync_set_action() function as a facility to set up
      a sync-action in the server sources code and re-writing existing simulations
      (found 3) to use it.
      Couple of tests have been reworked as well.
      
      The patch offers a pattern for setting sync-points in replication threads
      where the standard DEBUG_SYNC does not suffice to reach goals.
      
      
      30df1890
    • Alexey Kopytov's avatar
      Manual merge. · 53afccc8
      Alexey Kopytov authored
      53afccc8
    • Martin Hansson's avatar
      Post-push fix to disable a subset of the test case for Bug#47762. · d03133dc
      Martin Hansson authored
      This has been back-ported from 6.0 as the problems proved to afflict 
      5.1 as well.
      The fix exposed two new bugs. They were reported as follows.
            
      Bug no 52174: Sometimes wrong plan when reading a MAX value 
      from non-NULL index
            
      Bug no 52173: Reading NULL value from non-NULL index gives wrong 
      result in embedded server 
            
      Both bugs taken together affect a much smaller class of queries than #47762, 
      so the fix stays for now.
      d03133dc