1. 28 Nov, 2008 8 commits
    • Gleb Shchepa's avatar
      Bug #40745: Error during WHERE clause calculation in UPDATE · d15cbc1a
      Gleb Shchepa authored
                  leads to an assertion failure
      
      Any run-time error in stored function (like recursive function
      call or update of table that is already updating by statement
      which invoked this stored function etc.) that was used in some
      expression of the single-table UPDATE statement caused an
      assertion failure.
      Multiple-table UPDATE (as well as INSERT and both single- and
      multiple-table DELETE) are not affected.
      
      
      mysql-test/r/update.result:
        Added test case for bug #40745.
      mysql-test/t/update.test:
        Added test case for bug #40745.
      sql/sql_update.cc:
        Bug #40745: Error during WHERE clause calculation in UPDATE
                    leads to an assertion failure
        
        The mysql_update function has been updated to take into account
        the status of invoked stored functions before setting the status
        of whole UPDATE query to OK.
      d15cbc1a
    • Georgi Kodinov's avatar
      merged bug 37339 to 5.1-bugteam · 552a1bd3
      Georgi Kodinov authored
      552a1bd3
    • Georgi Kodinov's avatar
      merged bug 37339 to 5.0-bugteam · f1a9d567
      Georgi Kodinov authored
      f1a9d567
    • Georgi Kodinov's avatar
      Bug #37339: SHOW VARIABLES not working properly with multi-byte datadir · 8e688a7a
      Georgi Kodinov authored
            
      The SHOW VARIABLES LIKE .../SELECT @@/SELECT ... FROM INFORMATION_SCHEMA.VARIABLES
      were assuming that all the system variables are in system charset (UTF-8).
      However the variables that are settable through command line will have a different
      character set (character_set_filesystem).
      Fixed the server to remember the correct character set of basedir, datadir, tmpdir,
      ssl, plugin_dir, slave_load_tmpdir, innodb variables; init_connect and init_slave 
      variables and use it when processing data.
      
      mysql-test/r/ctype_filesystem.result:
        Bug #37339: test case (should be in utf-8)
      mysql-test/t/ctype_filesystem-master.opt:
        Bug #37339: test case (should be in ISO-8859-1)
      mysql-test/t/ctype_filesystem.test:
        Bug #37339: test case
      sql/mysqld.cc:
        Bug #37339: remember the correct character set for init_slave and init_connect
      sql/set_var.cc:
        Bug #37339: 
          - remember the character set of the relevant variables
          - implement storing and using the correct 
            character set
      sql/set_var.h:
        Bug #37339: implement storing and using the correct 
        character set
      sql/sql_show.cc:
        Bug #37339: implement storing and using the correct 
        character set
      8e688a7a
    • Sergey Glukhov's avatar
      automerge · be1e9928
      Sergey Glukhov authored
      be1e9928
    • Sergey Glukhov's avatar
      error code is changed to satisfy Win NT · fef07511
      Sergey Glukhov authored
      fef07511
    • Sergey Glukhov's avatar
      5.0-bugteam->5.1-bugteam merge · 710b7125
      Sergey Glukhov authored
      sql/slave.cc:
        compiler warning fix
      710b7125
    • Sergey Glukhov's avatar
      pushbuild failure fixes · 78119b2d
      Sergey Glukhov authored
      mysql-test/r/perror-win.result:
        pushbuild failure fix
      mysql-test/t/perror-win.test:
        pushbuild failure fix
      sql/item_func.cc:
        pushbuild failure fix
      78119b2d
  2. 27 Nov, 2008 20 commits
  3. 26 Nov, 2008 7 commits
    • Patrick Crews's avatar
      merge · 12758f9d
      Patrick Crews authored
      12758f9d
    • Patrick Crews's avatar
      merge · 6fb5957f
      Patrick Crews authored
      6fb5957f
    • Ingo Struewing's avatar
      merge · fd06e3e2
      Ingo Struewing authored
      fd06e3e2
    • Matthias Leich's avatar
      Merge latest Pushes into the GCA tree · ee660618
      Matthias Leich authored
      (no conflicts)
      ee660618
    • Ingo Struewing's avatar
      merge · 3fb68b5f
      Ingo Struewing authored
      3fb68b5f
    • Horst Hunger's avatar
    • Tatiana A. Nurnberg's avatar
      Bug#37553: MySql Error Compare TimeDiff & Time · d096079d
      Tatiana A. Nurnberg authored
      We pretended that TIMEDIFF() would always return positive results;
      this gave strange results in comparisons of the TIMEDIFF(low,hi)<TIME(0)
      type that rendered a negative result, but still gave false in comparison.
      We also inadvertantly dropped the sign when converting times to
      decimal.
      
      CAST(time AS DECIMAL) handles signs of the times correctly.
      TIMEDIFF() marked up as signed. Time/date comparison code switched to
      signed for clarity.
      
      mysql-test/r/func_sapdb.result:
        show that time-related comparisons work with negative
        time values now.
        show that converting time to DECIMAL no longer drops sign.
      mysql-test/t/func_sapdb.test:
        show that time-related comparisons work with negative
        time values now.
        show that converting time to DECIMAL no longer drops sign.
      sql/item_cmpfunc.cc:
        signed returns
      sql/item_cmpfunc.h:
        signed now (time/date < > =)
      sql/item_func.cc:
        signed now
      sql/item_timefunc.h:
        Functions such as TIMEDIFF() return signed results!
        The file-comments pretended we were doing that all along, anyway...
      sql/my_decimal.cc:
        heed sign when converting time to my_decimal;
        times may actually be negative!
        Needed for SELECT CAST(time('-73:42:12') AS DECIMAL);
      sql/mysql_priv.h:
        using signed for dates and times now
      d096079d
  4. 25 Nov, 2008 5 commits
    • Vladislav Vaintroub's avatar
      merge · bc08b158
      Vladislav Vaintroub authored
      bc08b158
    • Matthias Leich's avatar
      Merge of fix for bug 40889 into GCA tree · 525dccb2
      Matthias Leich authored
      525dccb2
    • Matthias Leich's avatar
      Merge fix for bug 39854 into GCA tree · aa819d1b
      Matthias Leich authored
      aa819d1b
    • Ingo Struewing's avatar
      Bug#41002 - symlink.test fails on symlinked datadir · a8d3f032
      Ingo Struewing authored
      symlink.test failed when run in an environment that has mysql-test/var
      symlinked to elsewhere, e.g. a memory file system. This is the case
      when running mysql-test-run --mem.
      
      In this case the server does not detect that the directory specified
      with a DATA/INDEX DIRECTORY clause is within its data home directory.
      This problem was reported as Bug#39277 (Creation of table with data
      and/or index files in data home directory succeeds). It was decided
      that it will not be fixed in 5.1. Hence, the current behavior is
      accepted for 5.1. It will be fixed in 6.0 though.
      
      Fixed the test case so that it works in both environments. 1. When no
      symbolic link is involved, the server notices that the data/index
      directory is in its data hone directory and rejects the CREATE/ALTER
      TABLE statement. 2. When the data home directory is symlinked, it
      does not notice the problem and executes the statement sucessfully.
      
      
      mysql-test/r/symlink.result:
        Bug#41002 - symlink.test fails on symlinked datadir
        Updated test result.
      mysql-test/t/symlink.test:
        Bug#41002 - symlink.test fails on symlinked datadir
        Adjusted the test case to the accepted behavior.
        It needs to accept success and failure of some statements.
      a8d3f032
    • Matthias Leich's avatar
      Merge of fix for bug 40644 into GCA tree · 1a19341c
      Matthias Leich authored
      1a19341c