1. 13 Dec, 2005 12 commits
    • unknown's avatar
      Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 · bc72c684
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
      
      
      netware/libmysql.def:
        Auto merged
      netware/myisamlog.def:
        Auto merged
      netware/myisampack.def:
        Auto merged
      netware/mysql.def:
        Auto merged
      netware/mysql_install_db.def:
        Auto merged
      netware/mysqlbinlog.def:
        Auto merged
      netware/mysqlcheck.def:
        Auto merged
      netware/mysqld_safe.def:
        Auto merged
      netware/mysqldump.def:
        Auto merged
      netware/mysqlimport.def:
        Auto merged
      netware/perror.def:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/tztime.cc:
        Auto merged
      netware/BUILD/compile-linux-tools:
        Merged from 4.1
      netware/my_print_defaults.def:
        Merged from 4.1
      netware/mysqladmin.def:
        Merged from 4.1
      bc72c684
    • unknown's avatar
      Bug#15675 - ndb - fix read_multi_range.test drop all tables it using · a0a942fb
      unknown authored
        NOTE: only changes to test script
      
      
      mysql-test/t/ndb_read_multi_range.test:
        Bug#15675 - ndb - fix read_multi_range.test drop all tables it using
      a0a942fb
    • unknown's avatar
      Minor Netware specific changes. · 12046696
      unknown authored
      
      netware/BUILD/compile-linux-tools:
        Fixed compilation problem with Linux tools.
      scripts/make_binary_distribution.sh:
        Netware specific changes. Discard platform
        specific files and added a couple of missing files.
      sql/tztime.cc:
        Code not ported to Netware yet.
      12046696
    • unknown's avatar
      Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 · 4fc6562f
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
      
      
      netware/libmysql.def:
        Auto merged
      netware/my_print_defaults.def:
        Auto merged
      netware/myisamlog.def:
        Auto merged
      netware/myisampack.def:
        Auto merged
      netware/mysql.def:
        Auto merged
      netware/mysql_install_db.def:
        Auto merged
      netware/mysqladmin.def:
        Auto merged
      netware/mysqlbinlog.def:
        Auto merged
      netware/mysqlcheck.def:
        Auto merged
      netware/mysqld_safe.def:
        Auto merged
      netware/mysqldump.def:
        Auto merged
      netware/mysqlimport.def:
        Auto merged
      netware/perror.def:
        Auto merged
      4fc6562f
    • unknown's avatar
      Increased stack size for clients on Netware. · 2e8dc5ff
      unknown authored
      New libc suggests doing this.
      
      
      2e8dc5ff
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3bef0071
      unknown authored
      into  mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss11
      
      
      3bef0071
    • unknown's avatar
      ndb - merge error · 2bec1f7e
      unknown authored
      note bug#15629 has been fixed in release clone (sp on 64 bit platform), but not merged here yet
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        merge error
      2bec1f7e
    • unknown's avatar
      Null-merge from 4.1 · d6373a22
      unknown authored
      d6373a22
    • unknown's avatar
      Merge mysql.com:/home/alexi/mysql-4.1 · 8e239a27
      unknown authored
      into  mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss11
      Null merge
      
      
      BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
        Auto merged
      innobase/include/dict0load.h:
        Auto merged
      innobase/dict/dict0dict.c:
        Null-merge from 4.1
      innobase/include/dict0dict.h:
        Null-merge from 4.1
      innobase/include/os0file.h:
        Null-merge from 4.1
      innobase/include/rem0cmp.h:
        Null-merge from 4.1
      innobase/include/srv0srv.h:
        Null-merge from 4.1
      innobase/rem/rem0cmp.c:
        Null-merge from 4.1
      innobase/row/row0ins.c:
        Null-merge from 4.1
      innobase/row/row0mysql.c:
        Null-merge from 4.1
      innobase/srv/srv0srv.c:
        Null-merge from 4.1
      innobase/srv/srv0start.c:
        Null-merge from 4.1
      mysql-test/r/innodb.result:
        Null-merge from 4.1
      mysql-test/t/innodb.test:
        Null-merge from 4.1
      sql/ha_innodb.cc:
        Null-merge from 4.1
      8e239a27
    • unknown's avatar
      Update ndb version in configure.in · 88b65dd2
      unknown authored
      88b65dd2
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 · 1df94c92
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      1df94c92
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 01c7bd20
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Auto merged
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      ndb/test/ndbapi/testNodeRestart.cpp:
        Auto merged
      ndb/src/kernel/blocks/ERROR_codes.txt:
        merge
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        merge
      ndb/test/run-test/daily-basic-tests.txt:
        merge
      01c7bd20
  2. 12 Dec, 2005 14 commits
    • unknown's avatar
      Merge rparranovo@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4904fd3c
      unknown authored
      into  mysql.com:/home/novo/MySQL/mysql-5.0
      
      
      4904fd3c
    • unknown's avatar
      mysql.spec.sh: · ed3b63e1
      unknown authored
        * made the following changes for the generic 5.0 RPM spec file
        - Added zlib to the list of (static) libraries installed
        - Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
        - Compile MySQL with bundled zlib
        - Fixed %packager name to "MySQL Production Engineering Team"
      
      
      support-files/mysql.spec.sh:
        * made the following changes for the generic 5.0 RPM spec file
        - Added zlib to the list of (static) libraries installed
        - Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
        - Compile MySQL with bundled zlib
        - Fixed %packager name to "MySQL Production Engineering Team"
      ed3b63e1
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8c911a25
      unknown authored
      into  mysql.com:/home/alexi/innodb-ss/mysql-4.1-ss11
      
      
      8c911a25
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 50bcb962
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      50bcb962
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-clean · d6e5fdf0
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      mysql-test/r/bdb.result:
        Resolve conflicts
      mysql-test/t/bdb.test:
        Resolve conflicts
      sql/sql_delete.cc:
        Resolve conflicts
      sql/sql_insert.cc:
        Resolve conflicts
      sql/sql_update.cc:
        Resolve conflicts
      d6e5fdf0
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8bf4a099
      unknown authored
      into mysql.com:/M41/mysql-4.1
      
      
      8bf4a099
    • unknown's avatar
      Fix BUG#12071: "Windows hang: 'Opening tables' or 'Waiting for · 8e3f95b5
      unknown authored
       table' lockup".
       Changes from the innodb-4.1-ss11 snapshot.
       Do not call os_file-create_tmpfile() at runtime. Instead, create
       a tempfile at startup and guard access to it with a mutex.
       Also, fix bugs:
       10511: "Wrong padding of UCS2 CHAR columns in ON UPDATE CASCADE";
       13778: "If FOREIGN_KEY_CHECKS=0, one can create inconsistent FOREIGN
       KEYs". When FOREIGN_KEY_CHECKS=0 we still need to check that
       datatypes between foreign key references are compatible.
       Also, added test cases (also for bug 9802).
      
      
      innobase/dict/dict0dict.c:
        Changes from the innodb-4.1-ss11 snapshot
      innobase/dict/dict0load.c:
        Changes from the innodb-4.1-ss11 snapshot
      innobase/include/dict0dict.h:
        Changes from the innodb-4.1-ss11 snapshot
      innobase/include/dict0load.h:
        Changes from the innodb-4.1-ss11 snapshot
      innobase/include/os0file.h:
        Changes from the innodb-4.1-ss11 snapshot
      innobase/include/rem0cmp.h:
        Changes from the innodb-4.1-ss11 snapshot
      innobase/include/srv0srv.h:
        Changes from the innodb-4.1-ss11 snapshot
      innobase/rem/rem0cmp.c:
        Changes from the innodb-4.1-ss11 snapshot
      innobase/row/row0ins.c:
        Changes from the innodb-4.1-ss11 snapshot
      innobase/row/row0mysql.c:
        Changes from the innodb-4.1-ss11 snapshot
      innobase/srv/srv0srv.c:
        Changes from the innodb-4.1-ss11 snapshot
      innobase/srv/srv0start.c:
        Changes from the innodb-4.1-ss11 snapshot
      libmysqld/ha_blackhole.cc:
        Changes from the innodb-4.1-ss11 snapshot
      mysql-test/r/innodb.result:
        Changes from the innodb-4.1-ss11 snapshot
      mysql-test/t/innodb.test:
        Changes from the innodb-4.1-ss11 snapshot
      sql/ha_innodb.cc:
        Changes from the innodb-4.1-ss11 snapshot
      8e3f95b5
    • unknown's avatar
      edf3915a
    • unknown's avatar
      45f2e2ae
    • unknown's avatar
      rpl_until.test + rpl_until.result Fix (completion) for bug#12429 · cc3f2163
      unknown authored
      Manual merge from 4.1,
      extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places.
      
      
      mysql-test/t/rpl_until.test:
        Auto merged
      mysql-test/r/rpl_until.result:
        Manual merge from 4.1,
        extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places.
      cc3f2163
    • unknown's avatar
      rpl_until.test + rpl_until.result · 56830072
      unknown authored
      Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
      The value is not important, and it depends on timing. Mask it.
      
      Backport and extension of a fix made by Matthias in 5.0, originally it was
      1.1976 05/12/05 17:57:48 mleich@mysql.com
      
      
      mysql-test/r/rpl_until.result:
        Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
        The value is not important, and it depends on timing. Mask it.
        
        Backport and extension of a fix made by Matthias in 5.0, originally it was
        1.1976 05/12/05 17:57:48 mleich@mysql.com
      mysql-test/t/rpl_until.test:
        Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
        The value is not important, and it depends on timing. Mask it.
        
        Backport and extension of a fix made by Matthias in 5.0, originally it was
        1.1976 05/12/05 17:57:48 mleich@mysql.com
      56830072
    • unknown's avatar
      ndb - bug#15685 · fd80fa2d
      unknown authored
        Error in abort handling in TC when timeout during abort
        
      
      
      ndb/src/kernel/blocks/ERROR_codes.txt:
        New error codes
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        New error codes
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Dont release transaction record to early
      ndb/test/ndbapi/testNodeRestart.cpp:
        Test case
      ndb/test/run-test/daily-basic-tests.txt:
        Test case
      fd80fa2d
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 95cabee1
      unknown authored
      into  mysql.com:/home/alexi/dev/mysql-5.0-14614
      
      
      95cabee1
    • unknown's avatar
      item_sum.h, item.cc: · 04d5378c
      unknown authored
        Post review corrections in comments.
      
      
      sql/item.cc:
        Post review corrections in comments.
      sql/item_sum.h:
        Post review corrections in comments.
      04d5378c
  3. 11 Dec, 2005 2 commits
    • unknown's avatar
      Fixed BUG #14614: Replication of tables with trigger generates · a26e2c20
      unknown authored
       error message if database is changed.
      
      
      mysql-test/r/rpl_trigger.result:
        Fixed results for the added test cases
      mysql-test/t/rpl_trigger.test:
        Added test cases for bug #14614
      sql/sql_db.cc:
        Fixed bug #14614.
         Modified mysql_change_db(): The memory where db name resides
         is freed by a slave thread.
      a26e2c20
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · 53f8fed4
      unknown authored
      into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
      
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      53f8fed4
  4. 09 Dec, 2005 2 commits
    • unknown's avatar
      bug#15632 - ndb · 5b10b7bc
      unknown authored
        Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a) by also waiting for starting nodes
      
      
      ndb/include/ndb_version.h.in:
        Handle upgrade of bug fix
      ndb/src/kernel/blocks/ERROR_codes.txt:
        New error code for delaying INCL_NODE_REQ
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a)
          by also waiting for starting nodes
      ndb/test/ndbapi/testNodeRestart.cpp:
        Add testcase for bug#15632
      5b10b7bc
    • unknown's avatar
      Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 · f81ed05c
      unknown authored
      into  devsrv-b.mysql.com:/space/magnus/my50-bug9535
      
      
      f81ed05c
  5. 08 Dec, 2005 4 commits
    • unknown's avatar
      A fix and a test case for Bug#15441 "Running SP causes Server · 9c4985de
      unknown authored
      to Crash": the bug was that due to non-standard name
      resolution precedence in stored procedures (See Bug#5967)
      a stored procedure variable took precedence over a table column
      when the arguments for VALUES() function were resolved.
      The implementation of VALUES() function was not designed to work
      with Item_splocal and crashed.
      VALUES() function is non-standard. It can refer to, and
      is meaningful for, table columns only. The patch disables SP 
      variables as possible arguments of VALUES() function.
      
      
      mysql-test/r/sp.result:
        Test results fixed (Bug#15441).
        Also make sure that the recently added test cases follow sp.test
        internal tests standard.
      mysql-test/t/sp.test:
        Add a test case for Bug#15441 "Running SP causes Server to Crash".
      sql/item.cc:
        Cleanup Item_insert_value::fix_fields().
      sql/item.h:
        Add a comment for Item_insert_value.
      sql/sql_yacc.yy:
        Actual fix for Bug#15441 "Running SP causes Server to Crash":
        we should not allow VALUES() function to reference SP variables.
      9c4985de
    • unknown's avatar
      Fix calls to free_underlaid_joins() in INSERT, DELETE, and UPDATE · ab597139
      unknown authored
      handling so that indexes are closed before trying to commit the
      transaction. (Bug #15536)
      
      
      mysql-test/r/bdb.result:
        Add new results
      mysql-test/t/bdb.test:
        Add new test
      sql/sql_delete.cc:
        Move call to free_underlaid_joins() to before ha_autocommit_or_rollback().
      sql/sql_insert.cc:
        Move call to free_underlaid_joins() to before ha_autocommit_or_rollback().
      sql/sql_update.cc:
        Move call to free_underlaid_joins() to before ha_autocommit_or_rollback().
      ab597139
    • unknown's avatar
      bug#15587 - ndb · fc4c198e
      unknown authored
        Fix typo in autotest script
      
      
      ndb/test/run-test/daily-basic-tests.txt:
        Fix typo in autotest script
      fc4c198e
    • unknown's avatar
      bug#15587 - ndb · e5269eed
      unknown authored
        Fix error in NF during NR
      
      
      ndb/include/kernel/signaldata/DumpStateOrd.hpp:
        Add dump for ERROR 5002 with specified table
      ndb/src/kernel/blocks/ERROR_codes.txt:
        Add dump for ERROR 5002 with specified table
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Run updateNodeInfo if failed node is not in list of storedReplicas
      ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Add dump for ERROR 5002 with specified table
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Add dump for ERROR 5002 with specified table
      ndb/test/ndbapi/testNodeRestart.cpp:
        Add testcase for bug#15587
      ndb/test/run-test/daily-basic-tests.txt:
        Add testcase for bug#15587
      e5269eed
  6. 07 Dec, 2005 6 commits