1. 03 Sep, 2003 8 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · 1ef5dce8
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      sql/item_create.cc:
        Auto merged
      sql/item_create.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      1ef5dce8
    • unknown's avatar
      fixed after-merge bug in CHANG_USER command · b74332ec
      unknown authored
      
      sql/sql_parse.cc:
        fixed after-merge bug in CHANGE_USER command
      b74332ec
    • unknown's avatar
      Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 15c0fe47
      unknown authored
      into oak.local:/home/kostja/mysql/mysql-4.1-root
      
      
      BitKeeper/etc/ignore:
        auto-union
      15c0fe47
    • unknown's avatar
      post-merge fixes · d42b4eeb
      unknown authored
      
      mysql-test/r/func_crypt.result:
        _dig_vec converted lowercase
      sql/slave.cc:
        post-merge fix
      d42b4eeb
    • unknown's avatar
      merge commit, hope that none of bar and dlenev changes were · 49b0312d
      unknown authored
      lost.
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      include/mysql.h:
        Auto merged
      include/mysql_com.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      scripts/mysql_fix_privilege_tables.sql:
        Auto merged
      sql/item_create.cc:
        Auto merged
      sql/item_create.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/protocol.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.h:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      include/mysqld_error.h:
        merge commit: new error message added
      sql-common/client.c:
        merge commit
      sql/mysql_priv.h:
        merge commit: autoremerge
      sql/set_var.h:
        merge commit
      sql/share/czech/errmsg.txt:
        merge commit
      sql/share/danish/errmsg.txt:
        merge commit
      sql/share/dutch/errmsg.txt:
        merge commit
      sql/share/english/errmsg.txt:
        merge commit
      sql/share/estonian/errmsg.txt:
        merge commit
      sql/share/french/errmsg.txt:
        merge commit
      sql/share/german/errmsg.txt:
        merge commit
      sql/share/greek/errmsg.txt:
        merge commit
      sql/share/hungarian/errmsg.txt:
        merge commit
      sql/share/italian/errmsg.txt:
        merge commit
      sql/share/japanese/errmsg.txt:
        merge commit
      sql/share/korean/errmsg.txt:
        merge commit
      sql/share/norwegian-ny/errmsg.txt:
        merge commit
      sql/share/norwegian/errmsg.txt:
        merge commit
      sql/share/polish/errmsg.txt:
        merge commit
      sql/share/portuguese/errmsg.txt:
        merge commit
      sql/share/romanian/errmsg.txt:
        merge commit
      sql/share/russian/errmsg.txt:
        merge commit
      sql/share/serbian/errmsg.txt:
        merge commit
      sql/share/slovak/errmsg.txt:
        merge commit
      sql/share/spanish/errmsg.txt:
        merge commit
      sql/share/swedish/errmsg.txt:
        merge commit
      sql/share/ukrainian/errmsg.txt:
        merge commit
      sql/slave.cc:
        merge commit
      sql/slave.h:
        merge commit
      sql/sql_acl.cc:
        merge commit
      sql/sql_parse.cc:
        merge commit
      sql/sql_repl.h:
        merge commit
      49b0312d
    • unknown's avatar
      merged · cf578b26
      unknown authored
      
      include/my_sys.h:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/innodb.test:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item_create.cc:
        Auto merged
      sql/item_create.h:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      cf578b26
    • unknown's avatar
      CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ] · 4a21b30e
      unknown authored
      
      myisam/mi_checksum.c:
        workaround for zlib's crc32 glitch
      mysql-test/r/show_check.result:
        results updated
      mysys/checksum.c:
        switching to crc32 as a checksum algorithm
      4a21b30e
    • unknown's avatar
      Added automatically created SSL certificates from mysql-test/std_data · 93c9f9c6
      unknown authored
      to ignore list.
      
      
      93c9f9c6
  2. 01 Sep, 2003 4 commits
    • unknown's avatar
      Updated various tests results which were missed during auto-merge · 651898ad
      unknown authored
      with replication over SSL patch.
      
      
      mysql-test/r/rpl_error_ignored_table.result:
        New SSL related fields in SHOW SLAVE STATUS
      mysql-test/r/rpl_loaddata.result:
        New SSL related fields in SHOW SLAVE STATUS
      mysql-test/r/rpl_max_relay_size.result:
        New SSL related fields in SHOW SLAVE STATUS
      mysql-test/r/rpl_openssl.result:
        Post merge update of SHOW SLAVE STATUS result
      mysql-test/r/rpl_reset_slave.result:
        New SSL related fields in SHOW SLAVE STATUS
      mysql-test/r/rpl_rotate_logs.result:
        Fixed bad manual merge result
      651898ad
    • unknown's avatar
      Manual merge fixes · b4d59a8d
      unknown authored
      
      sql/lex.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/share/czech/errmsg.txt:
        Auto merged
      sql/share/danish/errmsg.txt:
        Auto merged
      sql/share/dutch/errmsg.txt:
        Auto merged
      sql/share/english/errmsg.txt:
        Auto merged
      sql/share/estonian/errmsg.txt:
        Auto merged
      sql/share/french/errmsg.txt:
        Auto merged
      sql/share/german/errmsg.txt:
        Auto merged
      sql/share/greek/errmsg.txt:
        Auto merged
      sql/share/hungarian/errmsg.txt:
        Auto merged
      sql/share/italian/errmsg.txt:
        Auto merged
      sql/share/japanese/errmsg.txt:
        Auto merged
      sql/share/korean/errmsg.txt:
        Auto merged
      sql/share/norwegian-ny/errmsg.txt:
        Auto merged
      sql/share/norwegian/errmsg.txt:
        Auto merged
      sql/share/polish/errmsg.txt:
        Auto merged
      sql/share/portuguese/errmsg.txt:
        Auto merged
      sql/share/romanian/errmsg.txt:
        Auto merged
      sql/share/russian/errmsg.txt:
        Auto merged
      sql/share/slovak/errmsg.txt:
        Auto merged
      sql/share/spanish/errmsg.txt:
        Auto merged
      sql/share/swedish/errmsg.txt:
        Auto merged
      sql/share/ukrainian/errmsg.txt:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      include/mysqld_error.h:
        Mabual merge
      mysql-test/r/rpl_flush_log_loop.result:
        Mabual merge
      mysql-test/r/rpl_log.result:
        Mabual merge
      mysql-test/r/rpl_log_pos.result:
        Mabual merge
      mysql-test/r/rpl_replicate_do.result:
        Mabual merge
      mysql-test/r/rpl_rotate_logs.result:
        Mabual merge
      sql/slave.cc:
        Mabual merge
      sql/slave.h:
        Mabual merge
      b4d59a8d
    • unknown's avatar
      Implemented replication over SSL · 8a548ffd
      unknown authored
       Added proper options to CHANGE MASTER TO, new fields to SHOW SLAVE STATUS,
       Honoring this parameters during connection to master.
       Introduced new format of master.info file
      
      
      include/mysqld_error.h:
        Added error code for "slave without SSL ignored SSL params warning"
      mysql-test/Makefile.am:
        Copy files required for rpl_openssl test during the make process
      mysql-test/r/rpl000015.result:
        Added fields to SHOW SLAVE STATUS for replication over SSL
      mysql-test/r/rpl_empty_master_crash.result:
        Added fields to SHOW SLAVE STATUS for replication over SSL
      mysql-test/r/rpl_flush_log_loop.result:
        Added fields to SHOW SLAVE STATUS for replication over SSL
      mysql-test/r/rpl_log.result:
        Added fields to SHOW SLAVE STATUS for replication over SSL
      mysql-test/r/rpl_log_pos.result:
        Added fields to SHOW SLAVE STATUS for replication over SSL
      mysql-test/r/rpl_redirect.result:
        Added fields to SHOW SLAVE STATUS for replication over SSL
      mysql-test/r/rpl_replicate_do.result:
        Added fields to SHOW SLAVE STATUS for replication over SSL
      mysql-test/r/rpl_rotate_logs.result:
        Added fields to SHOW SLAVE STATUS for replication over SSL
      sql/lex.h:
        Added MASTER_SSL lexems for CHANGE MASTER
      sql/mysqld.cc:
        Added --master-ssl-ca parameter. Fixed description of other master-ssl parameters
      sql/repl_failsafe.cc:
        Added SSL support to connect_to_master()
      sql/share/czech/errmsg.txt:
        Added "slave without SSL ignored SSL params" warning
      sql/share/danish/errmsg.txt:
        Added "slave without SSL ignored SSL params" warning
      sql/share/dutch/errmsg.txt:
        Added "slave without SSL ignored SSL params" warning
      sql/share/english/errmsg.txt:
        Added "slave without SSL ignored SSL params" warning
      sql/share/estonian/errmsg.txt:
        Added "slave without SSL ignored SSL params" warning
      sql/share/french/errmsg.txt:
        Added "slave without SSL ignored SSL params" warning
      sql/share/german/errmsg.txt:
        Added "slave without SSL ignored SSL params" warning
      sql/share/greek/errmsg.txt:
        Added "slave without SSL ignored SSL params" warning
      sql/share/hungarian/errmsg.txt:
        Added "slave without SSL ignored SSL params" warning
      sql/share/italian/errmsg.txt:
        Added "slave without SSL ignored SSL params" warning
      sql/share/japanese/errmsg.txt:
        Added "slave without SSL ignored SSL params" warning
      sql/share/korean/errmsg.txt:
        Added "slave without SSL ignored SSL params" warning
      sql/share/norwegian-ny/errmsg.txt:
        Added "slave without SSL ignored SSL params" warning
      sql/share/norwegian/errmsg.txt:
        Added "slave without SSL ignored SSL params" warning
      sql/share/polish/errmsg.txt:
        Added "slave without SSL ignored SSL params" warning
      sql/share/portuguese/errmsg.txt:
        Added "slave without SSL ignored SSL params" warning
      sql/share/romanian/errmsg.txt:
        Added "slave without SSL ignored SSL params" warning
      sql/share/russian/errmsg.txt:
        Added "slave without SSL ignored SSL params" warning
      sql/share/serbian/errmsg.txt:
        Added "slave without SSL ignored SSL params" warning
      sql/share/slovak/errmsg.txt:
        Added "slave without SSL ignored SSL params" warning
      sql/share/spanish/errmsg.txt:
        Added "slave without SSL ignored SSL params" warning
      sql/share/swedish/errmsg.txt:
        Added "slave without SSL ignored SSL params" warning
      sql/share/ukrainian/errmsg.txt:
        Added "slave without SSL ignored SSL params" warning
      sql/slave.cc:
        Introduced new format of master.info file
        Added support of SSL params in master.info and SHOW SLAVE STATUS
        Added support of SSL connections
      sql/slave.h:
        Added SSL parameters to MASTER_INFO
      sql/sql_lex.h:
        Added SSL parameters for CHANGE MASTER TO
      sql/sql_repl.cc:
        Added SSL parameters for CHANGE MASTER TO
      sql/sql_yacc.yy:
        Added SSL parameters for CHANGE MASTER TO
      8a548ffd
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · ba91207f
      unknown authored
      into mysql.r18.ru:/usr/home/ram/work/4.1
      
      
      ba91207f
  3. 30 Aug, 2003 6 commits
  4. 29 Aug, 2003 4 commits
  5. 28 Aug, 2003 14 commits
    • unknown's avatar
      Fixed problem with absence of gmtime_r under Windows. · fb3ab3c8
      unknown authored
      
      include/my_pthread.h:
        HAVE_GMTIME_R should not be defined under Windows
        (it is ok for HAVE_LOCALTIME_R since there additional implementation 
        in my_windcond.c.
      fb3ab3c8
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 82ace8f8
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-enum-4.1
      
      
      sql/sql_select.cc:
        Auto merged
      82ace8f8
    • unknown's avatar
      fixed typo · 0f57bb2e
      unknown authored
      0f57bb2e
    • unknown's avatar
      Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 914bc868
      unknown authored
      into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
      
      
      914bc868
    • unknown's avatar
      38a65b4d
    • unknown's avatar
      Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 86feb16b
      unknown authored
      into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-aggregate-4.1
      
      
      86feb16b
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · c326e596
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.clean
      
      
      c326e596
    • unknown's avatar
      Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 · d1d92817
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1
      
      
      d1d92817
    • unknown's avatar
      fixed merge mistake · f8e55811
      unknown authored
      f8e55811
    • unknown's avatar
      Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE · 241ed6b8
      unknown authored
      This commit is related to my previos one(ChangeSet 1.1583 03/08/27 18:03:39).
      Note about COMMIT&ROLLBACK:
        Only 'COMMIT' statement updates the binary log. 
        'ROLLBACK' statement doesn't update the binlog.
      
      
      mysql-test/r/drop.result:
        Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
      mysql-test/r/innodb.result:
        Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
      mysql-test/t/drop.test:
        Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
      mysql-test/t/innodb.test:
        Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
      sql/handler.cc:
        Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
      sql/sql_table.cc:
        Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
      241ed6b8
    • unknown's avatar
      834cfbd1
    • unknown's avatar
      SCRUM: · 36636e82
      unknown authored
      Fixed some mess with STDCALL in function's declarations
      
      
      include/mysql.h:
        That definitions are more correct
      libmysqld/lib_sql.cc:
        should be declared as STDCALL
      libmysqld/libmysqld.c:
        should be declared as STDCALL
      sql-common/client.c:
        should be declared as STDCALL
      36636e82
    • unknown's avatar
      Merge · 94eb7e41
      unknown authored
      
      sql/field.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      mysql-test/r/create.result:
        merge
      mysql-test/t/create.test:
        merge
      sql/item_cmpfunc.h:
        SCCS merged
      94eb7e41
    • unknown's avatar
      reset() split in 2 function clear() & add() · 85f7a697
      unknown authored
      aggregate function reinitialization (if no rows was found) made with help of clear()
      (fixed BUG#860)
      
      
      mysql-test/r/subselect.result:
        test for BUG#860
      mysql-test/t/subselect.test:
        test for BUG#860
      sql/item_sum.cc:
        reset() replaced with clear()
      sql/item_sum.h:
        reset() replaced with clear()
        (reset now is just composition of clear() and add())
      sql/item_uniq.h:
        reset() replaced with clear()
      sql/sql_select.cc:
        removed NULL value assigment, now it will be done by clear() call
        function for clearing if there was not found any row in group
      sql/sql_select.h:
        function for clearing if there was not found any row in group
      85f7a697
  6. 27 Aug, 2003 4 commits
    • unknown's avatar
      Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 · f5d4eb89
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1
      
      
      sql/field.h:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      f5d4eb89
    • unknown's avatar
      fixed bug #910 (right type of ifnull function) · a73058a7
      unknown authored
      
      mysql-test/r/create.result:
        added test for bug #910 (right type of ifnull function)
      mysql-test/t/create.test:
        added test for bug #910 (right type of ifnull function)
      sql/field.h:
        added new constructors of Field_decimal, Field_tiny, Field_short, Field_float,
        Field_null, Field_year
        for using in Item::tmp_table_field_from_field_type
      sql/item.cc:
        added Item::tmp_table_field_from_field_type
      sql/item.h:
        added Item::tmp_table_field_from_field_type
      a73058a7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c2d54add
      unknown authored
      into narttu.mysql.fi:/my/mysql-4.1
      
      
      c2d54add
    • unknown's avatar
      hanged UDF interface to use clear() instead of reset() · 0ee6f7fd
      unknown authored
      
      BUILD/FINISH.sh:
        Add just_clean option (for cleanup script)
      scripts/mysql_fix_privilege_tables.sql:
        Added 'USE mysql' for easer use on windows
      sql/item_sum.cc:
        Changed UDF interface to use clear() instead of reset()
      sql/item_sum.h:
        Changed UDF interface to use clear() instead of reset()
      sql/slave.cc:
        Fixed checking of eof for slave/master protocol. (Bug #887)
      sql/sql_udf.cc:
        Changed UDF interface to use clear() instead of reset()
      sql/sql_udf.h:
        Changed UDF interface to use clear() instead of reset()
      sql/sql_yacc.yy:
        ERRORS and WARNINGS should not be reserved words
      sql/udf_example.cc:
        Changed UDF interface to use clear() instead of reset()
      0ee6f7fd