1. 18 May, 2007 1 commit
    • unknown's avatar
      Fix for bug #28464: a string argument to 'limit ?' PS - replication fails · 5b3b80b4
      unknown authored
      Problem: we may get syntactically incorrect queries in the binary log 
      if we use a string value user variable executing a PS which 
      contains '... limit ?' clause, e.g.
      prepare s from "select 1 limit ?"; 
      set @A='qwe'; execute s using @A;
        
      Fix: raise an error in such cases.
      
      
      mysql-test/r/limit.result:
        Fix for bug #28464: a string argument to 'limit ?' PS - replication fails
          - test result
      mysql-test/t/limit.test:
        Fix for bug #28464: a string argument to 'limit ?' PS - replication fails
          - test case
      sql/item.cc:
        Fix for bug #28464: a string argument to 'limit ?' PS - replication fails
          - if Item_param::strict_type is set, check given and required types,
            return an error if not equal.
      sql/item.h:
        Fix for bug #28464: a string argument to 'limit ?' PS - replication fails
          - bool strict_type introduced, which indicates that a parameter value must be of 
            the required_result_type type.
          - set_strict_type() function introduced to set required type.
      sql/sql_yacc.yy:
        Fix for bug #28464: a string argument to 'limit ?' PS - replication fails
          - as we accept only INTs in the 'limit' clause set parameter's required type.
      5b3b80b4
  2. 16 May, 2007 7 commits
    • unknown's avatar
      Bug#21103: "DATE column not compared as DATE" · 8ab53d5f
      unknown authored
      BDB results fixed (not p/o 5.1 fix)
      
      
      mysql-test/r/ps_6bdb.result:
        Now we get a note when we insert a datetime value into a date column
      8ab53d5f
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/bk_fix/mysql-5.0-maint-patch4 · 9e30e548
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      9e30e548
    • unknown's avatar
      Backport of TIME->MYSQL_TIME / Y2K fixset · b5e4f54a
      unknown authored
         
      Made year 2000 handling more uniform
      Removed year 2000 handling out from calc_days()
      The above removes some bugs in date/datetimes with year between 0 and 200
      Now we get a note when we insert a datetime value into a date column
      For default values to CREATE, don't give errors for warning level NOTE
      Fixed some compiler failures
      Added library ws2_32 for windows compilation (needed if we want to compile with IOCP support)
      Removed duplicate typedef TIME and replaced it with MYSQL_TIME
      
      Better (more complete) fix for: Bug#21103 "DATE column not compared as DATE"
      Fixed properly Bug#18997 "DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-digit year value"
      Fixed Bug#23093 "Implicit conversion of 9912101 to date does not match cast(9912101 as date)"
       
      
      
      include/my_time.h:
        Removed not used define YY_MAGIC_BELOW
        Added prototype for year_2000_handling()
      mysql-test/r/date_formats.result:
        Updated results (fixed bug in date_format() with year < 99
      mysql-test/r/func_sapdb.result:
        Added more testing of make_date()
      mysql-test/r/ps_2myisam.result:
        Now we get a note when we insert a datetime value into a date column
      mysql-test/r/ps_3innodb.result:
        Now we get a note when we insert a datetime value into a date column
      mysql-test/r/ps_4heap.result:
        Now we get a note when we insert a datetime value into a date column
      mysql-test/r/ps_5merge.result:
        Now we get a note when we insert a datetime value into a date column
      mysql-test/r/ps_7ndb.result:
        Now we get a note when we insert a datetime value into a date column
      mysql-test/r/strict.result:
        zero-year in str_to_date() throws warning in strict
      mysql-test/r/type_date.result:
        Added test for date conversions
      mysql-test/r/type_datetime.result:
        Added testcase for datetime to date conversion.
      mysql-test/t/date_formats.test:
        Added testing of dates < 200
      mysql-test/t/func_sapdb.test:
        More testing of makedate()
      mysql-test/t/type_date.test:
        Added test for date conversions
      mysql-test/t/type_datetime.test:
        Added testcase for datetime to date conversion
      sql/field.cc:
        Give note if we insert a datetime value in a date field
        Don't give notes if we are doing internal test conversions (like from convert_constant_item())
        More documentation (store functions can now return '3' to inform that the function did return a NOTE (not warning or error))
        Revert some changes in Field_newdate::store() to get more optimal code
        Field::set_warning() will now ignore notes if CHECK_FIELD_IGNORE is set.
        New parameters to make_truncated_value_warning()
      sql/field.h:
        Give note if we insert a datetime value in a date field
        Don't give notes if we are doing internal test conversions (like from convert_constant_item())
        More documentation (store functions can now return '3' to inform that the function did return a NOTE (not warning or error))
        Revert some changes in Field_newdate::store() to get more optimal code
        Field::set_warning() will now ignore notes if CHECK_FIELD_IGNORE is set.
        New parameters to make_truncated_value_warning()
      sql/item.cc:
        Give note if we insert a datetime value in a date field
        Don't give notes if we are doing internal test conversions (like from convert_constant_item())
        More documentation (store functions can now return '3' to inform that the function did return a NOTE (not warning or error))
        Revert some changes in Field_newdate::store() to get more optimal code
        Field::set_warning() will now ignore notes if CHECK_FIELD_IGNORE is set.
        New parameters to make_truncated_value_warning()
      sql/item.h:
        TIME -> MYSQL_TIME
      sql/item_cmpfunc.cc:
        Don't print notes in convert_constant_item()
      sql/item_func.h:
        TIME -> MYSQL_TIME
      sql/item_timefunc.cc:
        New parameters to make_truncated_value_warning()
        Moved year 2000 handling out from calc_days()
      sql/item_timefunc.h:
        TIME -> MYSQL_TIME
      sql/my_decimal.cc:
        TIME -> MYSQL_TIME
      sql/my_decimal.h:
        TIME -> MYSQL_TIME
      sql/mysql_priv.h:
        Added error level to make_truncated_value_warning()
      sql/protocol.cc:
        TIME -> MYSQL_TIME
      sql/protocol.h:
        TIME -> MYSQL_TIME
      sql/sp.cc:
        TIME -> MYSQL_TIME
      sql/sql_base.cc:
        Make testing of result value of save_in_field() uniform
      sql/sql_class.h:
        TIME -> MYSQL_TIME
      sql/sql_show.cc:
        TIME -> MYSQL_TIME
      sql/structs.h:
        TIME -> MYSQL_TIME
      sql/time.cc:
        Added error level to make_truncated_value_warning()
      sql/tztime.cc:
        TIME -> MYSQL_TIME
      sql/tztime.h:
        TIME -> MYSQL_TIME
      sql/unireg.cc:
        For default values to CREATE, don't give errors for warning level NOTE
        (Fixed failed CREATE when we give a datetime value to a date field)
      sql-common/my_time.c:
        Added year_2000_handling()
        Removed year 2000 handling from calc_daynr()
      b5e4f54a
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/bk_fix/mysql-5.0-maint-patch3 · e4983a70
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      e4983a70
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · 7703b676
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      7703b676
    • unknown's avatar
      Bug#28223: mysqldump --compact --routines restores from @OLD_SQL_MODE w/o ever setting it · e675d257
      unknown authored
        - mysqldump generated output that set OLD_SQL_MODE twice, to different values
          (for triggers), or not at all (for routines) in some cases.
      
      
      client/mysqldump.c:
        Only save SQL_MODE in dump_triggers if in --compact mode. Otherwise,
        it's already been saved in write_header(). Likewise for dumpe_routines,
        where it was never saved.
      mysql-test/r/mysqldump.result:
        mysqldump output has subtly changed. Adjust test-results. This also shows
        OLD_SQL_MODE is always set exactly once now
      e675d257
    • unknown's avatar
      Fix for bug #28240: "isinf()" cannot be used in C++ for lack of prototype · 9e1585ab
      unknown authored
      - Since isinf() portability across various platforms and
        compilers is a complicated question, we should not use
        it directly. Instead, the my_isinf() macro should be used,
        which is defined as an alias to the system-defined isinf()
        if it is safe to use, or a workaround implementation otherwise
      
      
      configure.in:
        Added a check to define HAVE_ISINF only if it can be used
        in C++ code as well.
      include/my_global.h:
        Define my_isinf() as an alias to isinf(), if it is available
        in both C and C++ code. Otherwise, define it to a workaround
        implementation.
      sql/item_func.cc:
        Replaced isinf() with my_isinf().
      strings/strtod.c:
        Replaced isinf() with my_isinf().
      9e1585ab
  3. 15 May, 2007 4 commits
  4. 10 May, 2007 2 commits
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 37f5b494
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      37f5b494
    • unknown's avatar
      Bug#27344 Total failure to start the server · db0c3b6d
      unknown authored
      - Give some more protection against "too long socket name by setting the max
      length when to use a tmpdir for sockets to 70 
      
      
      mysql-test/mysql-test-run.pl:
        Give some more protection against "too long socket name by setting the max
        length when to use a tmpdir for sockets to 70
      db0c3b6d
  5. 09 May, 2007 6 commits
  6. 07 May, 2007 4 commits
  7. 04 May, 2007 4 commits
  8. 02 May, 2007 3 commits
  9. 01 May, 2007 2 commits
  10. 30 Apr, 2007 7 commits
    • unknown's avatar
      Merge dkatz@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 0fc282bb
      unknown authored
      into  damien-katzs-computer.local:/Users/dkatz/mysql50
      
      
      0fc282bb
    • unknown's avatar
      Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27653/50 · 2127e26d
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
      
      
      2127e26d
    • unknown's avatar
      Bug #27653: Temp table can't be created if lower_case_table_names=1 and · 36dea21b
      unknown authored
                  tmpdir has uppercase
      
      Fix: don't convert mysql_tmpdir to lower case when building the path to a
      temporary table
      
      
      mysql-test/include/have_lowercase1.inc:
        BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27653/50/mysql-test/include/have_lowercase1.inc
      mysql-test/r/lowercase1.require:
        BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27653/50/mysql-test/r/lowercase1.require
      mysql-test/r/lowercase_mixed_tmpdir.result:
        BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27653/50/mysql-test/r/lowercase_mixed_tmpdir.result
      mysql-test/t/lowercase_mixed_tmpdir-master.opt:
        BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27653/50/mysql-test/t/lowercase_mixed_tmpdir-master.opt
      mysql-test/t/lowercase_mixed_tmpdir-master.sh:
        BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27653/50/mysql-test/t/lowercase_mixed_tmpdir-master.sh
      mysql-test/t/lowercase_mixed_tmpdir.test:
        BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27653/50/mysql-test/t/lowercase_mixed_tmpdir.test
      sql/sql_table.cc:
        When building the path for a temporary table file, do not
        convert mysql_tmpdir to lower case; lower_case_table_names
        should not apply to mysql_tmpdir.
      36dea21b
    • unknown's avatar
      Merge damien-katzs-computer.local:/Users/dkatz/mysql50 · 930912f8
      unknown authored
      into  damien-katzs-computer.local:/Users/dkatz/50_frm_files
      
      
      930912f8
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · 1febcfdc
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      1febcfdc
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 0f6f3aa0
      unknown authored
      into  maint1.mysql.com:/data/localhome/tnurnberg/50-27293
      
      
      0f6f3aa0
    • unknown's avatar
      Bug#27293: mysqldump crashes when dumping procedure defined by different user · 3f18c6bc
      unknown authored
      mysqldump didn't properly handle getting no data on
      SHOW CREATE PROCEDURE.  If S/C/P fails (due to dumping
      user's insufficient privileges on mysql.proc, say),
      mysqldump will print a comment to that effect to the
      output and return an error-code.  If the -f (force) option
      is used, the dump will continue, otherwise, it will abort
      right there and then.
      
      Also fixes Bug#22761, "mysqldump reports no errors when using
      --routines without mysql.proc privileges"
      ---
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
      into  mysql.com:/home/tnurnberg/27293/50-27293
      
      
      client/mysqldump.c:
        Bug#27293: mysqldump crashes when dumping procedure defined by different user
        
        handle failure of SHOW CREATE PROCEDURE, give user diagnostics,
        heed -f (force) option
      mysql-test/r/mysqldump.result:
        Bug#27293: mysqldump crashes when dumping procedure defined by different user
        
        show that trying to mysqldump --routines with insufficient
        privileges will no longer crash the client
        ---
        manual merge
      mysql-test/t/mysqldump.test:
        Bug#27293: mysqldump crashes when dumping procedure defined by different user
        
        show that trying to mysqldump --routines with insufficient
        privileges will no longer crash the client
        ---
        manual merge
      3f18c6bc