1. 02 Feb, 2006 9 commits
    • unknown's avatar
      One more post-merge fix. · 334da85f
      unknown authored
      
      mysql-test/r/heap.result:
        It turns out that I didn't commit one test result (it's identical 
        to 4.1)
      334da85f
    • unknown's avatar
      Post-merge fixes. · 2fb59bd7
      unknown authored
      2fb59bd7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · cf4b6ee4
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-root
      
      
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      cf4b6ee4
    • unknown's avatar
      item_timefunc.cc: · 86f9bdf8
      unknown authored
        manual adding the fix for bug#15828 which did not automerge
      
      
      sql/item_timefunc.cc:
        manual adding the fix for bug#15828 which did not automerge
      86f9bdf8
    • unknown's avatar
      Merge mysql.com.:/data/BK/mysql-4.1_15828 · d25eaabe
      unknown authored
      into  mysql.com.:/data/BK/mysql-5.0_15828
      
      
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      sql/item_timefunc.cc:
        manually merging fix for bug 15282 - automerge failed as 5.0 was heavely changed
        step one using local for file item_timefunc
      d25eaabe
    • unknown's avatar
      Merge mysql.com:/opt/local/work/mysql-4.1-root · 95a3509a
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-root
      
      
      BitKeeper/deleted/.del-rpl_ignore_table.result:
        Delete: mysql-test/r/rpl_ignore_table.result
      BitKeeper/deleted/.del-rpl_multi_update4.result:
        Delete: mysql-test/r/rpl_multi_update4.result
      BitKeeper/deleted/.del-rpl_ignore_table-slave.opt:
        Delete: mysql-test/t/rpl_ignore_table-slave.opt
      BitKeeper/deleted/.del-rpl_ignore_table.test:
        Delete: mysql-test/t/rpl_ignore_table.test
      BitKeeper/deleted/.del-rpl_multi_update4-slave.opt:
        Delete: mysql-test/t/rpl_multi_update4-slave.opt
      BitKeeper/deleted/.del-disabled.def:
        Auto merged
      BitKeeper/deleted/.del-rpl_multi_update4.test:
        Delete: mysql-test/t/rpl_multi_update4.test
      heap/hp_create.c:
        Auto merged
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/r/update.result:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      mysql-test/t/heap.test:
        Auto merged
      mysql-test/t/kill.test:
        Auto merged
      mysql-test/t/update.test:
        Auto merged
      ndb/include/mgmapi/mgmapi_config_parameters.h:
        Auto merged
      ndb/test/ndbapi/testBlobs.cpp:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      configure.in:
        Manual merge.
      libmysql/libmysql.c:
        Manual merge.
      mysql-test/r/heap.result:
        Manual merge.
      mysql-test/r/heap_hash.result:
        Manual merge.
      mysql-test/r/kill.result:
        Manual merge.
      sql/ha_heap.cc:
        Manual merge.
      sql/ha_heap.h:
        Manual merge.
      sql/item_timefunc.cc:
        Manual merge.
      sql/sql_class.cc:
        Manual merge.
      sql/sql_parse.cc:
        Manual merge.
      sql/sql_update.cc:
        Manual merge.
      tests/mysql_client_test.c:
        Manual merge.
      95a3509a
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my50-mysqltest_float_result · 9b3e6c27
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      client/mysqltest.c:
        Auto merged
      9b3e6c27
    • unknown's avatar
      Convert exponent results for MYSQL_TYPE_FLOAT on Windows · fb6928cb
      unknown authored
      
      client/mysqltest.c:
        Do the magic for MYSQL_TYPE_FLOAT as well
      fb6928cb
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 1a9ed28b
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      1a9ed28b
  2. 01 Feb, 2006 7 commits
  3. 31 Jan, 2006 20 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
      Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15302/my41-bug15302 · c98077d6
      unknown authored
      into  devsrv-b.mysql.com:/space/magnus/my41-bug15302
      
      
      c98077d6
    • 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
    • unknown's avatar
      ndb - testBlobs 'perf test' fix · 97deac8b
      unknown authored
      
      ndb/test/ndbapi/testBlobs.cpp:
        setValue buffer was not fullsize
      97deac8b
  4. 30 Jan, 2006 4 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
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2cb45da8
      unknown authored
      into  mysql.com:/home/alexi/innodb/mysql-4.1-merged
      
      
      2cb45da8
    • 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