1. 25 Nov, 2010 7 commits
    • Tatiana Azundris Nurnberg's avatar
      merge · 29aa8103
      Tatiana Azundris Nurnberg authored
      29aa8103
    • Tatiana Azundris Nurnberg's avatar
      merge · 1e6ef7f4
      Tatiana Azundris Nurnberg authored
      1e6ef7f4
    • Tatiana Azundris Nurnberg's avatar
      merge · e10bcdb2
      Tatiana Azundris Nurnberg authored
      e10bcdb2
    • Tatiana A. Nurnberg's avatar
      merge some docs changes and a test case; null merge the code. · 7553a1f6
      Tatiana A. Nurnberg authored
      (we don't need to port the actual code from 5.1;
      5.5+ do the relevant things differently, but correctly. the
      test obviously is so it stays that way.)
      
      mysql-test/r/variables.result:
        add test case.
      mysql-test/t/variables.test:
        add test case.
      strings/CHARSET_INFO.txt:
        clarify documentation
      7553a1f6
    • Tatiana A. Nurnberg's avatar
      Assorted post-merge fixes, clean-up, integration, compat with 5.6. · 934ea4d1
      Tatiana A. Nurnberg authored
      43233/55794.
      
      mysql-test/r/change_user.result:
        Don't use -1 integer wrap around. It used to work, but now we do what's
        actually in the documentation. In tests, we now use DEFAULT or the
        numeral equivalent (as we do in the 5.6 tests).
      mysql-test/r/key_cache.result:
        Can't drop default key case is an error now, not a warning, for compatibility
        with 5.6.
      mysql-test/r/variables.result:
        Can't drop default key case is an error now, not a warning, for compatibility
        with 5.6.
      mysql-test/t/change_user.test:
        Don't use -1 integer wrap around. It used to work, but now we do what's
        actually in the documentation. In tests, we now use DEFAULT or the
        numeral equivalent (as we do in the 5.6 tests).
      mysql-test/t/key_cache.test:
        Can't drop default key case is an error now, not a warning, for compatibility
        with 5.6.
      mysql-test/t/variables.test:
        Can't drop default key case is an error now, not a warning, for compatibility
        with 5.6.
      sql/mysqld.cc:
        0 is a legal (albeit magic) value: "drop key cache."
      sql/set_var.cc:
        bound_unsigned() can go now, it was just a kludge until things are done
        The Right Way, which they are now.
        
        Can't drop default key case is an error now, not a warning, for compatibility
        with 5.6.
      tests/mysql_client_test.c:
        Don't use -1 integer wrap around. It used to work, but now we do what's
        actually in the documentation. In tests, we now use DEFAULT or the
        numeral equivalent (as we do in the 5.6 tests).
      934ea4d1
    • Vladislav Vaintroub's avatar
      merge · b995d57a
      Vladislav Vaintroub authored
      b995d57a
    • Vladislav Vaintroub's avatar
      Post-fix for Bug#58158 on Solaris · 7d886bcd
      Vladislav Vaintroub authored
      Problem : The build might fail with 
      make[2]: *** No rule to make target `../sql/z',
      needed by `sql/mysqld_dtrace_all.o'.  Stop.
      if one of plugins would depends on system libz 
      library
      
      Fix: Filter out non-static dependent libraries
      when dtracing static libs
      7d886bcd
  2. 24 Nov, 2010 6 commits
  3. 23 Nov, 2010 3 commits
    • Sergey Glukhov's avatar
      5.1-bugteam->5.5-bugteam merge · 9c9d83a2
      Sergey Glukhov authored
      9c9d83a2
    • Sergey Glukhov's avatar
      Bug#56862 Execution of a query that uses index merge returns a wrong result · fb8b67cb
      Sergey Glukhov authored
      In case of low memory sort buffer QUICK_INDEX_MERGE_SELECT creates
      temporary file where is stores row ids which meet QUICK_SELECT ranges
      except of clustered pk range, clustered range is processed separately.
      In init_read_record we check if temporary file is used and choose
      appropriate record access method. It does not take into account that
      temporary file contains partial result in case of QUICK_INDEX_MERGE_SELECT
      with clustered pk range.
      The fix is always to use rr_quick if QUICK_INDEX_MERGE_SELECT
      with clustered pk range is used.
      
      
      mysql-test/suite/innodb/r/innodb_mysql.result:
        test case
      mysql-test/suite/innodb/t/innodb_mysql.test:
        test case
      mysql-test/suite/innodb_plugin/r/innodb_mysql.result:
        test case
      mysql-test/suite/innodb_plugin/t/innodb_mysql.test:
        test case
      sql/opt_range.h:
        added new method
      sql/records.cc:
        The fix is always to use rr_quick if QUICK_INDEX_MERGE_SELECT
        with clustered pk range is used.
      fb8b67cb
    • Tor Didriksen's avatar
      Bug #58372 cmake should not write temporary files in the source directory · a8d7a000
      Tor Didriksen authored
      
      cmake/do_abi_check.cmake:
        Put temporary files in ${BINARY_DIR} rather than in source directory.
        Slight reformatting for readability of commands.
      a8d7a000
  4. 24 Nov, 2010 5 commits
  5. 22 Nov, 2010 10 commits
  6. 20 Nov, 2010 1 commit
    • Davi Arnaut's avatar
      WL#5665: Removal of the autotools-based build system · a3c69b69
      Davi Arnaut authored
      Remove some more leftovers from the initial removal:
      
      o Update relevant mentions of configure.in throughout
      the source code.
      
      o Remove win/configure.js, which at this point just
      duplicates logic already present in CMake based build
      system.
      
      o Remove support files which relied on the autotools
      build system. In any case, MySQL is no longer officially
      supported on SCO.
      
      o Remove files which are no longer part of the build.
      a3c69b69
  7. 22 Nov, 2010 1 commit
  8. 21 Nov, 2010 1 commit
  9. 20 Nov, 2010 3 commits
    • Davi Arnaut's avatar
      WL#5665: Removal of the autotools-based build system · 2d8bc2a6
      Davi Arnaut authored
      The autotools-based build system has been superseded and
      is being removed in order to ease the maintenance burden on
      developers tweaking and maintaining the build system.
      
      In order to support tools that need to extract the server
      version, a new file that (only) contains the server version,
      called VERSION, is introduced. The file contents are human
      and machine-readable. The format is:
      
      MYSQL_VERSION_MAJOR=5
      MYSQL_VERSION_MINOR=5
      MYSQL_VERSION_PATCH=8
      MYSQL_VERSION_EXTRA=-rc
      
      The CMake based version extraction in cmake/mysql_version.cmake
      is changed to extract the version from this file. The configure
      to CMake wrapper is retained for backwards compatibility and to
      support the BUILD/ scripts. Also, a new a makefile target
      show-dist-name that prints the server version is introduced.
      
      VERSION:
        Add top-level version file.
      cmake/mysql_version.cmake:
        Get version information from the top-level VERSION file.
        Do not cache the version components (MAJOR_VERSION, etc).
        Add MYSQL_RPM_VERSION as a replacement for MYSQL_U_SCORE_VERSION.
      2d8bc2a6
    • Davi Arnaut's avatar
      d1d35d78
    • Davi Arnaut's avatar
      Bug#57994: Compiler flag change build error : my_redel.c · 9502aae1
      Davi Arnaut authored
      Although ICC identifies itself as GCC, even in version numbers,
      it does not support the stpcpy built-in.
      
      include/m_string.h:
        Work around ICC. Hacks...
      9502aae1
  10. 19 Nov, 2010 3 commits