1. 28 Nov, 2003 6 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · 6bd4da2c
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      6bd4da2c
    • unknown's avatar
      merged · 5dc67f1a
      unknown authored
      5dc67f1a
    • unknown's avatar
    • unknown's avatar
      BK automerge tends to eat break; statements · ca79326e
      unknown authored
      ca79326e
    • unknown's avatar
      Merge mysql.com:/home/kostja/mysql/mysql-4.1-root · c1d87365
      unknown authored
      into mysql.com:/home/kostja/mysql/mysql-4.1-wl519
      
      
      sql-common/client.c:
        Auto merged
      c1d87365
    • unknown's avatar
      Second part of WL #519: · c98abc99
      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
      c98abc99
  2. 27 Nov, 2003 5 commits
  3. 26 Nov, 2003 12 commits
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 3fa7764c
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
      
      3fa7764c
    • unknown's avatar
      avoiding coping tmptable_param · f3e88d5b
      unknown authored
      
      sql/sql_union.cc:
        fixed layout
      f3e88d5b
    • unknown's avatar
      cleanup · 1af2be60
      unknown authored
      1af2be60
    • unknown's avatar
      cleanup · 81c25cef
      unknown authored
      81c25cef
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · c7abc102
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
      
      
      sql/sql_union.cc:
        Auto merged
      c7abc102
    • unknown's avatar
      avoiding coping tmp_table_param · 9b2afd38
      unknown authored
      9b2afd38
    • unknown's avatar
      Fix for BUG#1960 "date_format() returns spurious '-' for valid dates". · e8b6da43
      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.
      e8b6da43
    • unknown's avatar
      - fixed compile error in tests/client_test.c · 01c40c93
      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)
      01c40c93
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · d8e2e072
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1-w1284
      
      
      sql/sql_acl.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      d8e2e072
    • unknown's avatar
      SCRUM · 3158239a
      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
      3158239a
    • unknown's avatar
      mi_keycache.c: · 68d55325
      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).
      68d55325
    • unknown's avatar
      mf_keycache.c: · 0a316600
      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.
      0a316600
  4. 25 Nov, 2003 17 commits