1. 01 Mar, 2005 3 commits
    • unknown's avatar
      ha_innodb.cc: · 0319b958
      unknown authored
        In TRUNCATE TABLE, MySQL may call innobase_xa_prepare() even though there is no active transaction because it was committed in ha_innobase::delete_all_rows(); in innobase_xa_prepare() InnoDB starts then a new transaction; let us adjust the trx->active_trans flag accordingly
      
      
      sql/ha_innodb.cc:
        In TRUNCATE TABLE, MySQL may call innobase_xa_prepare() even though there is no active transaction because it was committed in ha_innobase::delete_all_rows(); in innobase_xa_prepare() InnoDB starts then a new transaction; let us adjust the trx->active_trans flag accordingly
      0319b958
    • unknown's avatar
      my_mmap.c: · 6b5ad3c1
      unknown authored
        Changed #warning pragma at the bottom to only occur when being used on non-Windows OS
      
      
      mysys/my_mmap.c:
        Changed #warning pragma at the bottom to only occur when being used on non-Windows OS
      6b5ad3c1
    • unknown's avatar
      Fix for Bug#8801: the bug was in co-operation of Item_ref · 679088a2
      unknown authored
      with view-merge algorithm and prepared statements: in case when some
      Item_ref pointing to a view column was substituted with a reference 
      pointing to the view expression for that column
      Item_ref::ref member of the original Item_ref was left pointing to 
      not_found_item (0x1).
      As we currently perform expression substition part of the view-merge 
      algorithm per each execution of a prepared statement or stored procedure, 
      we need to preserve original Item_ref objects usable.
      
      
      sql/item.cc:
        Set member Item_ref::ref to null whenever the item itself is substituted 
        with another item.
        This is necessary if we want to re-execute a prepared statement next time.
        
        Additionally Item_ref::fix_fields() implementation was cleaned up
        (by Monty and myself) to reduce the number of if branches. This
        doesn't change the logic of this function.
      679088a2
  2. 28 Feb, 2005 15 commits
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · ad1c1e07
      unknown authored
      into mysql.com:/home/cps/mysql/devel/im-fix-review
      
      
      mysys/default.c:
        Auto merged
      ad1c1e07
    • unknown's avatar
      fix compilation failure on sunfire280 · e99c035f
      unknown authored
      e99c035f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · ef7570c7
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      sql/sql_repl.cc:
        Auto merged
      ef7570c7
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · 8400a5a4
      unknown authored
      into mysql.com:/home/pem/work/mysql-5.0
      
      
      8400a5a4
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.0-virgin · ed3b4499
      unknown authored
      into mysql.com:/home/timka/mysql/src/5.0-bug-8532
      
      
      ed3b4499
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · cef636d9
      unknown authored
      into mysql.com:/home/pem/work/mysql-5.0
      
      
      cef636d9
    • unknown's avatar
      Fixed BUG#8760: Stored Procedures: Invalid SQLSTATE is allowed in · 110f6abd
      unknown authored
                      a DECLARE ? HANDLER FOR stmt.
      
      
      mysql-test/r/sp-error.result:
        New test case for BUG#8776 (check format of sqlstates in handler declarations).
      mysql-test/t/sp-error.test:
        New test case for BUG#8776 (check format of sqlstates in handler declarations).
      sql/share/errmsg.txt:
        New error message for malformed SQLSTATEs.
      sql/sp_pcontext.cc:
        Added function for checking SQLSTATE format.
      sql/sp_pcontext.h:
        Added function for checking SQLSTATE format.
      sql/sql_yacc.yy:
        Check format of SQLSTATE in handler declaration.
      110f6abd
    • unknown's avatar
      Fixed BUG#7646: Stored procedure hang if show binlog events · cfff7e6e
      unknown authored
        Return false from show_binlog_events() if successful, otherwise stored
        procedures will think it failed.
      
      
      sql/sql_repl.cc:
        Return false from show_binlog_events() if successful, otherwise stored
        procedures will think it failed.
      cfff7e6e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 1b002905
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      include/mysql_com.h:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      1b002905
    • unknown's avatar
      Fix for BUG#8532. · 7a703d6a
      unknown authored
      The problem was in that the code that analyses the applicability of the
      QUICK_GROUP_MIN_MAX access method for DISTINC queries assumed that there
      are no duplicate column references in the DISTINCT clause, and it added
      non-exiting key parts for the duplicate column references. 
      
      The solution adds a test to check whether the select list already contained
      a field with the same name. If such field was already present, then it was
      already decided to use its key part for index access. In this such case we
      must skip the duplicate field instead of counting it as a new field.
      
      
      mysql-test/r/group_min_max.result:
        Added test results for BUG#8532.
      mysql-test/t/group_min_max.test:
        Added tests for BUG#8532.
      sql/opt_range.cc:
        The problem was in that the code that analyses the applicability of the
        QUICK_GROUP_MIN_MAX access method for DISTINC queries assumed that there
        are no duplicate column references in the DISTINCT clause, and it added
        non-exiting key parts for the duplicate column references. 
        
        The solution adds a test to check whether the select list already contained
        a field with the same name. If such field was already present, then it was
        already decided to use its key part for index access. In this such case we
        must skip the duplicate field instead of counting it as a new field.
      7a703d6a
    • unknown's avatar
      portability fix · d4c2c747
      unknown authored
      d4c2c747
    • unknown's avatar
      merge with 4.1 · 45a26d44
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      client/mysql.cc:
        Auto merged
      client/mysqldump.c:
        Auto merged
      innobase/dict/dict0dict.c:
        Auto merged
      innobase/fil/fil0fil.c:
        Auto merged
      innobase/row/row0sel.c:
        Auto merged
      mysql-test/r/select_found.result:
        Auto merged
      mysql-test/r/type_set.result:
        Auto merged
      mysys/default.c:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      strings/ctype-simple.c:
        Auto merged
      include/mysql_com.h:
        Merge
      sql/filesort.cc:
        merge
      45a26d44
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 8e3addf9
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      BitKeeper/etc/ignore:
        added support-files/ndb-config-2-node.ini
      8e3addf9
    • unknown's avatar
      Fixed wrong memory references found by purify · 8b8c9452
      unknown authored
      (No really critical errors found, but a few possible wrong results)
      
      
      innobase/dict/dict0dict.c:
        Replace memcmp with comparison of characters to avoid warnings from purify when 'sptr' points to a very short string
      mysql-test/r/select_found.result:
        Add missing drop table
      mysql-test/r/type_set.result:
        More tests
      mysql-test/t/select_found.test:
        Add missing drop table
      mysql-test/t/type_set.test:
        More tests
      mysys/my_init.c:
        Avoid warning from purify (purify doesn't handle getrusage() properly)
      sql/field.h:
        enum & set are sorted as numbers. This fixes an access to uninitialized memory when enum/set are multi-byte characters
      sql/filesort.cc:
        enum & set are sorted as numbers. This fixes an access to uninitialized memory when enum/set are multi-byte characters
      sql/item_cmpfunc.cc:
        Fixed warning from purify. (Not critical as the arguments are passed to a function but not used)
        Allocate Arg_comparator() with 'new' instead of sql_alloc() to ensure proper initialization
      sql/mysqld.cc:
        Wait for signal handler to stop when running --bootstrap
        (Fixes warning from purify)
      sql/sql_insert.cc:
        Initialize slot used by innodb.cc (not critical)
      sql/sql_lex.h:
        Better comments
      sql/sql_repl.cc:
        memcmp -> bcmp() to avoid warning from purify
      sql/sql_select.cc:
        Fix for out-of-bound memory reference when doing DISTINCT on const expressions
      strings/ctype-simple.c:
        Fixes to not access uninitialized memory
        (Not critical)
      8b8c9452
    • unknown's avatar
      Fixed small error in comment · 03a5cacc
      unknown authored
      03a5cacc
  3. 27 Feb, 2005 5 commits
    • unknown's avatar
      Merge mysql.com:/space/pekka/ndb/version/my50 · 4ef7991d
      unknown authored
      into mysql.com:/space/pekka/ndb/version/my50-ndb
      
      
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      4ef7991d
    • unknown's avatar
      ndb - bugfix to ordered index create, could show up as charset error · 108702a3
      unknown authored
      
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        bugfix: bad signal to ACC for ordered index
      108702a3
    • unknown's avatar
      Merge mysql.com:/home/cps/mysql/trees/mysql-5.0 · b3028227
      unknown authored
      into mysql.com:/home/cps/mysql/devel/im-fix-review
      
      
      include/my_sys.h:
        Auto merged
      b3028227
    • unknown's avatar
      post-review fixes + cleanup + some minor fixes · dc9059e0
      unknown authored
      
      server-tools/instance-manager/buffer.cc:
        coding style fixes
      server-tools/instance-manager/buffer.h:
        wrong constructor initialisation fixed
      server-tools/instance-manager/commands.cc:
        cleanup
      server-tools/instance-manager/guardian.cc:
        cleanup + added lock/unlock routines
      server-tools/instance-manager/guardian.h:
        GUARD_NODE moved to the header
      server-tools/instance-manager/instance.cc:
        Fix for the linuxthreads/POSIX signal handling problem (see comments in the code)
      server-tools/instance-manager/instance.h:
        condition variable renamed and commented
      server-tools/instance-manager/instance_map.cc:
        We need to refresh guardian during flush_instances
      server-tools/instance-manager/instance_map.h:
        removed obsolete function declaration
      server-tools/instance-manager/instance_options.cc:
        added caching of computed values
      server-tools/instance-manager/instance_options.h:
        added vars to cache some option values
      server-tools/instance-manager/listener.cc:
        check whether we are running on the linux threads
      server-tools/instance-manager/manager.cc:
        lock guardian before init()
      server-tools/instance-manager/parse_output.cc:
        cleanup
      server-tools/instance-manager/priv.cc:
        added global variables to detect whether we are running on the LinuxThreads
      server-tools/instance-manager/priv.h:
        added global variables to detect whether we are running on the LinuxThreads
      dc9059e0
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · 87a48cdf
      unknown authored
      into mysql.com:/home/svoj/devel/mysql/stddev-mysql-5.0
      
      
      sql/item_sum.cc:
        Auto merged
      sql/item_sum.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      87a48cdf
  4. 26 Feb, 2005 6 commits
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 85b82a8a
      unknown authored
      into mysql.com:/space/pekka/ndb/version/my50-ndb
      
      
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Auto merged
      85b82a8a
    • unknown's avatar
      NdbDictionaryImpl.cpp: · 1f9a2667
      unknown authored
        fix error code
      
      
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        fix error code
      1f9a2667
    • unknown's avatar
      ndb - wl-1203 alignment fix · 477205f7
      unknown authored
      
      ndb/include/ndb_constants.h:
        consistent names
      ndb/include/ndbapi/NdbDictionary.hpp:
        consistent names
      ndb/include/util/NdbSqlUtil.hpp:
        consistent names
      ndb/src/common/util/NdbSqlUtil.cpp:
        minor completion
      ndb/src/ndbapi/NdbOperationInt.cpp:
        alignment fix
      477205f7
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7cc7a628
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
      
      
      sql/filesort.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      7cc7a628
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 8167f5e5
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      8167f5e5
    • unknown's avatar
      Fixes while during review of last pull · 25e03cdf
      unknown authored
      Temporary patch to remove some warnings
      
      
      sql/item.cc:
        Trivial optimization
      sql/protocol.cc:
        Fixed spelling error
      sql/sql_parse.cc:
        Fix to not get warnings during inital temp open (should be deleted after Dimitri's next push)
        Style fixes
      sql/table.cc:
        Ensure that cleanup is done, even if we get an error
      25e03cdf
  5. 25 Feb, 2005 11 commits
    • unknown's avatar
      trx0trx.c, trx0trx.h: · 2ab324db
      unknown authored
        Fix wrong spelling
      
      
      innobase/include/trx0trx.h:
        Fix wrong spelling
      innobase/trx/trx0trx.c:
        Fix wrong spelling
      2ab324db
    • unknown's avatar
      trx0undo.h, trx0undo.c, trx0trx.c, trx0roll.c: · a6e56b05
      unknown authored
        Make InnoDB-5.0.3 to process log records of 4.1 undo log header create and reuse just like in 4.1; storing XID to the start of the undo log is a separately logged operation; this conforms to Rule 3 of InnoDB redo logging
      
      
      innobase/trx/trx0roll.c:
        Make InnoDB-5.0.3 to process log records of 4.1 undo log header create and reuse just like in 4.1; storing XID to the start of the undo log is a separately logged operation; this conforms to Rule 3 of InnoDB redo logging
      innobase/trx/trx0trx.c:
        Make InnoDB-5.0.3 to process log records of 4.1 undo log header create and reuse just like in 4.1; storing XID to the start of the undo log is a separately logged operation; this conforms to Rule 3 of InnoDB redo logging
      innobase/trx/trx0undo.c:
        Make InnoDB-5.0.3 to process log records of 4.1 undo log header create and reuse just like in 4.1; storing XID to the start of the undo log is a separately logged operation; this conforms to Rule 3 of InnoDB redo logging
      innobase/include/trx0undo.h:
        Make InnoDB-5.0.3 to process log records of 4.1 undo log header create and reuse just like in 4.1; storing XID to the start of the undo log is a separately logged operation; this conforms to Rule 3 of InnoDB redo logging
      a6e56b05
    • unknown's avatar
      fil0fil.c: · 46a8c522
      unknown authored
        Check if node == NULL, which means we are outside tablespace bounds, and print a big fatal error message
      
      
      innobase/fil/fil0fil.c:
        Check if node == NULL, which means we are outside tablespace bounds, and print a big fatal error message
      46a8c522
    • unknown's avatar
      Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 · cf4da680
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-4.1
      
      
      cf4da680
    • unknown's avatar
      BUG#3190 fix (request for STDDEV_SAMP, VAR_SAMP). · d339dd13
      unknown authored
      This bug is also known as WL#1639.
      
      
      mysql-test/r/func_group.result:
        Test case for stddev_pop, var_pop, stddev_samp, var_samp was added.
      mysql-test/t/func_group.test:
        Test case for stddev_pop, var_pop, stddev_samp, var_samp was added.
      sql/item_sum.cc:
        New functions stddev_samp and var_samp were added.
      sql/item_sum.h:
        New functions stddev_samp and var_samp were added.
      sql/lex.h:
        New functions stddev_pop, var_pop, stddev_samp and var_samp were added.
      sql/sql_yacc.yy:
        New functions stddev_pop, var_pop, stddev_samp and var_samp were added.
      d339dd13
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 0be32e7e
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      sql/sp_pcontext.cc:
        Auto merged
      0be32e7e
    • unknown's avatar
      Fixed BUG#8757: Stored Procedures: Scope of Begin and End Statements do not work properly. · 3d8aed6d
      unknown authored
      
      mysql-test/r/sp.result:
        New test case for BUG#8757.
      mysql-test/t/sp.test:
        New test case for BUG#8757.
      sql/sp_pcontext.cc:
        Return the correct scope offset to cursors during parsing.
      3d8aed6d
    • unknown's avatar
      Merge with global tree · 08b3e79e
      unknown authored
      
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/t/innodb.test:
        Auto merged
      mysql-test/t/rpl_rotate_logs.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      sql/examples/ha_archive.cc:
        Merge with global tree
        (Use my changes)
      sql/sql_parse.cc:
        Remove 'tmp' fix to be able to run tests
      08b3e79e
    • unknown's avatar
      Remove compiler warnings and remove not used variables · 248e4494
      unknown authored
      (Found during build process)
      
      
      extra/comp_err.c:
        Remove compiler warnings
      extra/perror.c:
        Remove compiler warnings
      innobase/dict/dict0dict.c:
        Remove compiler warnings
      innobase/dict/dict0load.c:
        Remove compiler warnings
      innobase/pars/pars0sym.c:
        Remove compiler warnings
      innobase/row/row0row.c:
        Remove compiler warnings
      innobase/row/row0sel.c:
        Remove compiler warnings
      libmysqld/lib_sql.cc:
        Remove not used variables
      myisam/mi_key.c:
        Remove compiler warnings
      regex/engine.c:
        Added comment
      sql/derror.cc:
        Remove not used variables
      sql/examples/ha_archive.cc:
        Fixed bug in blob handling
        Removed not used variable
      sql/field.cc:
        Remove compiler warnings
        Remove not used variables
      sql/filesort.cc:
        Remove compiler warnings
      sql/ha_heap.cc:
        Remove not used variable
      sql/ha_innodb.cc:
        Remove not used variables
        Remove compiler warnings
      sql/handler.cc:
        Remove compiler warnings and remove not used variables
      sql/item.cc:
        Remove compiler warnings and remove not used variables
      sql/item_subselect.cc:
        Remove compiler warnings
      sql/item_sum.cc:
        Remove compiler warnings
      sql/item_sum.h:
        Remove compiler warnings and remove not used variables
      sql/log.cc:
        Remove compiler warnings and remove not used variables
      sql/log_event.cc:
        Remove compiler warnings
      sql/mysqld.cc:
        Remove compiler warnings and remove not used variables
      sql/opt_range.cc:
        Remove compiler warnings and remove not used variables
      sql/slave.cc:
        Remove compiler warnings and remove not used variables
      sql/sp_pcontext.cc:
        Remove compiler warnings and remove not used variables
      sql/sql_acl.cc:
        Remove compiler warnings and remove not used variables
      sql/sql_analyse.cc:
        Remove compiler warnings and remove not used variables
      sql/sql_base.cc:
        Remove compiler warnings and remove not used variables
      sql/sql_db.cc:
        Remove compiler warnings and remove not used variables
      sql/sql_help.cc:
        Remove compiler warnings and remove not used variables
      sql/sql_insert.cc:
        Remove compiler warnings and remove not used variables
      sql/sql_load.cc:
        Remove compiler warnings and remove not used variables
      sql/sql_parse.cc:
        Remove compiler warnings and remove not used variables
      sql/sql_prepare.cc:
        Remove compiler warnings and remove not used variables
      sql/sql_select.cc:
        Remove compiler warnings and remove not used variables
      sql/sql_show.cc:
        Remove compiler warnings and remove not used variables
      sql/sql_table.cc:
        Remove compiler warnings
      sql/sql_union.cc:
        Remove compiler warnings
      sql/sql_update.cc:
        Remove compiler warnings and remove not used variables
      sql/sql_yacc.yy:
        Remove compiler warnings and remove not used variables
      sql/strfunc.cc:
        Remove compiler warnings and remove not used variables
      strings/ctype-ucs2.c:
        Remove compiler warnings
      tests/mysql_client_test.c:
        Remove compiler warnings and remove not used variables
      tools/mysqlmanager.c:
        Remove compiler warnings and remove not used variables
      248e4494
    • unknown's avatar
      Fixed BUG#7620: Stored procedure packet error if show mutex status · b67253a1
      unknown authored
        Another multi result statement added.
        Note: No test case, as it's not possible to get a deterministic result from this.
      
      
      sql/sp_head.cc:
        Another multi result statement added: show mutex status.
      b67253a1
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 54dadffc
      unknown authored
      into mysql.com:/usr/home/bar/mysql-4.1-again
      
      
      54dadffc