1. 27 Feb, 2009 2 commits
    • Tatiana A. Nurnberg's avatar
      automerge · fe09326e
      Tatiana A. Nurnberg authored
      fe09326e
    • Tatiana A. Nurnberg's avatar
      Bug#40657: assertion with out of range variables and traditional sql_mode · 71913e35
      Tatiana A. Nurnberg authored
      In STRICT mode, out-of-bounds values caused an error message
      to be queued (rather than just a warning), without any further
      error-like processing happening. (The error is queued during
      update, at which time it's too late. For it to be processed
      properly, it would need to be queued during check-stage.)
      The assertion rightfully complains that we're trying to send
      an OK while having an error queued.
      
      Changeset breaks a lot of tests out into check-stage. This also
      allows us to send more correct warnings/error messages.
      
      sql/set_var.cc:
        cleanup: fold get_unsigned() and fix_unsigned() into one,
        as well as all the semi-common code from the ::check
        functions.
      71913e35
  2. 26 Feb, 2009 4 commits
    • Ramil Kalimullin's avatar
      Auto-merge · cd5744db
      Ramil Kalimullin authored
      cd5744db
    • Ramil Kalimullin's avatar
      Auto-merge · debb95ca
      Ramil Kalimullin authored
      debb95ca
    • Bernt M. Johnsen's avatar
      Merged from gca-branch (bug 43110) · 780a0aa0
      Bernt M. Johnsen authored
      780a0aa0
    • Ramil Kalimullin's avatar
      Fix for bug#19829:make test Failed in mysql_client_test · c9e1884c
      Ramil Kalimullin authored
      *with --with-charset=utf8*
      
      Problem: wrong LONG TEXT field length is sent to a client 
      when multibyte server character set used.
      
      Fix: always limit field length sent to a client to 2^32,
      as we store it in 4 byte slot.
      
      Note: mysql_client_test changed accordingly.
      
      
      sql/protocol.cc:
        Fix for bug#19829:make test Failed in mysql_client_test 
        *with --with-charset=utf8*
          - limit field length sent to client to UINT_MAX32 as 
            it may exceeds 32 bit slot for LONG TEXT fields if
            thd_charset->mbmaxlen > 1.
      tests/mysql_client_test.c:
        Fix for bug#19829:make test Failed in mysql_client_test
        *with --with-charset=utf8*
          - checking field members have in mind that field length
            is limited to UINT_MAX32.
      c9e1884c
  3. 25 Feb, 2009 26 commits
  4. 24 Feb, 2009 8 commits
    • Tatiana A. Nurnberg's avatar
      Bug#40657: assertion with out of range variables and traditional sql_mode · 7099d7bc
      Tatiana A. Nurnberg authored
      In STRICT mode, out-of-bounds values caused an error message
      to be queued (rather than just a warning), without any further
      error-like processing happening. (The error is queued during
      update, at which time it's too late. For it to be processed
      properly, it would need to be queued during check-stage.)
      The assertion rightfully complains that we're trying to send
      an OK while having an error queued.
      
      Changeset breaks a lot of tests out into check-stage. This also
      allows us to send more correct warnings/error messages.
      
      
      sql/set_var.cc:
        cleanup: fold get_unsigned() and fix_unsigned() into one,
        as well as all the semi-common code from the ::check
        functions.
      7099d7bc
    • Anurag Shekhar's avatar
      Bug #38103 myisamchk: --help output incomplete · da3c7731
      Anurag Shekhar authored
      In the output message for --help entry for -H --HELP was missing.
      Added this entry while printing the help text.
      
      storage/myisam/myisamchk.c:
        Added entry for -H --HELP while printing message for -? --help
      da3c7731
    • Andrei Elkin's avatar
      5b072178
    • Andrei Elkin's avatar
      merging from 5.0-bt rep to a local branch · a6ac350b
      Andrei Elkin authored
      a6ac350b
    • Patrick Crews's avatar
      Bug#40178: Test main.completion_type_func does not clean up / needs to be rewritten · df09ddac
      Patrick Crews authored
      Revised the test to include a test of completion_type = 1 as well as making the test more readable / worthwhile
      Removed the master.opt file as it was redundant / unnecessary.
      
      mysql-test/suite/sys_vars/t/completion_type_func-master.opt:
        Removed as redundant.  Test uses include/have_innodb.inc.
      df09ddac
    • Andrei Elkin's avatar
    • Georgi Kodinov's avatar
      Bug #31060: MySQL CLI parser bug 2 · 4b05db5c
      Georgi Kodinov authored
            
      There was a problem when a DELIMITER COMMAND is not the first 
      command on the line. I this case an extra line feed was added
      to the glob buffer and this was causing subsequent attempts 
      to enter this delimiter to fail.
      Fixed by not adding a new line to the glob buffer if the 
      command being added is a DELIMITER
      
      client/mysql.cc:
        Bug #31060: Don't add a new line if DELIMTER is added to
        the glob buffer
      mysql-test/r/mysql.result:
        Bug #31060: test case
      mysql-test/t/mysql.test:
        Bug #31060: test case
      4b05db5c
    • Georgi Kodinov's avatar
      Bug #31060: MySQL CLI parser bug 2 · 85ea3740
      Georgi Kodinov authored
            
      There was a problem when a DELIMITER COMMAND is not the first 
      command on the line. I this case an extra line feed was added
      to the glob buffer and this was causing subsequent attempts 
      to enter this delimiter to fail.
      Fixed by not adding a new line to the glob buffer if the 
      command being added is a DELIMITER
      
      client/mysql.cc:
        Bug #31060: Don't add a new line if DELIMTER is added to
        the glob buffer
      mysql-test/r/mysql.result:
        Bug #31060: test case
      mysql-test/t/mysql.test:
        Bug #31060: test case
      85ea3740