1. 23 Apr, 2006 1 commit
  2. 21 Apr, 2006 13 commits
    • unknown's avatar
      innodb_unsafe_binlog-master.opt: · 6692dcf7
      unknown authored
        Make InnoDB option "loose", as the server might be
        started with this option just to find out the test
        is to be skipped in the configuration (bug#17359)
      
      
      mysql-test/t/innodb_unsafe_binlog-master.opt:
        Make InnoDB option "loose", as the server might be
        started with this option just to find out the test
        is to be skipped in the configuration (bug#17359)
      6692dcf7
    • unknown's avatar
      Merge · 07268dfa
      unknown authored
      
      client/mysql.cc:
        Auto merged
      07268dfa
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 42f71581
      unknown authored
      into  rurik.mysql.com:/home/igor/mysql-5.0
      
      
      42f71581
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · e9bf1b9a
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      e9bf1b9a
    • unknown's avatar
      Post merge fixes · b93dd432
      unknown authored
      b93dd432
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · b5cde201
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      b5cde201
    • unknown's avatar
      0a22763f
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 946adafd
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      
      946adafd
    • unknown's avatar
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 18b25158
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/my50-bug19190
      
      
      18b25158
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 · 103fbcee
      unknown authored
      into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      mysql-test/r/order_by.result:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Manual merge
      mysql-test/t/order_by.test:
        Manual merge
      sql/sql_lex.h:
        Manual merge
      sql/sql_parse.cc:
        Manual merge
      sql/sql_union.cc:
        Manual merge
      103fbcee
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · d4f4f5bd
      unknown authored
      into  rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      
      d4f4f5bd
    • unknown's avatar
      Fixed bug #18767. · 9225a51c
      unknown authored
      The bug caused wrong result sets for union constructs of the form
      (SELECT ... ORDER BY order_list1 [LIMIT n]) ORDER BY order_list2.
      For such queries order lists were concatenated and limit clause was
      completely neglected. 
      
      
      mysql-test/r/order_by.result:
        Added a test case for bug #18767.
      mysql-test/t/order_by.test:
        Added a test case for bug #18767.
      sql/sql_lex.h:
        Fixed bug #18767.
        Placed the code the created a fake SELECT_LEX into a separate function.
      sql/sql_parse.cc:
        Fixed bug #18767.
        Placed the code the created a fake SELECT_LEX into a separate function.
      sql/sql_select.cc:
        Fixed bug #18767.
        Changed the condition on which a SELECT is treated as part of a UNION.
        The SELECT in 
        (SELECT ... ORDER BY order_list1 [LIMIT n]) ORDER BY order_list2 
        now is handled in the same way as the first SELECT in a UNION
        sequence.
      sql/sql_union.cc:
        Fixed bug #18767.
        Changed the condition at which a SELECT is treated as part of a UNION.
        The SELECT in 
        (SELECT ... ORDER BY order_list1 [LIMIT n]) ORDER BY order_list2 
        now is handled in the same way as the first SELECT in a UNION
        sequence.
      sql/sql_yacc.yy:
        Fixed bug #18767.
        Changed the condition at which a SELECT is treated as part of a UNION.
        The SELECT in 
        (SELECT ... ORDER BY order_list1 [LIMIT n]) ORDER BY order_list2 
        now is handled in the same way as the first SELECT in a UNION
        sequence. In the same way is handled the SELECT in
        (SELECT ... LIMIT n) ORDER BY order list.
        Yet if there is neither ORDER BY nor LIMIT in the single-select
        union construct
        (SELECT ...) ORDER BY order_list
        then it is still handled as simple select with an order clause.
      9225a51c
  3. 20 Apr, 2006 15 commits
    • unknown's avatar
      Restoring changes erroneously removed by applying · 43690501
      unknown authored
       the innodb-5.0-ss476 snapshot.
      
      
      43690501
    • unknown's avatar
      Applied innodb-5.0-ss476 snapshot. · 7ee05d7c
      unknown authored
       Fix BUG#18934: "InnoDB crashes when table uses column like DB_ROW_ID".
       Also, fix memory leaks in row_create_table_for_mysql() in rare
       corner cases.
      
      
      innobase/dict/dict0dict.c:
        Applied innodb-5.0-ss476 snapshot.
         Refuse tables that use reserved column names (Bug#18934).
      innobase/dict/dict0load.c:
        Applied innodb-5.0-ss476 snapshot.
         dict_load_table(): Refuse to load tables with other TYPE
         than DICT_TABLE_ORDINARY.
      innobase/dict/dict0mem.c:
        Applied innodb-5.0-ss476 snapshot.
         Add dict_mem_table_free(), use it instead of duplicating
         the code everywhere.
      innobase/ibuf/ibuf0ibuf.c:
        Applied innodb-5.0-ss476 snapshot.
      innobase/include/dict0dict.h:
        Applied innodb-5.0-ss476 snapshot.
         Refuse tables that use reserved column name (Bug#18934).
      innobase/include/dict0mem.h:
        Applied innodb-5.0-ss476 snapshot.
         Add dict_mem_table_free(), use it instead of duplicating
         the code everywhere.
      innobase/include/univ.i:
        Applied innodb-5.0-ss476 snapshot.
      innobase/log/log0recv.c:
        Applied innodb-5.0-ss476 snapshot.
      innobase/row/row0mysql.c:
        Applied innodb-5.0-ss476 snapshot.
         Refuse tables that use reserved column names (Bug#18934).
      mysql-test/r/innodb.result:
        Applied innodb-5.0-ss476 snapshot.
         Fix result for test case for Bug#18934.
         (Other changes are to be restored by the next cset).
      mysql-test/t/innodb.test:
        Applied innodb-5.0-ss476 snapshot.
         Fix result for test case for Bug#18934.
         (Removed test case for Bug#14360 is to be restored by the next cset).
      7ee05d7c
    • unknown's avatar
      Merge mysql.com:/home/alexi/innodb/mysql-4.1-work · 6b63f270
      unknown authored
      into  mysql.com:/home/alexi/innodb/mysql-5.0-work
       Null-merge.
      
      
      innobase/dict/dict0dict.c:
        Null-merge.
      innobase/dict/dict0mem.c:
        Null-merge.
      innobase/include/dict0dict.h:
        Null-merge.
      innobase/include/dict0mem.h:
        Null-merge.
      innobase/include/univ.i:
        Null-merge.
      innobase/row/row0mysql.c:
        Null-merge.
      6b63f270
    • unknown's avatar
      Applied innodb-4.1-ss22 snapshot. · 66ee876b
      unknown authored
       Fix BUG#16814: "SHOW INNODB STATUS format error in LATEST FOREIGN KEY ERROR section"
           Add a missing newline to the LAST FOREIGN KEY ERROR section in SHOW INNODB STATUS
           output.
       Fix BUG#18934: "InnoDB crashes when table uses column names like DB_ROW_ID".
           Refuse tables that use reserved column names.
      
      
      innobase/dict/dict0dict.c:
        Applied innodb-4.1-ss22 snapshot.
         dict_foreign_error_report(): Always print a newline after invoking
          dict_print_info_on_foreign_key_in_create_format() (Bug#16814).
         Refuse tables that use reserved column names (Bug#18934).
      innobase/dict/dict0mem.c:
        Applied innodb-4.1-ss22 snapshot.
         Refuse tables that use reserved column names (Bug#18934).
      innobase/include/dict0dict.h:
        Applied innodb-4.1-ss22 snapshot.
         Refuse tables that use reserved column names (Bug#18934).
      innobase/include/dict0mem.h:
        Applied innodb-4.1-ss22 snapshot.
         Refuse tables that use reserved column names (Bug#18934).
      innobase/include/univ.i:
        Applied innodb-4.1-ss22 snapshot.
      innobase/row/row0mysql.c:
        Applied innodb-4.1-ss22 snapshot.
         Refuse tables that use reserved column names (Bug#18934).
      66ee876b
    • unknown's avatar
      Post merge correction for the Changesset · db623fa8
      unknown authored
      Fixes for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs related to MySQL 4.1
      and Bug#16920 rpl_deadlock_innodb fails in show slave status (reported for MySQL 5.1)
      
      
      mysql-test/r/rpl_deadlock.result:
        Updated result
      db623fa8
    • unknown's avatar
      Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src · 0eb3afaf
      unknown authored
      into  three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1
      
      
      0eb3afaf
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · c01754c9
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      
      c01754c9
    • unknown's avatar
      Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src · 58938d21
      unknown authored
      into  three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1
      
      
      58938d21
    • unknown's avatar
    • unknown's avatar
      func_gconcat.result, func_gconcat.test: · d27c7a7c
      unknown authored
        Remove duplicate test case for bug#14169
      
      
      mysql-test/t/func_gconcat.test:
        Remove duplicate test case for bug#14169
      mysql-test/r/func_gconcat.result:
        Remove duplicate test case for bug#14169
      d27c7a7c
    • unknown's avatar
      Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5f3c9108
      unknown authored
      into  production.mysql.com:/usersnfs/mleich/src
      
      
      5f3c9108
    • unknown's avatar
      func_gconcat.test: · fffe7c4d
      unknown authored
        Clean up test case for bug#14169
      
      
      mysql-test/t/func_gconcat.test:
        Clean up test case for bug#14169
      fffe7c4d
    • unknown's avatar
      Post merge fix · b30d80e8
      unknown authored
      b30d80e8
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · 0775a712
      unknown authored
      into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      0775a712
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-2 · 8e27c374
      unknown authored
      into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      mysys/mf_keycache.c:
        Auto merged
      ndb/src/kernel/SimBlockList.cpp:
        Auto merged
      ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
        Auto merged
      mysql-test/r/func_gconcat.result:
        Manual merge
      mysql-test/r/key_cache.result:
        Manual merge
      mysql-test/t/func_gconcat.test:
        Manual merge
      mysql-test/t/key_cache.test:
        Manual merge
      sql/item_func.cc:
        Manual merge
      sql/item_sum.h:
        Manual merge
      sql/lock.cc:
        Manual merge
      sql/sql_select.cc:
        Manual merge
      sql/unireg.h:
        Manual merge
      8e27c374
  4. 19 Apr, 2006 9 commits
    • unknown's avatar
      Temporarily commented out a query from the test case for bug 14169 to make it... · e4d653ab
      unknown authored
      Temporarily commented out a query from the test case for bug 14169 to make it pass with --ps-protocol.
      
      
      mysql-test/r/func_gconcat.result:
        Added DROP TABLE command to the test case for bug 14169.
      e4d653ab
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · 34efb701
      unknown authored
      into  rurik.mysql.com:/home/igor/dev/mysql-4.1-2
      
      
      34efb701
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-17043 · d8df724a
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      d8df724a
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 08e52679
      unknown authored
      into moonbone.local:/work/14169-bug-4.1-mysql
      
      
      08e52679
    • unknown's avatar
      func_gconcat.result: · 913c8fa1
      unknown authored
        Corrected test case for the bug#14169 to make it pass in --ps-protocol mode.
      
      
      mysql-test/r/func_gconcat.result:
        Corrected test case for the bug#14169 to make it pass in --ps-protocol mode.
      913c8fa1
    • unknown's avatar
      Bug#18544 - LOCK TABLES timeout causes MyISAM table corruption · c0887e54
      unknown authored
      After a locking error the open table(s) were not fully
      cleaned up for reuse. But they were put into the open table
      cache even before the lock was tried. The next statement
      reused the table(s) with a wrong lock type set up. This
      tricked MyISAM into believing that it don't need to update
      the table statistics. Hence CHECK TABLE reported a mismatch
      of record count and table size.
      
      Fortunately nothing worse has been detected yet. The effect
      of the test case was that the insert worked on a read locked
      table. (!)
      
      I added a new function that clears the lock type from all
      tables that were prepared for a lock. I call this function
      when a lock failes.
      
      No test case. One test would add 50 seconds to the
      test suite. Another test requires file mode modifications.
      I added a test script to the bug report. It contains three
      cases for failing locks. All could reproduce a table
      corruption. All are fixed by this patch.
      
      This bug was not lock timeout specific.
      
      
      sql/lock.cc:
        Bug#18544 - LOCK TABLES timeout causes MyISAM table corruption
        Resetting the lock type in the open table(s) lock data
        after a locking error.
      c0887e54
    • unknown's avatar
      Bug#19190 syntax error in mysql-test/mysql-test-run.sh script · f2ad5332
      unknown authored
      
      mysql-test/mysql-test-run.sh:
        Use 'test', not '[' as the shell builtin might not have '-L
      f2ad5332
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug15530 · fb62bcb0
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge
      
      
      ndb/src/mgmclient/CommandInterpreter.cpp:
        Auto merged
      fb62bcb0
    • unknown's avatar
      Fixed bug #19079. · b97e48a9
      unknown authored
      The bug caused a reported index corruption in the cases when
      key_cache_block_size was not a multiple of myisam_block_size,
      e.g. when key_cache_block_size=1536 while myisam_block_size=1024.
      
      
      mysql-test/r/key_cache.result:
        Added a test case for bug #19079.
      mysql-test/t/key_cache.test:
        Added a test case for bug #19079.
      b97e48a9
  5. 18 Apr, 2006 2 commits