An error occurred fetching the project authors.
  1. 22 Oct, 2004 35 commits
    • unknown's avatar
      Post merge fix (test results) · 0798c99d
      unknown authored
      0798c99d
    • unknown's avatar
      Manual merge · 61c1dd02
      unknown authored
      mysql-test/r/ps.result:
        Manual merge.
      61c1dd02
    • unknown's avatar
      A fix and test case for Bug#6088 "FOUND_ROWS returns wrong values for · 9b5cf946
      unknown authored
      prepared statements when LIMIT is used" and post-review comments.
      The fix changes the approach we calculate the need for ORDER BY 
      in UNION: the previous was not PS friendly, as it damaged SELECT_LEX 
      options in case of single select.
      
      
      mysql-test/r/ps.result:
        Test results fixed: the test case for Bug#6088
      mysql-test/r/subselect.result:
        Test results fixed: now we don't perform ORDER BY for parts of UNION
        if there is no LIMIT clause.
      mysql-test/t/ps.test:
        A test case for Bug#6088 "FOUND_ROWS returns wrong values for
         prepared statements when LIMIT is used".
      sql/sql_union.cc:
        The actual fix for Bug#6088:
        - don't modify SELECT_LEX'es
        - use boolean variable can_skip_order_by to check if we can skip
          ORDER BY in UNION
      9b5cf946
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 2f8b0ab3
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      sql/item.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      2f8b0ab3
    • unknown's avatar
      After merge fixes · af84ae00
      unknown authored
      af84ae00
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 6a931667
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-tzfix
      
      
      6a931667
    • unknown's avatar
      Followup to fix for bug#6050: fix valgrind warnings. · 1cd249e0
      unknown authored
      sql/item.cc:
        Fix valgrind errors: we need Item::name to point to PS memory
        as well.
      sql/item.h:
        set_field no longer can be reused as is for PS purposes.
      sql/sql_union.cc:
        Item_field::set_field -> Item_field::reset_field.
      1cd249e0
    • unknown's avatar
      merge · f9412871
      unknown authored
      client/mysqltest.c:
        Auto merged
      ndb/include/mgmapi/mgmapi.h:
        merge (use new code)
      f9412871
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 4ff9b605
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-tzfix
      
      
      sql/sql_parse.cc:
        Auto merged
      4ff9b605
    • unknown's avatar
      Fixed a bug in vis.c · 4edadc79
      unknown authored
      cmd-line-utils/libedit/np/vis.c:
        Fixed a compiler issue for QNX.
      4edadc79
    • unknown's avatar
      Merge mysql.com:/home/bk/mysql-4.1 · 1cbad77b
      unknown authored
      into mysql.com:/build/mysqldev/my/mysql-4.1-tomastest
      
      
      ndb/tools/waiter.cpp:
        Auto merged
      1cbad77b
    • unknown's avatar
      Merge mysql.com:/home/bk/mysql-4.1 · bdf4e17f
      unknown authored
      into mysql.com:/users/kboortz/daily/work/mysql-4.1-sjis
      
      
      bdf4e17f
    • unknown's avatar
      removing compiler warnings · 236e588a
      unknown authored
      236e588a
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 · 1c67dea5
      unknown authored
      sql/sql_parse.cc:
        Auto merged
      1c67dea5
    • unknown's avatar
      Fix compiler warnings (detected by Intel's C++ compiler) · bc6652db
      unknown authored
      Fixed checking of privilege handling in CREATE ... SELECT (Bug #6094)
      
      
      client/mysql.cc:
        Fix compiler warnings
      client/mysqltest.c:
        Fix wrong counting of lines
        Remove compiler warnings
      heap/hp_hash.c:
        Fix compiler warnings
      innobase/dict/dict0load.c:
        Fix compiler warnings
      innobase/include/mem0mem.h:
        Fix compiler warnings
      libmysql/client_settings.h:
        Fix compiler warnings
      myisam/ft_nlq_search.c:
        Add comments about compiler warnings
      myisam/rt_index.c:
        Add comments about compiler warnings
      myisam/rt_mbr.c:
        Add comments about compiler warnings
      mysql-test/r/ps.result:
        Test case for bug#6094
      mysql-test/t/ps.test:
        Test case for bug#6094
      mysys/hash.c:
        Fix compiler warnings
      mysys/my_handler.c:
        Add comments about compiler warnings
      mysys/my_thr_init.c:
        Add comments about compiler warnings
      ndb/include/mgmapi/mgmapi.h:
        Fix compiler warnings
      regex/main.c:
        Fix compiler warnings
      sql/item.h:
        Fix compiler warnings
      sql/item_func.h:
        Add comments about compiler warnings
      sql/spatial.h:
        Add comments about compiler warnings
      sql/sql_lex.h:
        Fix compiler warning
      sql/sql_list.h:
        Fix compiler warning
      sql/sql_parse.cc:
        Move testing of access rights of tables in CREATE ... SELECT to create_table_precheck() to fix privilege checking in CREATE ... SELECT
        (Bug #6094)
      sql/sql_prepare.cc:
        Remove not needed empty line
      sql/sql_string.h:
        Fix compiler warnings
      strings/ctype-mb.c:
        Fix compiler warnings
      bc6652db
    • unknown's avatar
      Part of fix for bug #6081 "Call to deprecated mysql_create_db() function · dd126ba1
      unknown authored
      crashes server"
      
      (in 4.0 we fix only connection stalling in case of error, crash itself is
      fixed in 4.1, the test case for this code is also there).
      
      
      sql/sql_parse.cc:
        Handling of COM_CREATE_DB, COM_DROP_DB:
        We should call send_error() if mysql_create_db or mysql_drop_db
        return error (like we do it for SQL versions of these commands).
      dd126ba1
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · f74303af
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
      
      
      f74303af
    • unknown's avatar
      2f6dc470
    • unknown's avatar
      AIX compile fixes · 27fa5d48
      unknown authored
      ndb/include/kernel/signaldata/UpgradeStartup.hpp:
        Forward declaration
      ndb/include/ndb_global.h:
        Fix for AIX
      ndb/include/ndb_types.h:
        Always use ndb_global instead of my_global (or anything else)
      ndb/include/ndbapi/Ndb.hpp:
        Forward declaration
      ndb/include/ndbapi/NdbReceiver.hpp:
        Forward declaration
      ndb/include/ndbapi/NdbScanOperation.hpp:
        Forward declaration
      ndb/src/common/util/ConfigValues.cpp:
        Always use ndb_global instead of my_global (or anything else)
      ndb/src/kernel/blocks/backup/restore/Restore.hpp:
        Forward declaration
      ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Move read/update function into Dbtup
      ndb/src/mgmsrv/SignalQueue.cpp:
        Always use ndb_global instead of my_global (or anything else)
      ndb/tools/waiter.cpp:
        Always use ndb_global instead of my_global (or anything else)
      27fa5d48
    • unknown's avatar
      remove compiler warnings · 9ccbdc6b
      unknown authored
      9ccbdc6b
    • unknown's avatar
      Merge · bf29d8de
      unknown authored
      client/mysqltest.c:
        Bug #46Bug#4640 mysql-test-run terminates when the test case includes sjis characters with '5C'
      bf29d8de
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 · cfcca61a
      unknown authored
      innobase/os/os0file.c:
        Auto merged
      innobase/row/row0ins.c:
        Auto merged
      innobase/row/row0mysql.c:
        Auto merged
      cfcca61a
    • unknown's avatar
      A test case for Bug#6046: no fix is needed (the bug is already · 8c391e7c
      unknown authored
      fixed in the main tree).
      
      
      8c391e7c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · ca8be36f
      unknown authored
      into mysql.com:/media/sda1/mysql/mysql-4.1-6050
      
      
      sql/sql_class.h:
        Auto merged
      ca8be36f
    • unknown's avatar
      fix c++ style comments in .h and .c files · 76b09dd5
      unknown authored
      compilation problems on some platforms'
      
      
      76b09dd5
    • unknown's avatar
      A fix and test case for Bug#6050 "EXECUTE stmt reports ambiguous field · 4512a46e
      unknown authored
      names with ident. tables fr. diff. schemata": revise all uses of
      Item_field and make them prepared-statements friendly when necessary.
      
      
      mysql-test/r/ps.result:
        Test results fixed: the test case for Bug#6050
      mysql-test/r/ps_1general.result:
        Test results fixed: in prepared statements we expand '*' to a list
        of fully qualified fields (db.table.column).
      mysql-test/t/ps.test:
        A test for Bug#6050 "EXECUTE stmt reports ambiguous fieldnames with 
        ident. tables fr. diff. schemata"
      sql/item.cc:
        Revise all Item_field constructors: we need to make sure that no Item_field
        object points to unaccessible memory in prepared statements.
      sql/item.h:
        Revise all Item_field constructors: we need to make sure that no Item_field
        object points to unaccessible memory in prepared statements.
      sql/sql_base.cc:
        Item_field use changed to be prepared statements friendly.
      sql/sql_class.h:
        New check of Item_arena state.
      sql/sql_union.cc:
        Fixing the problem with name resolving in UNION and prepared statements:
        In case of SELECT a, b, c FROM t1 UNION SELECT a, b, c FROM t2 the list of
        selected items is represented as a List<Item_field>, where each 
        Item_field points to a field of temporary table.
        But the temporary table is created anew on each execution of the prepared 
        statement. So on each subsequent execution we should reset Item_field
        items to point to fields from freshly-created temporary table.
      sql/table.h:
        Comment TABLE member.
      4512a46e
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 25f1344f
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      25f1344f
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 33466aa3
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
      
      
      33466aa3
    • unknown's avatar
      use the right make in make_binary_distribution · d2cdceb2
      unknown authored
      d2cdceb2
    • unknown's avatar
      os0file.c: · f18efec5
      unknown authored
        Add typecast from ulint to ssize_t in pread and pwrite, so that the type is according to the Linux man page; this will probably not help to fix the HP-UX 32-bit pwrite failure, since the compiler should do the appropriate typecasts anyway
      
      
      innobase/os/os0file.c:
        Add typecast from ulint to ssize_t in pread and pwrite, so that the type is according to the Linux man page; this will probably not help to fix the HP-UX 32-bit pwrite failure, since the compiler should do the appropriate typecasts anyway
      f18efec5
    • unknown's avatar
      Merge mysql.com:/home/bk/mysql-4.1 · 83a00d2e
      unknown authored
      into mysql.com:/users/kboortz/daily/work/mysql-4.1-purify2
      
      
      83a00d2e
    • unknown's avatar
      sql_parse.cc: · d71efcfd
      unknown authored
        Bug#6167 One element missing in 'uc_update_queries[]'
      
      
      sql/sql_parse.cc:
        Bug#6167 One element missing in 'uc_update_queries[]'
      d71efcfd
    • unknown's avatar
      Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 · ac8c655b
      unknown authored
      into hundin.mysql.fi:/home/jan/talle/mysql-4.1
      
      
      ac8c655b
    • unknown's avatar
      Show table status now shows creation time of the table for InnoDB. Note that · bcf7b583
      unknown authored
      this timestamp might not be the correct time because e.g. ALTER TABLE
      changes this timestamp.
      
      
      sql/ha_innodb.cc:
        Do not show check_time and update_time because we do not really know them.
        UPDATE, INSERT and CHECK TABLE do not change these timestamps.
      bcf7b583
    • unknown's avatar
      mysqltest.c, mysqltest.result, mysqltest.test: · d2bfd676
      unknown authored
        Added SQLSTATE matching support to test engine
      mysqltest.result, mysqltest.test:
        new file
      
      
      mysql-test/t/mysqltest.test:
        Added SQLSTATE matching support to test engine
      mysql-test/r/mysqltest.result:
        Added SQLSTATE matching support to test engine
      client/mysqltest.c:
        Added SQLSTATE matching support to test engine
      d2bfd676
  2. 21 Oct, 2004 5 commits
    • unknown's avatar
      row0mysql.c, row0ins.c: · 4f84f90f
      unknown authored
        Fix bug #5961: release the dictionary latch during a long cascaded FOREIGN KEY operation, so that we do not starve other users
      
      
      innobase/row/row0ins.c:
        Fix bug #5961: release the dictionary latch during a long cascaded FOREIGN KEY operation, so that we do not starve other users
      innobase/row/row0mysql.c:
        Fix bug #5961: release the dictionary latch during a long cascaded FOREIGN KEY operation, so that we do not starve other users
      4f84f90f
    • unknown's avatar
      Compile fix · ce91fb2f
      unknown authored
      ce91fb2f
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 86acc891
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
      
      
      86acc891
    • unknown's avatar
      more snprintf... · f3513a79
      unknown authored
      f3513a79
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7310d0d2
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      7310d0d2