1. 10 Nov, 2006 4 commits
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1cb38d3b
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mtr-4.1
      
      
      1cb38d3b
    • unknown's avatar
      add --report-features to mysql-test-run.pl · df1b6ae6
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        add --report-features
      mysql-test/include/report-features.test:
        test file showing server features for mysql-test-run.pl --report-features
      df1b6ae6
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1 · cb80733a
      unknown authored
      into  outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191
      
      
      configure.in:
        Auto merged
      include/my_time.h:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/rename.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/time.cc:
        Auto merged
      mysql-test/t/rename.test:
        choose one of the race problem solutions. It was solved
        differently in -runtime and mainstream
      cb80733a
    • unknown's avatar
      mysql-test-run.sh: · facaaeb4
      unknown authored
        Added --force-restart pseudo server argument to shell version as well
      
      
      mysql-test/mysql-test-run.sh:
        Added --force-restart pseudo server argument to shell version as well
      facaaeb4
  2. 07 Nov, 2006 2 commits
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/lic/my40-lic · d167b60f
      unknown authored
      into  mysql.com:/Users/kent/mysql/bk/lic/my41-lic
      
      
      README:
        Auto merged
      d167b60f
    • unknown's avatar
      make_binary_distribution.sh: · 22655de1
      unknown authored
        Added LICENSE.mysql, removed LICENSE.doc README.NW.
        Removed obselete section about MySQLEULA.txt and README.NW.
      README:
        Added reference to the EXCEPTIONS-CLIENT file.
        Changed reference to the commercial license file.
        Corrected references into chapters in the manual.
      .del-MySQLEULA.txt~4a1afd9284f9be5a:
        Delete: Docs/MySQLEULA.txt
      
      
      README:
        Added reference to the EXCEPTIONS-CLIENT file.
        Changed reference to the commercial license file.
        Corrected references into chapters in the manual.
      BitKeeper/deleted/.del-MySQLEULA.txt~4a1afd9284f9be5a:
        Delete: Docs/MySQLEULA.txt
      scripts/make_binary_distribution.sh:
        Added LICENSE.mysql, removed LICENSE.doc README.NW.
        Removed obselete section about MySQLEULA.txt and README.NW.
      22655de1
  3. 05 Nov, 2006 2 commits
  4. 03 Nov, 2006 2 commits
  5. 02 Nov, 2006 8 commits
  6. 01 Nov, 2006 5 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 2886e07d
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-4.1-runtime
      
      
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      2886e07d
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1-maint · 07978008
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      
      07978008
    • unknown's avatar
      Merge 192.168.0.10:mysql/mysql-4.1-maint · bc7b0a2e
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      
      bc7b0a2e
    • unknown's avatar
      Fix Bug #9191 "TIMESTAMP/from_unixtime() no longer accepts 2^31-1" · 8a7bc052
      unknown authored
      (4.1 version, with post-review fixes)
        
        The fix for another Bug (6439) limited FROM_UNIXTIME() to
        TIMESTAMP_MAX_VALUE which is 2145916799 or 2037-12-01 23:59:59 GMT,
        however unix timestamp in general is not considered to be limited 
        by this value. All dates up to power(2,31)-1 are valid.
        
        This patch extends allowed TIMESTAMP range so, that max
        TIMESTAMP value is power(2,31)-1. It also corrects
        FROM_UNIXTIME() and UNIX_TIMESTAMP() functions, so that
        max allowed UNIX_TIMESTAMP() is power(2,31)-1. FROM_UNIXTIME()
        is fixed accordingly to allow conversion of dates up to
        2038-01-19 03:14:07 UTC. The patch also fixes CONVERT_TZ()
        function to allow extended range of dates.
        
        The main problem solved in the patch is possible overflows
        of variables, used in broken-time representation to time_t
        conversion (required for UNIX_TIMESTAMP).
      
      
      acinclude.m4:
        Add new macro to check time_t range
      configure.in:
        Call the macro to check time_t range
      include/my_time.h:
        Move time-related defines to proper place.
        Add a function to perform a rough check if
        a TIMESTAMP value fits into the boundaries.
        Note: it is defined as "static inline", as
        otherwise libmysql won't compile (due to the
        way how gcc handles "inline" directive).
      mysql-test/r/func_time.result:
        Update test result
      mysql-test/r/timezone.result:
        Update test result
      mysql-test/r/timezone2.result:
        Update test result
      mysql-test/t/func_time.test:
        Add test for Bug#9191 and update test to be consistent
        with new TIMESTAMP boundaries
      mysql-test/t/timezone.test:
        Update old tests to be consistent
        with new TIMESTAMP boundaries
      mysql-test/t/timezone2.test:
        Update tests for convert_tz to be consistent with new
        TIMESTAMP boundaries
      sql/item_timefunc.cc:
        Fix convert_tz to allow dates from the new (extended)
        TIMESTAMP range
      sql/mysql_priv.h:
        Move time handling defaults to my_time.h
      sql-common/my_time.c:
        Because of increased TIMESTAMP_MAX_VALUE overflows in my_system_gmt_sec()
        became possible. Here we make it safe against the overflows by stepping
        back from the boundary dates which are likely to trigger them.
      sql/time.cc:
        Update TIME_to_timestamp to allow conversion of
        extended date range
      sql/tztime.cc:
        Fix new (4.1) implementation of broken-down time representation
        to time_t conversion routine to avoid overflows during conversion
        of boundary dates
      mysql-test/r/timezone4.result:
        New BitKeeper file ``mysql-test/r/timezone4.result''
      mysql-test/t/timezone4-master.opt:
        New BitKeeper file ``mysql-test/t/timezone4-master.opt''
      mysql-test/t/timezone4.test:
        New BitKeeper file ``mysql-test/t/timezone4.test''
      8a7bc052
    • unknown's avatar
      Merge kpdesk.mysql.com:/home/thek/dev/bug22828/my41-bug22828 · 2d1215f4
      unknown authored
      into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
      
      
      mysys/my_chsize.c:
        Auto merged
      2d1215f4
  7. 31 Oct, 2006 5 commits
  8. 30 Oct, 2006 4 commits
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime · 49c9509a
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21915
      
      
      49c9509a
    • unknown's avatar
      BUG#21915: Changing limits of table_cache when setting max_connections · 885dc1cb
      unknown authored
      If the user has specified --max-connections=N or --table-open-cache=M
      options to the server, a warning could be given that some values were
      recalculated, and table-open-cache could be assigned greater value.
      
      Note that both warning and increase of table-open-cache were totally
      harmless.
      
      This patch fixes recalculation code to ensure that table-open-cache will
      be never increased automatically and that a warning will be given only if
      some values had to be decreased due to operating system limits.
      
      No test case is provided because we neither can't predict nor control
      operating system limits for maximal number of open files.
      
      
      sql/mysql_priv.h:
        Add constants for table_cache minimum and default values.
      sql/mysqld.cc:
        Fix max_connections and table_cache_size re-computation.
      885dc1cb
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1-maint · 9711d722
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      
      9711d722
    • unknown's avatar
      Bug#18654 Test is timing-dependent and fails from scheduling effects (?) · c2b8a63c
      unknown authored
       - Wait in loop with small sleep until tables has been renamed
      
      
      mysql-test/t/rename.test:
        To avoid scheduling effects wait for the tables to be renamed in a loop with small sleeps
        before continuing with tests
      mysql-test/include/wait_for_query_to_suceed.inc:
        New BitKeeper file ``mysql-test/include/wait_for_query_to_suceed.inc''
      c2b8a63c
  9. 27 Oct, 2006 6 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 142a4485
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      
      sql/sql_select.cc:
        Auto merged
      142a4485
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 3e2dacae
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      
      3e2dacae
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 75776305
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
      
      
      75776305
    • unknown's avatar
      ndb - valgrind · 11ac4907
      unknown authored
        Still leakage, make sure all unlinked operations are put back so they will be release
        (on failing blob operations, when AO_IgnoreError)
      
      
      ndb/src/ndbapi/NdbConnection.cpp:
        Still leakage, make sure all unlinked operations are put back so they will be release
      11ac4907
    • unknown's avatar
      Update the rules for abi_check · 928fa57a
      unknown authored
      
      include/Makefile.am:
        Move m_ctype.h from BUILT_SOURCES, it's in vcs
        Update the rule for abi_check
      include/mysql_h.ic:
        Update the refernce and rename it to mysql_h.ic
      928fa57a
    • unknown's avatar
      Fix for bug #23412: delete rows with null date field · d2c90fcb
      unknown authored
      Backport of the fix for bug #8143: A date with value 0 is treated as a NULL value
      
      
      mysql-test/r/delete.result:
        Fix for bug #23412: delete rows with null date field
          - test result
      mysql-test/t/delete.test:
        Fix for bug #23412: delete rows with null date field
          - test case
      sql/sql_delete.cc:
        Fix for bug #23412: delete rows with null date field
          - during SELECT queries processing we convert 'date[time]_field is null'                   
            conditions into 'date[time]_field = 0000-00-00[ 00:00:00]' for not null                  
            DATE and DATETIME fields. To be consistent, we have to do the same for DELETE            
            queries. So we should call remove_eq_conds() in the mysql_delete() as well.              
            Also it may simplify and speed up DELETE queries execution.
      d2c90fcb
  10. 25 Oct, 2006 2 commits
    • unknown's avatar
      Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime · 722d4330
      unknown authored
      into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug18819
      
      
      722d4330
    • unknown's avatar
      BUG#18819: DELETE IGNORE hangs on foreign key parent delete · e3d49f0c
      unknown authored
      If the error happens during DELETE IGNORE, nothing could be send to the
      client, thus leaving it frozen expecting the reply.
      
      The problem was that if some error occurred, it wouldn't be reported to
      the client because of IGNORE, but neither success would be reported.
      
      MySQL 4.1 would not freeze the client, but will report
      
        ERROR 1105 (HY000): Unknown error
      
      instead, which is also a bug.
      
      The solution is to report success if we are in DELETE IGNORE and some
      non-fatal error has happened.
      
      
      mysql-test/r/innodb_mysql.result:
        Add result for bug#18819: DELETE IGNORE hangs on foreign key parent
        delete.
      mysql-test/t/innodb_mysql.test:
        Add test case for bug#18819: DELETE IGNORE hangs on foreign key parent
        delete.
      sql/sql_delete.cc:
        Report success if we have got an error, but we are in DELETE IGNORE, and
        the error is not fatal (if it is, it would be reported to the client).
      e3d49f0c