1. 28 Nov, 2003 14 commits
    • unknown's avatar
      merge with 4.0 to get fix for range bug · 6cb23b94
      unknown authored
      
      libmysql/libmysql.c:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      6cb23b94
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 15763ed5
      unknown authored
      into mysql.com:/my/mysql-4.0
      
      
      15763ed5
    • unknown's avatar
      Fixed range optimzier bug (Bug #1828) · e5cc604e
      unknown authored
      
      mysql-test/r/range.result:
        test for range optimzier bug
      mysql-test/t/range.test:
        test for range optimzier bug
      e5cc604e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · aa780843
      unknown authored
      into mysql.com:/my/mysql-4.1
      
      
      aa780843
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · f531c801
      unknown authored
      into mysql.com:/my/mysql-4.1
      
      
      sql-common/client.c:
        Auto merged
      f531c801
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · 56b45eea
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      56b45eea
    • unknown's avatar
      merged · c19f18ec
      unknown authored
      c19f18ec
    • unknown's avatar
    • unknown's avatar
      Merge · ef432201
      unknown authored
      
      sql/sql_parse.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/sql_derived.cc:
        keep local copy
      sql/sql_union.cc:
        keep local copy
      ef432201
    • unknown's avatar
      Fix wrong last edit for last commit · 183b02a8
      unknown authored
      183b02a8
    • unknown's avatar
      Added missing SSL library (Should be in source distribution) · 76bf7d22
      unknown authored
      Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler)
      Added a lot of 'version_xxx' strings to 'show variables'
      Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
      Fixed problem with printing sub selects to debug log
      
      
      Docs/mysqld_error.txt:
        Updated error messages
      Makefile.am:
        Added missing SSL library (Should be in source distribution)
      configure.in:
        Added missing SSL library
      include/sql_common.h:
        Move duplicated prototypes
      innobase/os/os0file.c:
        Added comment for line that could be removed
      innobase/srv/srv0srv.c:
        Added comment for line that could be removed
      innobase/srv/srv0start.c:
        Added comment for line that could be removed
      innobase/trx/trx0sys.c:
        Added cast to remove compiler warning
      isam/isamchk.c:
        Fixed compiler warning
      libmysql/conf_to_src.c:
        Include files in proper order
      myisam/mi_check.c:
        Removed else part that caused compiler warning
      myisam/mi_delete.c:
        Added cast
      myisam/mi_page.c:
        Added cast
      myisam/mi_preload.c:
        Added cast
      myisam/mi_write.c:
        Added cast
      myisam/myisampack.c:
        changed 'byte' to 'current_byte' to avoid compiler warnings
      mysql-test/mysql-test-run.sh:
        Removed start-from as test '<' is not portable and this can easily be done from command line
      mysys/hash.c:
        Added cast
      mysys/mf_wcomp.c:
        Removed not reached line
      mysys/my_append.c:
        Fixed include file order to get this more portable
      mysys/my_copy.c:
        Fixed include file order to get this more portable
      mysys/my_redel.c:
        Fixed include file order to get this more portable
      sql-common/client.c:
        More DBUG_PRINT
      sql-common/pack.c:
        Added casts becasue Fortre compiler apparently compares (ulonglong) < (longlong) as signed
      sql/ha_heap.cc:
        Changed variable names to not cause hidden variables
      sql/ha_innodb.cc:
        Changed variable names to not cause hidden variables
      sql/item.cc:
        Changed variable names to not cause hidden variables
      sql/item.h:
        Changed variable names to not cause hidden variables
      sql/item_cmpfunc.h:
        Changed variable names to not cause hidden variables
      sql/item_func.cc:
        Changed variable names to not cause hidden variables
      sql/item_subselect.cc:
        Changed variable names to not cause hidden variables
      sql/item_subselect.h:
        Changed variable names to not cause hidden variables
      sql/item_sum.cc:
        Changed variable names to not cause hidden variables
      sql/item_timefunc.cc:
        Changed variable names to not cause hidden variables
      sql/log.cc:
        Changed variable names to not cause hidden variables
      sql/protocol.cc:
        Changed variable names to not cause hidden variables
      sql/protocol.h:
        Changed variable names to not cause hidden variables
        Remove function not declared in protocol.cc
      sql/protocol_cursor.cc:
        Changed variable names to not cause hidden variables
      sql/set_var.cc:
        Added a lot of 'version_xxx' strings
        Changed 'bdb_version' to 'version_bdb'
      sql/sql_class.cc:
        Changed variable names to not cause hidden variables
        Add TMP_TABLE_PARAM::init() to allow one to initialize structure several times
      sql/sql_class.h:
        Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
      sql/sql_derived.cc:
        Avoid copying TMP_TABLE_PARAM (Use class version instead)
      sql/sql_error.cc:
        More DBUG
      sql/sql_help.cc:
        Fixed compiler warning
      sql/sql_lex.cc:
        Changed variable names to not cause hidden variables
      sql/sql_list.h:
        Changed variable names to not cause hidden variables
      sql/sql_parse.cc:
        Changed variable names to not cause hidden variables
      sql/sql_select.cc:
        Changed variable names to not cause hidden variables
        Ensure that you don't send NULL to printf() for %s
        Fixed problem with printing sub selects to debug log
      sql/sql_select.h:
        Changed variable names to not cause hidden variables
      sql/sql_union.cc:
        Changed variable names to not cause hidden variables
        Don't use local copy of TMP_TABLE_PARAM (Caused core dump on Solaris)
      sql/sql_update.cc:
        Indentation cleanup
      sql/sql_yacc.yy:
        Remove warning
      strings/conf_to_src.c:
        Fixed include file order
      76bf7d22
    • unknown's avatar
      BK automerge tends to eat break; statements · a723514b
      unknown authored
      a723514b
    • unknown's avatar
      Merge mysql.com:/home/kostja/mysql/mysql-4.1-root · b567fdd4
      unknown authored
      into mysql.com:/home/kostja/mysql/mysql-4.1-wl519
      
      
      sql-common/client.c:
        Auto merged
      b567fdd4
    • unknown's avatar
      Second part of WL #519: · 506572b6
      unknown authored
      Client option secure-auth deployed on all possible layers:
      - mysql client command-line and config file option
      - mysql_options option MYSQL_SECURE_AUTH
      - mysql_real_connect will automatically take into account that option if
        mysql->options.my_cnf_file/my_cnf_group is set
      
      
      client/client_priv.h:
        added OPT_SECURE_AUTH to enum of all my_read_default_options options.
      client/mysql.cc:
        added support for mysql command-line option --secure-auth
      include/errmsg.h:
        added return code for option --secure-auth
      include/mysql.h:
        added MYSQL_SECURE_AUTH to enum of all mysql_options options.
        added secure_auth flag to MYSQL handle
      libmysql/errmsg.c:
        Error messages for option --secure-auth
      sql-common/client.c:
        added check for secure-auth in mysql_real_connect:
        if password is provided, and secure-auth is on, then client will
        refuse connecting to pre-4.1.1 server
      506572b6
  2. 27 Nov, 2003 8 commits
  3. 26 Nov, 2003 15 commits
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · a43114ac
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
      
      
      a43114ac
    • unknown's avatar
      avoiding coping tmptable_param · 358799ec
      unknown authored
      
      sql/sql_union.cc:
        fixed layout
      358799ec
    • unknown's avatar
      cleanup · 09f95e71
      unknown authored
      09f95e71
    • unknown's avatar
      cleanup · a189daf7
      unknown authored
      a189daf7
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 4f19b577
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
      
      
      sql/sql_union.cc:
        Auto merged
      4f19b577
    • unknown's avatar
      avoiding coping tmp_table_param · 6491cc5e
      unknown authored
      6491cc5e
    • unknown's avatar
      Fix for BUG#1960 "date_format() returns spurious '-' for valid dates". · 0b0a79e3
      unknown authored
      It was a forgotten ltime->neg=0 (neg was the only forgotten variable).
      I scanned field.cc for other places where we would forget to set neg, found none.
      A test for the bug.
      
      
      mysql-test/r/date_formats.result:
        result update
      mysql-test/t/date_formats.test:
        a test for BUG#1960 "date_format() returns spurious '-' for valid dates"
      sql/field.cc:
        When preparing ltime from the 3-byte date, don't forget to set ltime->neg to 0
        (otherwise it remains unitialized).
        Dates are not allowed to be negative (only times can be, when they mean a time interval),
        so it's ok to always set neg to 0.
      0b0a79e3
    • unknown's avatar
      - fixed compile error in tests/client_test.c · e503dc28
      unknown authored
         (declarations should be on top of a block)
      
      
      tests/client_test.c:
         - fixed compile error (declarations should be on top of a block)
      e503dc28
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7d784b20
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1-w1284
      
      
      sql/sql_acl.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      7d784b20
    • unknown's avatar
      SCRUM · 6943b323
      unknown authored
      WL#1284 (warnings about --skip-name-resolve)
      Messages corrected
      
      
      sql/share/czech/errmsg.txt:
        Message corrected
      sql/share/danish/errmsg.txt:
        Message corrected
      sql/share/dutch/errmsg.txt:
        Message corrected
      sql/share/english/errmsg.txt:
        Message corrected
      sql/share/estonian/errmsg.txt:
        Message corrected
      sql/share/french/errmsg.txt:
        Message corrected
      sql/share/german/errmsg.txt:
        Message corrected
      sql/share/greek/errmsg.txt:
        Message corrected
      sql/share/hungarian/errmsg.txt:
        Message corrected
      sql/share/italian/errmsg.txt:
        Message corrected
      sql/share/japanese/errmsg.txt:
        Message corrected
      sql/share/korean/errmsg.txt:
        Message corrected
      sql/share/norwegian-ny/errmsg.txt:
        Message corrected
      sql/share/norwegian/errmsg.txt:
        Message corrected
      sql/share/polish/errmsg.txt:
        Message corrected
      sql/share/portuguese/errmsg.txt:
        Message corrected
      sql/share/romanian/errmsg.txt:
        Message corrected
      sql/share/russian/errmsg.txt:
        Message corrected
      sql/share/serbian/errmsg.txt:
        Message corrected
      sql/share/slovak/errmsg.txt:
        Message corrected
      sql/share/spanish/errmsg.txt:
        Message corrected
      sql/share/swedish/errmsg.txt:
        Message corrected
      sql/share/ukrainian/errmsg.txt:
        Message corrected
      sql/sql_acl.cc:
        Messages corrected
      6943b323
    • unknown's avatar
      mi_keycache.c: · ceb0ce50
      unknown authored
        Removed FLUSH_REMOVE flag (replaced it by FLUSH_RELEASE).
      my_sys.h:
        Removed FLUSH_REMOVE flag.
      
      
      include/my_sys.h:
        Removed FLUSH_REMOVE flag.
      myisam/mi_keycache.c:
        Removed FLUSH_REMOVE flag (replaced it by FLUSH_RELEASE).
      ceb0ce50
    • unknown's avatar
      Merge mysql.com:/my/mysql-4.0 into mysql.com:/my/mysql-4.1 · 292cb97e
      unknown authored
      
      include/mysql_version.h.in:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      292cb97e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · e56d603a
      unknown authored
      into mysql.com:/my/mysql-4.0
      
      
      e56d603a
    • unknown's avatar
      Added compilation comment to 'show variables' · fa9047e2
      unknown authored
      This makes it possible to check origin of binary from the output of 'show variables'
      
      
      include/mysql_version.h.in:
        Added MYSQL_COMPILATION_COMMENT
      sql/mysqld.cc:
        Added compilation comment to mysqld --version
      sql/set_var.cc:
        Added compilation comment to 'show variables'
      fa9047e2
    • unknown's avatar
      mf_keycache.c: · 345a84ca
      unknown authored
        Fixed typo that caused blocking key cache usage after resize.
        Removed wrong re-initialization of resize queue in init_key_cache.
      
      
      mysys/mf_keycache.c:
        Fixed typo that caused blocking key cache usage after resize.
        Removed wrong re-initialization of resize queue in init_key_cache.
      345a84ca
  4. 25 Nov, 2003 3 commits