1. 21 Mar, 2007 1 commit
    • unknown's avatar
      fix shell script · 983e1f5a
      unknown authored
      
      BUILD/check-cpu:
        make comparison a little more compatible with less exotic shells
      983e1f5a
  2. 19 Mar, 2007 1 commit
  3. 01 Mar, 2007 1 commit
  4. 28 Feb, 2007 10 commits
  5. 27 Feb, 2007 1 commit
  6. 26 Feb, 2007 3 commits
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · de5d4e32
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      de5d4e32
    • unknown's avatar
      Compiler warning suppression fix: Add missing file to 'make dist'. · 8c336fbc
      unknown authored
      
      support-files/Makefile.am:
        Add missing file to 'make dist'.
      8c336fbc
    • unknown's avatar
      item.cc, item.h: · 90d4f809
      unknown authored
        Post fix for bug#23800.
      
      
      sql/item.h:
        Post fix for bug#23800.
      sql/item.cc:
        Post fix for bug#23800.
      90d4f809
  7. 25 Feb, 2007 1 commit
    • unknown's avatar
      item.h: · 84e68927
      unknown authored
        Post fix for bug#23800.
        Copy the table name of an Item_outer_ref to the conventional memory.
      
      
      sql/item.h:
        Post fix for bug#23800.
        Copy the table name of an Item_outer_ref to the conventional memory.
      84e68927
  8. 24 Feb, 2007 2 commits
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 9d142a6d
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/23800-bug1-5.0-opt-mysql
      
      
      9d142a6d
    • unknown's avatar
      item.cc: · b1e1f77f
      unknown authored
        Post fix for bug#23800.
        The Item_field constructor now increases the select_n_where_fields counter.
      sql_yacc.yy:
        Post fix for bug#23800.
        Take into account fields that might be added by subselects.
      sql_lex.h:
        Post fix for bug#23800.
        Added the select_n_where_fields variable to the st_select_lex class.
      sql_lex.cc:
        Post fix for bug#23800.
        Initialization of the select_n_where_fields variable.
      
      
      sql/sql_lex.cc:
        Post fix for bug#23800.
        Initialization of the select_n_where_fields variable.
      sql/sql_lex.h:
        Post fix for bug#23800.
        Added the select_n_where_fields variable to the st_select_lex class.
      sql/item.cc:
        Post fix for bug#23800.
        The Item_field constructor now increases the select_n_where_fields counter.
      sql/sql_yacc.yy:
        Post fix for bug#23800.
        Take into account fields that might be added by subselects.
      b1e1f77f
  9. 22 Feb, 2007 9 commits
    • unknown's avatar
      Merge monty@192.168.0.9:/home/my/mysql-5.0 · 1967fbe4
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      ndb/include/util/OutputStream.hpp:
        Auto merged
      ndb/src/common/debugger/EventLogger.cpp:
        Auto merged
      ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        Auto merged
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Auto merged
      ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
        Auto merged
      ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
        Auto merged
      ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Auto merged
      ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      ndb/src/mgmsrv/InitConfigFileParser.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        Auto merged
      ndb/src/mgmsrv/Services.cpp:
        Auto merged
      ndb/src/ndbapi/ClusterMgr.hpp:
        Auto merged
      ndb/src/ndbapi/SignalSender.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      1967fbe4
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 9a8f8497
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      mysys/my_thr_init.c:
        Auto merged
      ndb/include/util/OutputStream.hpp:
        Auto merged
      ndb/src/common/debugger/EventLogger.cpp:
        Auto merged
      ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        Auto merged
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Auto merged
      ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
        Auto merged
      ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
        Auto merged
      ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Auto merged
      ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      ndb/src/mgmsrv/InitConfigFileParser.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        Auto merged
      ndb/src/mgmsrv/Services.cpp:
        Auto merged
      ndb/src/ndbapi/ClusterMgr.hpp:
        Auto merged
      ndb/src/ndbapi/SignalSender.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      9a8f8497
    • unknown's avatar
      Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel · 36f03e48
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      36f03e48
    • unknown's avatar
      Portability fix · 77db9754
      unknown authored
      Suppress compiler warnings from bdb and (for the moment) warnings from ndb
      
      
      client/mysqltest.c:
        Portability fix for windows (windows doesn't have mode_t)
      support-files/compiler_warnings.supp:
        Suppress warnings from bdb and (for the moment) warnings from ndb
      77db9754
    • unknown's avatar
      Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel · 62b5893c
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      62b5893c
    • unknown's avatar
      Fixed compiler warnings (for linux and win32 and win64) · 50bd97a9
      unknown authored
      Fixed a couple of usage of not initialized warnings (unlikely cases)
      
      
      client/mysqldump.c:
        Fixed compiler warnings from 'max' build
      client/mysqltest.c:
        Removed compiler warnings
      cmd-line-utils/readline/xmalloc.c:
        Fixed compiler warnings from 'max' build
      extra/comp_err.c:
        Fixed compiler warnings from 'max' build
      extra/yassl/include/openssl/ssl.h:
        Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit
      extra/yassl/include/socket_wrapper.hpp:
        Moved socket_t to ssl.h, to be able to removed compiler warnings on windows 64 bit
      extra/yassl/src/ssl.cpp:
        Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit
      extra/yassl/taocrypt/src/integer.cpp:
        Fixed compiler warnings
      include/my_global.h:
        Added my_offsetof() macro from 5.1 to get rid of compiler warnings
      innobase/include/ut0byte.ic:
        Fixed compiler warnings on win64
      innobase/include/ut0ut.ic:
        Fixed compiler warnings on win64
      libmysql/libmysql.def:
        Fixed compiler warnings on win64
      myisam/mi_packrec.c:
        Fixed compiler warnings on win64
      myisam/myisamchk.c:
        Fixed compiler warnings from 'max' build
      mysys/base64.c:
        Fixed compiler warnings on win64
      mysys/mf_keycache.c:
        Fixed compiler warnings from 'max' build
      mysys/my_getopt.c:
        Fixed compiler warnings from 'max' build
      mysys/my_init.c:
        Fixed compiler warnings from 'max' build
      mysys/my_thr_init.c:
        Fixed compiler warnings
      mysys/ptr_cmp.c:
        Fixed compiler warnings from 'max' build
      ndb/include/kernel/signaldata/DictTabInfo.hpp:
        Fixed compiler warnings
      server-tools/instance-manager/mysql_connection.cc:
        Fixed compiler warnings
      server-tools/instance-manager/mysqlmanager.cc:
        Fixed compiler warnings
      sql/filesort.cc:
        Initalize variable that was used unitialized in error conditions
      sql/ha_berkeley.cc:
        Moved get_auto_primary_key() here as int5store() gives (wrong) compiler warnings in win64
      sql/ha_berkeley.h:
        Moved get_auto_primary_key() to ha_berkeley.cc
      sql/ha_innodb.cc:
        Fixed compiler warnings
      sql/item.cc:
        Fixed compiler warnings from 'max' build
      sql/item_timefunc.cc:
        Fixed compiler warnings
      sql/mysqld.cc:
        Fixed compiler warnings
      sql/sql_acl.cc:
        Fixed compiler warnings from 'max' build
      sql/sql_base.cc:
        Fixed compiler warnings from 'max' build
      sql/sql_insert.cc:
        Initialize variable that may be used unitialized on error conditions (not fatal)
      sql/sql_prepare.cc:
        Fixed compiler warnings from 'max' build
      sql/sql_select.cc:
        Fixed compiler warnings
      sql/sql_show.cc:
        Fixed compiler warnings
      sql/udf_example.def:
        Fixed compiler warnings on win64
      sql/unireg.cc:
        Initialize variable that may be used unitialized on error conditions
      strings/ctype-ucs2.c:
        Fixed compiler warnings
      strings/ctype-utf8.c:
        Fixed compiler warnings
      strings/decimal.c:
        Fixed compiler warnings
      support-files/compiler_warnings.supp:
        Ignore warnings from sql_yacc.cc that are hard to remove
        Ignore some not important warnings from windows 64 bit build
      tools/mysqlmanager.c:
        Fixed compiler warnings
      50bd97a9
    • unknown's avatar
      Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 1f93b0c8
      unknown authored
      into  dl145s.mysql.com:/users/mhansson/mysql/autopush/5.0o-bug24010
      
      
      1f93b0c8
    • unknown's avatar
      Bug #24010: INSERT INTO ... SELECT fails on unique constraint with data · ddb5a563
      unknown authored
      it doesn't select.
      
      This bug was fixed along with bug #16861: User defined variable can 
      have a wrong value if a tmp table was used.
      
      There the fix consisted of Item_func_set_user_var overloading the method
      Item::save_in_field. Consider the query from the test case:
      
      
      INSERT INTO foo( bar, baz )
      SELECT 
        bar,
        @newBaz := 1 + baz
      FROM 
        foo
      WHERE 
        quux <= 0.1;
      
      Here the assignment expression '@newBaz := 1 + baz' is represented by an 
      Item_func_set_user_var. Its member method save_in_field, which writes the 
      value of this assignment into the result field, writes the val_xxx() value, 
      which is not updated at this point. In the fix introduced by the patch,
      the save_in_field method reads the actual variable value instead.
      
      See also comment for 
      ChangeSet@1.2368.1.3, 2007-01-09 23:24:56+03:00, evgen@moonbone.local +4 -0
      and comment for
      Item_func_set_user_var::save_in_field (item_func.cc)
      
      
      mysql-test/r/update.result:
        BUG#24010
        The correct, and expected, result
      mysql-test/t/update.test:
        BUG#24010
        The test case for this bug. When the bug is active, the INSERT ... SELECT 
        statement will try to insert the values <1, 2> which gives an error
      ddb5a563
    • unknown's avatar
      Merge trift2.:/MySQL/M40/clone-4.0 · 8bcc21c8
      unknown authored
      into  trift2.:/MySQL/M40/mysql-4.0
      
      
      8bcc21c8
  10. 21 Feb, 2007 9 commits
    • unknown's avatar
      Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt · a1234294
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/23800-bug1-5.0-opt-mysql
      
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      a1234294
    • unknown's avatar
      Bug#23800: Outer fields in correlated subqueries is used in a temporary table · f8855142
      unknown authored
      created for sorting.
      
      Any outer reference in a subquery was represented by an Item_field object.
      If the outer select employs a temporary table all such fields should be
      replaced with fields from that temporary table in order to point to the 
      actual data. This replacement wasn't done and that resulted in a wrong
      subquery evaluation and a wrong result of the whole query.
      
      Now any outer field is represented by two objects - Item_field placed in the
      outer select and Item_outer_ref in the subquery. Item_field object is
      processed as a normal field and the reference to it is saved in the
      ref_pointer_array. Thus the Item_outer_ref is always references the correct
      field. The original field is substituted for a reference in the
      Item_field::fix_outer_field() function.
      
      New function called fix_inner_refs() is added to fix fields referenced from
      inner selects and to fix references (Item_ref objects) to these fields.
      
      The new Item_outer_ref class is a descendant of the Item_direct_ref class.
      It additionally stores a reference to the original field and designed to
      behave more like a field.
      
      
      sql/item.cc:
        Bug#23800: Correlated sub query returning incorrect results when operated upon.
        Now all outer fields are substituted with references to them (Item_outer_ref objects)
        in the Item_field::fix_outer_field() function.
        The original field is saved in the Item_outer_ref object.
      sql/item.h:
        Bug#23800: Correlated sub query returning incorrect results when operated upon.
        Added the Item_outer_ref class.
      sql/mysql_priv.h:
        Bug#23800: Correlated sub query returning incorrect results when operated upon.
        Added the fix_inner_refs() function prototype.
      sql/sql_delete.cc:
        Bug#23800: Correlated sub query returning incorrect results when operated upon.
        Added call to the fix_inner_refs() function.
      sql/sql_select.cc:
        Bug#23800: Correlated sub query returning incorrect results when operated upon.
        The new function called fix_inner_refs() is added.
      mysql-test/r/subselect.result:
        Added a test case for bug#23800: Correlated sub query returning incorrect results when
        operated upon.
      sql/sql_update.cc:
        Bug#23800: Correlated sub query returning incorrect results when operated upon.
        Added call to the fix_inner_refs() function.
      mysql-test/r/subselect3.result:
        Corrected test cases result after fix for bug#23800: Correlated sub query returning
        incorrect results when operated upon.
      mysql-test/t/subselect.test:
        Added a test case for bug#23800: Correlated sub query returning incorrect results when
        operated upon.
      sql/sql_lex.cc:
        Bug#23800: Correlated sub query returning incorrect results when operated upon.
        Added cleanup of the inner_refs_list.
      sql/sql_lex.h:
        Bug#23800: Correlated sub query returning incorrect results when operated upon.
        The inner_refs_list is added to the SELECT_LEX class.
      f8855142
    • unknown's avatar
      Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8ee22036
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      ndb/include/util/OutputStream.hpp:
        Auto merged
      ndb/src/common/debugger/EventLogger.cpp:
        Auto merged
      ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        Auto merged
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Auto merged
      ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
        Auto merged
      ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
        Auto merged
      ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Auto merged
      ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      ndb/src/mgmsrv/InitConfigFileParser.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        Auto merged
      ndb/src/mgmsrv/Services.cpp:
        Auto merged
      ndb/src/ndbapi/ClusterMgr.hpp:
        Auto merged
      ndb/src/ndbapi/SignalSender.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      8ee22036
    • unknown's avatar
      After merge fixes · e5706080
      unknown authored
      This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
      
      
      extra/yassl/src/ssl.cpp:
        Removed compiler warning
      extra/yassl/taocrypt/src/asn.cpp:
        After merge fixes
      extra/yassl/testsuite/testsuite.cpp:
        Removed compiler warning
      mysql-test/r/ndb_lock.result:
        After merge fixes
      ndb/src/common/debugger/EventLogger.cpp:
        Removed compiler warning
      ndb/src/common/util/ConfigValues.cpp:
        Removed compiler warning
      ndb/src/common/util/NdbSqlUtil.cpp:
        Removed compiler warning
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Removed compiler warning
      ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
        Removed compiler warning
      ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
        Removed compiler warning
      ndb/src/kernel/vm/ndbd_malloc.cpp:
        Removed compiler warning
      ndb/src/mgmclient/main.cpp:
        Removed compiler warning
      ndb/src/ndbapi/SignalSender.cpp:
        Removed compiler warning
      sql/ha_ndbcluster.cc:
        Some extra safety
      sql/item_cmpfunc.cc:
        After merge fixes
      sql/item_subselect.cc:
        After merge fixes
      sql/sql_insert.cc:
        After merge fixes
        (This actually fixes a bug in old code when many connections are in use)
      support-files/compiler_warnings.supp:
        Removed some suppressed warnings
      e5706080
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · e128a436
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      e128a436
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1953d57d
      unknown authored
      into  poseidon.mysql.com:/home/tomas/mysql-5.0
      
      
      1953d57d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 1384e640
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      BitKeeper/etc/ignore:
        auto-union
      BUILD/SETUP.sh:
        Auto merged
      Makefile.am:
        Auto merged
      client/mysql.cc:
        Auto merged
      cmd-line-utils/readline/display.c:
        Auto merged
      configure.in:
        Auto merged
      extra/yassl/include/buffer.hpp:
        Auto merged
      extra/yassl/include/crypto_wrapper.hpp:
        Auto merged
      extra/yassl/include/yassl_imp.hpp:
        Auto merged
      extra/yassl/include/yassl_int.hpp:
        Auto merged
      extra/yassl/src/crypto_wrapper.cpp:
        Auto merged
      extra/yassl/taocrypt/include/algebra.hpp:
        Auto merged
      extra/yassl/taocrypt/include/des.hpp:
        Auto merged
      extra/yassl/taocrypt/include/hash.hpp:
        Auto merged
      extra/yassl/taocrypt/include/hmac.hpp:
        Auto merged
      extra/yassl/taocrypt/include/modarith.hpp:
        Auto merged
      extra/yassl/taocrypt/include/modes.hpp:
        Auto merged
      extra/yassl/taocrypt/include/rsa.hpp:
        Auto merged
      extra/yassl/taocrypt/include/type_traits.hpp:
        Auto merged
      extra/yassl/taocrypt/mySTL/list.hpp:
        Auto merged
      extra/yassl/taocrypt/src/aes.cpp:
        Auto merged
      extra/yassl/taocrypt/src/algebra.cpp:
        Auto merged
      extra/yassl/testsuite/testsuite.cpp:
        Auto merged
      include/my_global.h:
        Auto merged
      include/my_pthread.h:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      myisam/mi_open.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/mysqltest.result:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      mysys/default.c:
        Auto merged
      ndb/src/common/transporter/Transporter.cpp:
        Auto merged
      ndb/src/common/util/File.cpp:
        Auto merged
      ndb/src/common/util/SocketClient.cpp:
        Auto merged
      ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        Auto merged
      ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
        Auto merged
      ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Auto merged
      ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      ndb/src/mgmclient/CommandInterpreter.cpp:
        Auto merged
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      ndb/src/ndbapi/ClusterMgr.hpp:
        Auto merged
      ndb/src/ndbapi/Ndb.cpp:
        Auto merged
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Auto merged
      ndb/src/ndbapi/SignalSender.cpp:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_subselect.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/net_serv.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/opt_range.h:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/unireg.cc:
        Auto merged
      extra/yassl/taocrypt/src/asn.cpp:
        Manual merge (Fix shadowed variable name)
      extra/yassl/taocrypt/test/test.cpp:
        No changes
      ndb/src/common/util/ConfigValues.cpp:
        Manual merge (Fix shadowed variable name)
      sql/field.h:
        manual merge
      sql/ha_myisam.cc:
        manual merge
      sql/ha_ndbcluster.cc:
        manual merge
      sql/item_cmpfunc.cc:
        manual merge
      sql/item_subselect.cc:
        Manual merge (Fix shadowed variable name)
      sql/mysqld.cc:
        no changes
      1384e640
    • unknown's avatar
      Fixed unsafe define of uint4korr() · 2f3a17b6
      unknown authored
      Fixed that --extern works with mysql-test-run.pl
      Small trivial cleanups
      
      
      include/my_global.h:
        Fixed unsafe define of uint4korr()
      mysql-test/lib/mtr_report.pl:
        Removed wrong messages when using --extern
      mysql-test/mysql-test-run.pl:
        Fixed that --extern works
        Print help on stdout instead of stderr (make it easier to pipe it to less)
      mysql-test/t/ndb_lock.test:
        Added other possible error code
      sql/sql_prepare.cc:
        Removed not needed casts
      2f3a17b6
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · a0933646
      unknown authored
      into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
      
      
      a0933646
  11. 20 Feb, 2007 2 commits