1. 28 Nov, 2008 7 commits
    • Georgi Kodinov's avatar
      merged bug 37339 to 5.1-bugteam · 749dfeba
      Georgi Kodinov authored
      749dfeba
    • Georgi Kodinov's avatar
      merged bug 37339 to 5.0-bugteam · 42624db0
      Georgi Kodinov authored
      42624db0
    • Georgi Kodinov's avatar
      Bug #37339: SHOW VARIABLES not working properly with multi-byte datadir · 171ef77f
      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
      171ef77f
    • Sergey Glukhov's avatar
      automerge · 9ebba0af
      Sergey Glukhov authored
      9ebba0af
    • Sergey Glukhov's avatar
      error code is changed to satisfy Win NT · d9b8c0d4
      Sergey Glukhov authored
      d9b8c0d4
    • Sergey Glukhov's avatar
      5.0-bugteam->5.1-bugteam merge · 7b376e53
      Sergey Glukhov authored
      sql/slave.cc:
        compiler warning fix
      7b376e53
    • Sergey Glukhov's avatar
      pushbuild failure fixes · ed62e890
      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
      ed62e890
  2. 27 Nov, 2008 20 commits
  3. 26 Nov, 2008 7 commits
    • Patrick Crews's avatar
      merge · 29c4a9ca
      Patrick Crews authored
      29c4a9ca
    • Patrick Crews's avatar
      merge · 56620916
      Patrick Crews authored
      56620916
    • Ingo Struewing's avatar
      merge · f2a81664
      Ingo Struewing authored
      f2a81664
    • Matthias Leich's avatar
      Merge latest Pushes into the GCA tree · 0a314d28
      Matthias Leich authored
      (no conflicts)
      0a314d28
    • Ingo Struewing's avatar
      merge · d53224da
      Ingo Struewing authored
      d53224da
    • Horst Hunger's avatar
    • Tatiana A. Nurnberg's avatar
      Bug#37553: MySql Error Compare TimeDiff & Time · 9910b867
      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
      9910b867
  4. 25 Nov, 2008 6 commits
    • Vladislav Vaintroub's avatar
      merge · ae64e904
      Vladislav Vaintroub authored
      ae64e904
    • Matthias Leich's avatar
      Merge of fix for bug 40889 into GCA tree · 9b7f982e
      Matthias Leich authored
      9b7f982e
    • Matthias Leich's avatar
      Merge fix for bug 39854 into GCA tree · 66e1ba8a
      Matthias Leich authored
      66e1ba8a
    • Ingo Struewing's avatar
      Bug#41002 - symlink.test fails on symlinked datadir · db628089
      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.
      db628089
    • Matthias Leich's avatar
      Merge of fix for bug 40644 into GCA tree · 57fec26b
      Matthias Leich authored
      57fec26b
    • Matthias Leich's avatar
      Merge of fix for bug 39979 into GCA tree · 3dd8f23a
      Matthias Leich authored
      3dd8f23a