1. 28 Jun, 2007 1 commit
    • unknown's avatar
      Fix for BUG#10491: Server returns data as charset binary · 003f416f
      unknown authored
      SHOW CREATE TABLE or SELECT FROM I_S.
      
      Actually, the bug discovers two problems:
        - the original query is not preserved properly. This is the problem
          of BUG#16291;
        - the resultset of SHOW CREATE TABLE statement is binary.
      
      This patch fixes the second problem for the 5.0.
      
      Both problems will be fixed in 5.1.
      
      
      mysql-test/r/show_check.result:
        Update result file.
      mysql-test/t/show_check.test:
        Provide test case for BUG#10491.
      sql/item.h:
        Use utf8_general_ci instead of binary collation by default,
        because for views and base tables utf8 is the character set
        in which their definition is stored. For system constants
        it's the default character set, and for other objects
        (routines, triggers), no character set is stored, and
        therefore no character set is known, so returning utf8
        is just as good as any non-binary character set.
        This latter problem is fixed in 5.1 by 16291. In 5.1
        we will return the "real" character set.
      003f416f
  2. 27 Jun, 2007 1 commit
  3. 25 Jun, 2007 4 commits
  4. 24 Jun, 2007 3 commits
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 683a1119
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug25602
      
      
      sql/sql_select.cc:
        Auto merged
      683a1119
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0 · 98646c96
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      sql/log_event.cc:
        Auto merged
      98646c96
    • unknown's avatar
      Fixed bug #25602. A query with DISTINCT in the select list to which · 09e2b603
      unknown authored
      the loose scan optimization for grouping queries was applied returned 
      a wrong result set when the query was used with the SQL_BIG_RESULT
      option.
      
      The SQL_BIG_RESULT option forces to use sorting algorithm for grouping
      queries instead of employing a suitable index. The current loose scan
      optimization is applied only for one table queries when the suitable
      index is covering. It does not make sense to use sort algorithm in this
      case. However the create_sort_index function does not take into account
      the possible choice of the loose scan to implement the DISTINCT operator
      which makes sorting unnecessary. Moreover the current implementation of
      the loose scan for queries with distinct assumes that sorting will
      never happen. Thus in this case create_sort_index should not call
      the function filesort.
      
      
      mysql-test/r/group_min_max.result:
        Added a test case for bug #25602.
      mysql-test/t/group_min_max.test:
        Added a test case for bug #25602.
      09e2b603
  5. 23 Jun, 2007 3 commits
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/4.1-opt · 6688a54f
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      6688a54f
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0-opt-29095 · e45576ac
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      e45576ac
    • unknown's avatar
      Fixed bug #29095. · e7778b65
      unknown authored
      INSERT into table from SELECT from the same table
      with ORDER BY and LIMIT was inserting other data
      than sole SELECT ... ORDER BY ... LIMIT returns.
      
      One part of the patch for bug #9676 improperly pushed
      LIMIT to temporary table in the presence of the ORDER BY
      clause.
      That part has been removed.
      
      
      sql/sql_select.cc:
        Fixed bug #29095.
        One part of the patch for bug #9676 improperly pushed
        LIMIT to temporary table in the presence of the ORDER BY
        clause.
        That part has been removed.
      mysql-test/t/insert_select.test:
        Expanded the test case for bug #9676.
        Created a test case for bug #29095.
      mysql-test/r/insert_select.result:
        Expanded the test case for bug #9676.
        Created a test case for bug #29095.
      e7778b65
  6. 22 Jun, 2007 11 commits
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 77825106
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      77825106
    • unknown's avatar
      Add the "nist" suite to the "test-bt" target, · 21905996
      unknown authored
      to be run only if it is available on the machine.
      
      21905996
    • unknown's avatar
      Merge adventure.(none):/home/thek/Development/cpp/bug28846/my50-bug28846 · a8117ebe
      unknown authored
      into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
      
      
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      a8117ebe
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 9f368072
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B28400-5.0-opt
      
      9f368072
    • unknown's avatar
      Bug #27383: Crash in test "mysql_client_test" · 0200ffc7
      unknown authored
      The C optimizer may decide that data access operations
      through pointer of different type are not related to 
      the original data (strict aliasing).
      This is what happens in fetch_long_with_conversion(),
      when called as part of mysql_stmt_fetch() : it tries 
      to check for truncation errors by first storing float
      (and other types of data) into a char * buffer and then 
      accesses them through a float pointer.
      This is done to prevent the effects of excess precision
      when using FPU registers.
      However the doublestore() macro converts a double pointer
      to an union pointer. This violates the strict aliasing rule.
      Fixed by making the intermediary variables volatile (
      to not re-introduce the excess precision bug) and using
      the intermediary value instead of the char * buffer.
      Note that there can be loss of precision for both signed
      and unsigned 64 bit integers converted to double and back,
      so the check must stay there (even for compatibility 
      reasons).
      Based on the excellent analysis in bug 28400.
      
      
      libmysql/libmysql.c:
        Bug #27383: avoid pointer aliasing problems while 
        not re-violating the Intel FPU gcc bug.
      0200ffc7
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 49dcd6ec
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      49dcd6ec
    • unknown's avatar
      Bug#28846 Use of undocumented Prepared Statements crashes server · 295803a1
      unknown authored
      ALTER VIEW is currently not supported as a prepared statement
      and should be disabled as such as they otherwise could cause server crashes.
      
      ALTER VIEW is currently not supported when called from stored
      procedures or functions for related reasons and should also be disabled.
      
      This patch disables these DDL statements and adjusts the appropriate test
      cases accordingly.
      
      Additional tests has been added to reflect on the fact that we do support
      CREATE/ALTER/DROP TABLE for Prepared Statements (PS), Stored Procedures (SP)
      and PS within SP.
      
      
      mysql-test/r/ps_1general.result:
        - Updated test to reflect on the new policy to disallow ALTER VIEW within SP.
      mysql-test/r/sp-dynamic.result:
        - Added PS ALTER TABLE test from within SP-context to demonstrate that CREATE/ALTER/DROP
        TABLE statements is working.
        - Added PS CREATE/ALTER/DROP VIEW tests from within SP-context to show that
        ALTER VIEW is not supported, CREATE VIEW/DROP VIEW are supported.
      mysql-test/r/sp-error.result:
        - Updated test to reflect on the new policy to disallow VIEW DDL within SP.
      mysql-test/t/ps_1general.test:
        - Updated test to reflect on the new policy to disallow VIEW DDL within SP.
      mysql-test/t/sp-dynamic.test:
        - Add PS ALTER TABLE test from within SP to demonstrate that CREATE/ALTER/DROP
        TABLE statements are supported.
      mysql-test/t/sp-error.test:
        - Updated test to reflect on the new policy to disallow ALTER VIEW
        within SP-context.
        - Changed error code 1314 to the more abstract ER_SP_BADSTATEMENT.
      sql/sql_class.h:
        - Added comment for clarity
      sql/sql_parse.cc:
        - Added comment for clarity
      sql/sql_prepare.cc:
        - Disallow ALTER VIEW as prepared statements until they are
          properly supported. Note that SQLCOM_CREATE_VIEW also handles ALTER VIEW
          statements.
      sql/sql_view.cc:
        - converted to doxygen comments
        - Added comment for clarity
      sql/sql_yacc.yy:
        - Disallow ALTER VIEW statements within a SP.
        If the parser is operating within the SP context, this is shown
        on the sp->sphead pointer. If this flag is set for view DDL operations
        we stop parsing with the error 'ER_SP_BAD_STATEMENT'.
      295803a1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 3300b8eb
      unknown authored
      into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
      
      3300b8eb
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · 0adc47a6
      unknown authored
      into  mysql.com:/home/hf/work/28839/my50-28839
      
      0adc47a6
    • unknown's avatar
      rpl_skip_error.test fixed · d58aeec1
      unknown authored
      
      mysql-test/r/rpl_skip_error.result:
        test result fixed
      mysql-test/t/rpl_skip_error.test:
        inconsistent column results hidden
      d58aeec1
    • unknown's avatar
      Bug #29138 'kill' fails in pushbuild · 86ae7940
      unknown authored
      The reason the "reap;" succeeds unexpectedly is because the query was completing(almost always) and the network buffer was big enough to store the query result (sometimes) on Windows, meaning the response was completely sent before the server thread could be killed.
      
      Therefore we use a much longer running query that doesn't have a chance to fully complete before the reap happens, testing the kill properly.
      
      
      mysql-test/r/kill.result:
        We use a much longer running query that doesn't have a chance to fully complete before the reap happens.
      mysql-test/t/kill.test:
        We use a much longer running query that doesn't have a chance to fully complete before the reap happens.
      86ae7940
  7. 21 Jun, 2007 17 commits
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · c0cc2fee
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug29104
      
      
      sql/item.cc:
        Auto merged
      c0cc2fee
    • unknown's avatar
      Merge maint1.mysql.com:/data/localhome/tsmith/bk/maint/41 · 839c07db
      unknown authored
      into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
      
      839c07db
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 6367bd2a
      unknown authored
      into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
      
      
      mysql-test/t/innodb.test:
        Auto merged
      mysql-test/r/innodb.result:
        Manual merge
      6367bd2a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1-rpl · 42247162
      unknown authored
      into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/41
      
      42247162
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · d3662296
      unknown authored
      into  amd64.(none):/src/bug27029/my50-bug27029
      
      
      myisam/sort.c:
        Auto merged
      d3662296
    • unknown's avatar
      Bug#27029 alter table ... enable keys crashes mysqld on large table · 8d27f335
      unknown authored
      - When creating an index for the sort, the number of rows plus 1 is used 
      to allocate a buffer.  In this test case, the number of rows 4294967295 
      is the max value of an unsigned integer, so when 1 was added to it, a 
      buffer of size 0 was allocated causing the crash.
      - Create new test suite for this bug's test suite as per QA.
      
      
      myisam/sort.c:
        Bug#27029 alter table ... enable keys crashes mysqld on large table
        - Check to make sure the value of records is < UINT_MAX32 to avoid a 
        false positive on the remaining condition.
      mysql-test/suite/large_tests/README.TXT:
        Bug#27029 alter table ... enable keys crashes mysqld on large table
        - New testsuite for large tests.
        - Added mtr hint for potential testers.
      mysql-test/suite/large_tests/r/alter_table.result:
        Bug#27029 alter table ... enable keys crashes mysqld on large table
        - New testsuite for large tests.
        - Added results for bug.
      mysql-test/suite/large_tests/t/alter_table.test:
        Bug#27029 alter table ... enable keys crashes mysqld on large table
        - New testsuite for large tests.
        - Added test for bug.
      8d27f335
    • unknown's avatar
      Merge maint1.mysql.com:/data/localhome/tsmith/bk/50 · 6c70aa11
      unknown authored
      into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
      
      
      configure.in:
        Auto merged
      6c70aa11
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0 · 9dfd4335
      unknown authored
      into  mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
      
      9dfd4335
    • unknown's avatar
      Test fix · aacbe21c
      unknown authored
      aacbe21c
    • unknown's avatar
      66e76447
    • unknown's avatar
      Merge pilot.(none):/data/msvensson/mysql/bug28769/my50-bug28769 · 863e3da3
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
      
      863e3da3
    • unknown's avatar
      Merge pilot.(none):/data/msvensson/mysql/bug28742/my50-bug28742 · bd099cd8
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      bd099cd8
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · 7d95000e
      unknown authored
      into  mysql.com:/home/hf/work/28839/my50-28839
      
      7d95000e
    • unknown's avatar
      rpl_skip_error test fixed · 0110a105
      unknown authored
      
      mysql-test/r/rpl_skip_error.result:
        result fixed
      mysql-test/t/rpl_skip_error.test:
        master port dependency eliminated
      0110a105
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 35c4c70a
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      35c4c70a
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · 8fa4b2fc
      unknown authored
      into  mysql.com:/home/hf/work/28839/my50-28839
      
      
      sql/log_event.cc:
        Auto merged
      8fa4b2fc
    • unknown's avatar
      Bug#24924: shared-memory-base-name that is too long causes buffer overflow · 26e9aba4
      unknown authored
      long shared-memory-base-names could overflow a static internal buffer
      and thus crash mysqld and various clients.  change both to dynamic
      buffers, show everything but overflowing those buffers still works.
      
      The test case for this would pretty much amount to
      mysqld --shared-memory-base-name=HeyMrBaseNameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX --shared-memory=1 &
      mysqladmin --no-defaults --shared-memory-base-name=HeyMrBaseNameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX shutdown
      
      Unfortunately, we can't just use an .opt file for the
      server. The .opt file is used at start-up, before any
      include in the actual test can tell mysqltest to skip
      this one on non-Windows. As a result, such a test would
      break on unices.
      
      Fixing mysql-test-run.pl to export full path for master
      and slave would enable us to start a server from within
      the test which is ugly and, what's more, doesn't work as
      the server blocks (mysqltest offers no fire-and-forget
      fork-and-exec), and mysqladmin never gets run.
      
      Making the test rpl_windows_shm or some such so we can
      is beyond ugly. As is introducing another file-name based
      special case (run "win*.test" only when on Windows). As is
      (yuck) coding half the test into mtr (as in, having it
      hand out a customized environment conductive to the shm-
      thing on Win only).
      
      Situation is exacerbated by the fact that .sh is not
      necessary run as expected on Win.
      
      In short, it's just not worth it. No test-case until we
      have a new-and-improved test framework.
      
      
      sql-common/client.c:
        Bug#24924: shared-memory-base-name that is too long causes buffer overflow
        
        compose shared memory name in dynamic rather than static buffer to prevent
        overflows (clients)
      sql/mysqld.cc:
        Bug#24924: shared-memory-base-name that is too long causes buffer overflow
        
        compose shared memory name in dynamic rather than static buffer to prevent
        overflows (server)
      26e9aba4