1. 02 Feb, 2006 1 commit
    • unknown's avatar
      Fixed bug #16382. · 7ea60ae9
      unknown authored
      When an ambiguous field name is used in a group by clause a warning is issued
      in the find_order_in_list function by a call to push_warning_printf.
      An expression that was not always valid was passed to this call as the field
      name parameter.
      
      
      mysql-test/r/view.result:
        Added a test case for bug #16382.
      mysql-test/t/view.test:
        Added a test case for bug #16382.
      7ea60ae9
  2. 01 Feb, 2006 4 commits
  3. 31 Jan, 2006 18 commits
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 86733db8
      unknown authored
      into  mysql.com:/home/alexi/innodb/mysql-5.0-ss162
      
      
      86733db8
    • unknown's avatar
      Fixed: BUG#15653, BUG#16157, BUG#16229, BUG#16298, BUG#16387, BUG#16582. · 6a9a96dc
      unknown authored
        Applied innodb-5.0-ss149/162 snapshots.
      
      
      innobase/btr/btr0sea.c:
        Applied innodb-5.0-149/162 snapshots.
          Account for a race condition when dropping the adaptive hash
          index for a B-tree page (Bug #16582).
          btr_search_drop_page_hash_index(): Retry the operation if a
            hash index with different parameters was built meanwhile.
            Add diagnostics for the case that hash node pointers to
            the page remain. This fix is from Heikki.
          btr_search_info-update_hash(), btr_search_info_update_slow():
            Document the parameter "info" as in/out.
      innobase/dict/dict0dict.c:
        Applied innodb-5.0-149/162 snapshots.
          Do not mistake TABLENAME_ibfk_0 for auto generated id (Bug #16387).
          dict_table_get_highest_foreign_id(): Ignore foreign constraint
            identifiers starting with the pattern TABLENAME_ibfk_0.
      innobase/dict/dict0load.c:
        Applied innodb-5.0-149/162 snapshots.
          dict_load_columns(): Set the charset-collation code
          DATA_MYSQL_BINARY_CHARSET_COLL for those binary string columns
          that lack a charset-collation code, i.e., the tables were created
          with an older version of MySQL/InnoDB than 4.1.2 (Bug #16298).
      innobase/fil/fil0fil.c:
        Applied innodb-5.0-149/162 snapshots.
          Keep track on unflushed modifications to file spaces. When there
          are tens of thousands of file spaces, flushing all files in
          fil_flush_file_spaces() would be very slow (Bug #15653).
          fil_flush_file_spaces(): Only flush unflushed file spaces.
          fil_space_t, fil_system_t: Add a list of unflushed spaces.
      innobase/include/univ.i:
        Applied innodb-5.0-149/162 snapshots.
          Avoid breaking --with-debug builds on QNS and other systems
          whose compiler pretends to be GCC 2.
          Outside __WIN__ define UNIV_INLINE as static inline.
      innobase/os/os0sync.c:
        Applied innodb-5.0-149/162 snapshots.
          Replace goto in os_event_wait with a normal loop.
      innobase/srv/srv0start.c:
        Applied innodb-5.0-149/162 snapshots.
          Fix bug #16157, a crash when innodb_log_group_home_dir is set
          to an empty string. This patch is from Heikki.
      mysql-test/r/innodb.result:
        Applied innodb-5.0-149/162 snapshots.
          Fixed results for added test cases.
      mysql-test/t/innodb.test:
        Applied innodb-5.0-149/162 snapshots.
          Added test cases.
      sql/ha_innodb.cc:
        Applied innodb-5.0-149/162 snapshots.
          Remove some declarations of unused global variables and member
            variables of class ha_innobase.
          Added diagnostic code trx_print() to
            innobase_query_caching_of_table_permitted() to find reason
            why we are holding adaptive search latch.
          Fixed bug #16229 MySQL/InnoDB uses full explicit table locks
            in trigger processing. Take a InnoDB table lock only if user
            has explicitly requested a table lock. Added some additional
            comments to store_lock() and external_lock(). Fixed some
            code style errors.
          Remember to use noninlined versions of the functions on
            ha_innodb.cc !
      sql/ha_innodb.h:
        Applied innodb-5.0-149/162 snapshots.
          Remove some declarations of unused global variables and member
          variables of class ha_innobase.
      6a9a96dc
    • unknown's avatar
      Added test case for BUG#15091: Sp Returns Unknown error in order clause....and there is · fd61a0c0
      unknown authored
                                     no order by clause
      which was fixed by earlier changesets.
      The error message is now the more generic "Unknown table ... in field list".
      
      
      mysql-test/r/sp-error.result:
        Updated results for new test case (BUG#15091).
      mysql-test/t/sp-error.test:
        New test case for BUG#15091.
      fd61a0c0
    • unknown's avatar
      Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 · 47b98602
      unknown authored
      into  devsrv-b.mysql.com:/space/magnus/my50-bug15302
      
      
      47b98602
    • unknown's avatar
      Added test case for BUG#14270: Stored procedures: crash if load index · c3612b41
      unknown authored
        which was fixed by earlier changesets; LOAD INDEX is not allowed in functions.
        Also testing CACHE INDEX, while OPTIMIZE and CHECK were covered by existing tests already.
      
      
      mysql-test/r/sp-error.result:
        Updated result for new test case (BUG#14270).
      mysql-test/t/sp-error.test:
        New test case for BUG#14270.
      c3612b41
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 1bbd24a6
      unknown authored
      into  mysql.com:/usr/local/mysql/mysql-5.0
      
      
      1bbd24a6
    • unknown's avatar
      Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15302/my50-bug15302 · 1a53ee1a
      unknown authored
      into  devsrv-b.mysql.com:/space/magnus/my50-bug15302
      
      
      client/mysqltest.c:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      1a53ee1a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 852a5405
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-bg16829
      
      
      sql/sql_yacc.yy:
        Auto merged
      852a5405
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug15302/my41-bug15302 · b498114f
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug15302/my50-bug15302
      
      
      client/mysqltest.c:
        Already in 5.0
      sql/sql_db.cc:
        "mysql_create_db" is already silent in 5.0
      b498114f
    • unknown's avatar
      Merge mysql.com:/extern/mysql/bk/mysql-5.0 · 5dda41a7
      unknown authored
      into  mysql.com:/extern/mysql/work/bug15737/mysql-5.0
      
      
      5dda41a7
    • unknown's avatar
      Bug #15302 LOAD DATA FROM MASTER -> Packets out of order (Found: 2, expected 1) · c35be281
      unknown authored
       - Change "mysql_create_db" to not call "send_ok" if in silent mode i.e. called from "load_master_data"
       - Change mysqltest to detect when there aren't as many warnings available as was reported.
      
      
      client/mysqltest.c:
        Call "die" if warnings were reported but there weren't any warnings to retrieve
      sql/sql_db.cc:
        Don't call "send_ok" if in silent mode.
      c35be281
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4675b563
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-bg16829
      
      
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      4675b563
    • unknown's avatar
      Check std_data_ln already created · 107ad3a0
      unknown authored
      Add / to std_data in ln command
      
      
      mysql-test/mysql-test-run.sh:
        Check if std_data_ln is already created
        Add / to std_data to create a symlink to a dir an not a file.
      107ad3a0
    • unknown's avatar
      Merge mysql.com:/extern/mysql/bk/mysql-5.0 · b5e313f3
      unknown authored
      into  mysql.com:/extern/mysql/work/bug15737/mysql-5.0
      
      
      b5e313f3
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 980ba4e5
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      980ba4e5
    • unknown's avatar
      Bug #16919 some tests fail in 5.0 · d7d9a12a
      unknown authored
       - Use "../tmp" as --slave-load-tmpdir. Same as in mysql-test-run.pl
      
      
      mysql-test/mysql-test-run.sh:
        Use same --slave-load-tmpdir as in mysql-test-run.pl
      d7d9a12a
    • unknown's avatar
      Fix missing --replace_result on $SLAVE_MYPORT in federated. · bccad0dc
      unknown authored
      
      mysql-test/t/federated.test:
        Fix missing --replace_result on $SLAVE_MYPORT to work with MTR_BUILD_THREAD.
      mysql-test/r/federated.result:
        Fix missing --replace_result on $SLAVE_MYPORT to work with MTR_BUILD_THREAD.
      bccad0dc
    • unknown's avatar
      f5e47ea8
  4. 30 Jan, 2006 13 commits
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · b16c7d2a
      unknown authored
      into  govinda.patg.net:/home/patg/mysql-build/mysql-5.0
      
      
      b16c7d2a
    • unknown's avatar
      Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss20 · 8482d147
      unknown authored
      into  mysql.com:/home/alexi/innodb/mysql-5.0-ss20
      
      
      innobase/btr/btr0sea.c:
        Null merged
      innobase/fil/fil0fil.c:
        Null merged
      8482d147
    • unknown's avatar
      Fixed BUG#15653, BUG#16582. · 8eaf6f11
      unknown authored
        Applied innodb-4.1-ss20 snapshot.
      
      
      innobase/btr/btr0sea.c:
        Applied innodb-4.1-ss20 snapshot.
          Account for a race condition when dropping the adaptive
          hash index for a B-tree page (Bug #16582).
          btr_search_drop_page_hash_index(): Retry the operation if a hash
          index with different parameters was built meanwhile. Add
          diagnostics for the case that hash node pointers to the page
          remain. This fix is from Heikki.
          btr_search_info_update_hash(), btr_search_info_update_slow():
          Document the parameter "info" as in/out.
      innobase/fil/fil0fil.c:
        Applied innodb-4.1-ss20 snapshot.
          Keep track on unflushed modifications to file spaces. When
          there are tens of thousnads of file spaces, flushing all files
          in fil_flush_file_spaces() would be very slow (Bug #16582).
          fil_flush_file_spaces(): Only flush unflushed file spaces.
          fil_space_t, fil_system_t: Add a list of unflushed spaces.
      innobase/include/btr0sea.ic:
        Applied innodb-4.1-ss20 snapshot.
          btr_search_info_update_hash(), btr_search_info_update_slow():
          Document the parameter "info" as in/out.
      8eaf6f11
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6065cacb
      unknown authored
      into  govinda.patg.net:/home/patg/mysql-build/mysql-5.0
      
      
      6065cacb
    • unknown's avatar
      Merge mysql.com:/extern/mysql/bk/mysql-5.0 · 79e09501
      unknown authored
      into  mysql.com:/extern/mysql/work/bug15737/mysql-5.0
      
      
      79e09501
    • unknown's avatar
      Merge mysql.com:/extern/mysql/bk/mysql-5.0 · 907c38cd
      unknown authored
      into  mysql.com:/extern/mysql/work/bug15737/mysql-5.0
      
      
      907c38cd
    • unknown's avatar
      Post-review fix for BUG#15737 (corrected typo in sp-code.test comment) · 9161d308
      unknown authored
      
      mysql-test/t/sp-code.test:
        Corrected typo in comment.
      9161d308
    • unknown's avatar
      Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 · d42c472e
      unknown authored
      into  selena.:H:/MYSQL/src/#15634-mysql-5.0
      
      
      sql/field.cc:
        Auto merged
      d42c472e
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · e6d7f242
      unknown authored
      into  mysql.com:/home/alexi/innodb/mysql-5.0-ss17
      
      
      e6d7f242
    • unknown's avatar
      Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss17 · 78c0d5d5
      unknown authored
      into  mysql.com:/home/alexi/innodb/mysql-5.0-ss17
      
      
      innobase/dict/dict0dict.c:
        Null merged
      mysql-test/r/innodb.result:
        Null merged
      mysql-test/t/innodb.test:
        Null merged
      78c0d5d5
    • unknown's avatar
      Fixed BUG#16387. · cc47eb77
      unknown authored
        Applied innodb-4.1-ss17 snapshot.
        Do not mistake TABLENAME_ibfk_0 for auto-generated id.
      
      
      innobase/dict/dict0dict.c:
        Applied innodb-4.1-ss17 snapshot.
          dict_table_get_highest_foreign_id(): Ignore foreign
          constraint identifiers starting with the pattern
          TABLENAME_ibfk_0 (BUG#16387).
      mysql-test/r/innodb.result:
        Applied innodb-4.1-ss17 snapshot.
          Fixed results for added test case.
      mysql-test/t/innodb.test:
        Applied innodb-4.1-ss17 snapshot.
          Added test case.
      cc47eb77
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug15719/my50-bug15719 · d1ed8e22
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      sql-common/client.c:
        Auto merged
      tests/mysql_client_test.c:
        Merge
      d1ed8e22
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 462fcf40
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
      
      
      462fcf40
  5. 29 Jan, 2006 1 commit
    • unknown's avatar
      information_schema_db.result, information_schema.result: · ef0cd2f5
      unknown authored
        Fix test result.
      table.h, sql_show.cc:
        Put I_S tables in lexical order.
      
      
      sql/sql_show.cc:
        Put I_S tables in lexical order.
      sql/table.h:
        Put I_S tables in lexical order.
      mysql-test/r/information_schema.result:
        Fix test result.
      mysql-test/r/information_schema_db.result:
        Fix test result.
      ef0cd2f5
  6. 28 Jan, 2006 2 commits
    • unknown's avatar
      Fix for bug #16829 "Firing trigger with RETURN crashes the server" · a1b67ce2
      unknown authored
      We should disallow usage of RETURN statement in triggers and emit
      error at parsing time (instead of crashing when trigger is fired).
      
      
      mysql-test/r/trigger.result:
        Added test for bug #16829 "Firing trigger with RETURN crashes the server".
      mysql-test/t/trigger.test:
        Added test for bug #16829 "Firing trigger with RETURN crashes the server".
      sql/sql_yacc.yy:
        We should disallow usage of RETURN statement in triggers and emit
        error at parsing time (instead of crashing when trigger is fired).
      a1b67ce2
    • unknown's avatar
      Fixed bug #16260. · 6bfbba34
      unknown authored
      The problem has manifested itself in the cases when we have a nested outer join
      for which it can be inferred that one of the inner tables is a single row table.
      
      
      mysql-test/r/join_nested.result:
        Added a test case for bug #16260.
      mysql-test/t/join_nested.test:
        Added a test case for bug #16260.
      sql/sql_select.cc:
        Fixed bug #16260.
        The problem has manifested itself in the cases when we have a nested outer join
        for which it can be inferred that one of the inner tables is a single row table.
        A table is never considered as a const table if it is used in a nested join 
        that serves as an inner operand of an outer join.
      6bfbba34
  7. 27 Jan, 2006 1 commit
    • unknown's avatar
      BUG# 14768 · e13a840a
      unknown authored
      Added fixes to make last_insert_id() to work.
      
      
      mysql-test/r/federated.result:
        BUG #14768
        
        New test results for last_insert_id()
      mysql-test/t/federated.test:
        BUG #14768
        
        Tests for last_insert_id()
      sql/ha_federated.cc:
        BUG# 14768
        
        * Added code to set last_insert_id()
        * Added code to free share->scheme
      sql/ha_federated.h:
        BUG #14768
        
        New method for setting last_insert_id()
      e13a840a