1. 22 Feb, 2007 2 commits
    • unknown's avatar
      Portability fix · 8f0aacf9
      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
      8f0aacf9
    • unknown's avatar
      Fixed compiler warnings (for linux and win32 and win64) · 5d34a1ca
      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
      5d34a1ca
  2. 21 Feb, 2007 3 commits
    • unknown's avatar
      After merge fixes · 23461d77
      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
      23461d77
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 299d4b09
      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
      299d4b09
    • unknown's avatar
      Fixed unsafe define of uint4korr() · b9a609ac
      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
      b9a609ac
  3. 20 Feb, 2007 3 commits
  4. 16 Feb, 2007 1 commit
  5. 14 Feb, 2007 3 commits
  6. 13 Feb, 2007 9 commits
    • unknown's avatar
      Post-merge fix · 5ecad9a5
      unknown authored
      5ecad9a5
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · cfe1a891
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
      
      
      BitKeeper/etc/gone:
        auto-union
      mysys/my_getopt.c:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      mysql-test/r/select.result:
        Manual merge
      mysql-test/t/select.test:
        Manual merge
      cfe1a891
    • unknown's avatar
      Bug#25807: LOAD DATA INFILE does not work with Pipes · 40bf2b37
      unknown authored
      Showstopper and regression against 5.0.24.
      
      Previously, we ignored seek() errors (see Bug#22828) and let seek()s
      against pipes fail.  Now, since we check that a seek didn't fail,
      and return without reading, this bug popped up.
      
      This restores the behavior for file-ish objects that could never be 
      seek()ed.
      
      
      mysys/mf_iocache.c:
        If we detect early that the file is not tell()able, then we should
        assume that it's also not seek()able and therefore we should never
        set the (poorly named) "seek_not_done" flag so that we don't immedi-
        ately try to seek() when reading later.
        
        The problem was that tell() was returning -1, so when we read later, 
        we needlessly tried to seek to position  (unsigned long) -1 . 
        
        Also, if we think we're supposed to seek to a position in a file and 
        the file is un-tell()able, then abort.
      40bf2b37
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 · a1420d83
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-4.1-opt
      
      a1420d83
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 31d0c285
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
      
      
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      31d0c285
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 29b63cb1
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
      
      
      sql/mysql_priv.h:
        Auto merged
      29b63cb1
    • unknown's avatar
      Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0 · f72e6447
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
      
      
      BitKeeper/etc/ignore:
        auto-union
      f72e6447
    • unknown's avatar
      Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint · 457d4d6b
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
      
      
      BitKeeper/etc/gone:
        auto-union
      mysys/my_getopt.c:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      457d4d6b
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 147a8485
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26209
      
      
      sql/sql_select.cc:
        Auto merged
      147a8485
  7. 12 Feb, 2007 17 commits
    • unknown's avatar
      Merge mysql.com:/home/hf/work/20691/my50-20691 · 557e4709
      unknown authored
      into  mysql.com:/home/hf/work/25492/my50-25492
      
      
      sql/item.cc:
        Auto merged
      557e4709
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · 72748ac7
      unknown authored
      into  mysql.com:/home/hf/work/25492/my50-25492
      
      72748ac7
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-4.1-opt · 7c41c226
      unknown authored
      into  mysql.com:/home/hf/work/25492/my41-25492
      
      7c41c226
    • unknown's avatar
      Merge mysql.com:/home/hf/work/25492/my41-25492 · f5162a11
      unknown authored
      into  mysql.com:/home/hf/work/25492/my50-25492
      
      
      libmysqld/lib_sql.cc:
        merging
      f5162a11
    • unknown's avatar
      bug #25492 (Invalid deallocation in mysql_stmt_fetch) · 07efefd2
      unknown authored
      
      libmysqld/lib_sql.cc:
        code modified to prevent freeing of memory that wasn't malloc-ed.
        Now we check if MYSQL_STMT::result was used.
      07efefd2
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 9f1c12ac
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      9f1c12ac
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 8e153eba
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      8e153eba
    • unknown's avatar
      valgrind error fix · b70ae8b4
      unknown authored
      b70ae8b4
    • unknown's avatar
      Fixed MacOSX/Intel linking problem · 854015a0
      unknown authored
       Common symbols with and without initialization
       cause the apple linker to exclude then from the
       list of global symbols.
      
      854015a0
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 745b5b99
      unknown authored
      into  mysql.com:/home/tnurnberg/24660/50-24660
      
      
      sql/table.cc:
        Auto merged
      sql/unireg.cc:
        Auto merged
      745b5b99
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 18dc6317
      unknown authored
      into  mysql.com:/home/tnurnberg/24660/41-24660
      
      
      sql/table.cc:
        Auto merged
      18dc6317
    • unknown's avatar
      Merge mysql.com:/home/tnurnberg/24660/41-24660 · 8b5e1c86
      unknown authored
      into  mysql.com:/home/tnurnberg/24660/50-24660
      
      
      mysql-test/r/type_enum.result:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/unireg.cc:
        Auto merged
      8b5e1c86
    • unknown's avatar
      Bug#24660: "enum" field type definition problem · 7ca628c6
      unknown authored
      ENUMs weren't allowed to have character 0xff, a perfectly good character in some locales.
      This was circumvented by mapping 0xff in ENUMs to ',', thereby prevent actual commas from
      being used. Now if 0xff makes an appearance, we find a character not used in the enum and
      use that as a separator. If no such character exists, we throw an error.
      
      Any solution would have broken some sort of existing behaviour. This solution should
      serve both fractions (those with 0xff and those with ',' in their enums), but
      WILL REQUIRE A DUMP/RESTORE CYCLE FROM THOSE WITH 0xff IN THEIR ENUMS. :-/
      That is, mysqldump with their current server, and restore when upgrading to one with
      this patch.
      
      
      mysql-test/r/type_enum.result:
        Bug#24660: "enum" field type definition problem
        
        Show that enums can now contain NAMES_SEP_CHAR (0xff, which is a perfectly respectable
        char in some locales), or ',', or both.
      mysql-test/t/type_enum.test:
        Bug#24660: "enum" field type definition problem
        
        Show that enums can now contain NAMES_SEP_CHAR (0xff, which is a perfectly respectable
        char in some locales), or ',', or both.
      sql/table.cc:
        Bug#24660: "enum" field type definition problem
        
        Revert fix for Bug#20922.
      sql/unireg.cc:
        Bug#24660: "enum" field type definition problem
        
        Use a field-separator for ENUM-values that is not part of those values. If impossible,
        throw error.
      7ca628c6
    • unknown's avatar
      Bug#24630 Subselect query crashes mysqld · b35801de
      unknown authored
      The crash happens because second filling of the same I_S table happens in
      case of subselect with order by. table->sort.io_cache previously allocated
      in create_sort_index() is deleted during second filling
      (function get_schema_tables_result). There are two places where
      I_S table can be filled: JOIN::exec and create_sort_index().
      To fix the bug we should check if the table was already filled
      in one of these places and skip processing of the table in second.
      
      
      mysql-test/r/information_schema.result:
        test case
      mysql-test/t/information_schema.test:
        test case
      sql/mysql_priv.h:
        added new parameter 'executed_place' to function get_schema_tables_result()
      sql/sql_select.cc:
        added new parameter 'executed_place' to function get_schema_tables_result()
      sql/sql_show.cc:
        added more accurate check for cases when we need to refresh I_S table
      sql/table.cc:
        added more accurate check for cases when we need to refresh I_S table
      sql/table.h:
        added more accurate check for cases when we need to refresh I_S table
      b35801de
    • unknown's avatar
      bug #20691 (INSERT (DEFAULT) may insert garbage with NO DEFAULT NOT NULL field) · 7ed652e0
      unknown authored
      Some fields (GEOMETRY first of all) can't be handled properly in this
      case at all. So we return an error in this case
      
      
      mysql-test/r/default.result:
        result fixed
      mysql-test/r/gis.result:
        result fixed
      mysql-test/t/default.test:
        VIEW test added
      mysql-test/t/gis.test:
        testcase added
      sql/item.cc:
        set_defaults() changed with the 'reset()'
      7ed652e0
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 68fbbbf1
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26159
      
      68fbbbf1
    • unknown's avatar
      Fixed bug #26209. · 3ec35ab0
      unknown authored
      The function make_unireg_sortorder ignored the fact that any
      view field is represented by a 'ref' object.
      This could lead to wrong results for the queries containing
      both GROUP BY and ORDER BY clauses.
      
      
      mysql-test/r/view.result:
        Added a test case for bug #26209.
      mysql-test/t/view.test:
        Added a test case for bug #26209.
      3ec35ab0
  8. 11 Feb, 2007 2 commits
    • unknown's avatar
      sql_view.cc: · 56baa89b
      unknown authored
        Post fix for bug#12122.
      information_schema.result:
        Corrected test case after fixing bug#12122.
      
      
      sql/sql_view.cc:
        Post fix for bug#12122.
      mysql-test/r/information_schema.result:
        Corrected test case after fixing bug#12122.
      56baa89b
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 537de83a
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/12122-bug-5.0-opt-mysql
      
      537de83a