1. 31 Jul, 2003 3 commits
    • unknown's avatar
      manual merge · 4acc45d7
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      include/mysql.h:
        Auto merged
      include/mysql_com.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      sql/item_create.cc:
        Auto merged
      sql/item_create.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/slave.h:
        Auto merged
      sql/sql_acl.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/sql_parse.cc:
        merge commit
        convert of database to utf8 in case of cahnge_user added
      4acc45d7
    • unknown's avatar
      merge commit · 2c3cba31
      unknown authored
      
      sql-common/client.c:
        comment fix
      2c3cba31
    • unknown's avatar
      cp1251.xml: · 79fea68b
      unknown authored
        Upper/lower case translation bug for letter 't' fix.
      
      
      sql/share/charsets/cp1251.xml:
        Upper/lower case translation bug for letter 't' fix.
      79fea68b
  2. 30 Jul, 2003 4 commits
  3. 29 Jul, 2003 4 commits
  4. 28 Jul, 2003 7 commits
  5. 27 Jul, 2003 3 commits
  6. 26 Jul, 2003 2 commits
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · fc9e7e10
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1
      
      
      fc9e7e10
    • unknown's avatar
      My changes to test rpl_insert_id in 4.0 about replication of foreign_key_checks · 65a12f45
      unknown authored
      have in fact no effect, because in 4.0 the slave always runs with --skip-innodb.
      In 4.1, mysqld accepts option --innodb which can override --skip-innodb.
      So I add this option to the test.
      When the updated test (using InnoDB tables) from 4.0 will be merged
      into 4.1, with this good .opt file, we'll have a meaningful test in 4.1.
      Until then, the test in 4.1 will pass but be useless.
      And in 4.0, it will stay useless forever.
      ("it" = the part of the test which tests replication of foreign_key_checks)
      
      
      BitKeeper/deleted/.del-rpl_insert_id-slave.opt~ba10e66ea50b556:
        Delete: mysql-test/rpl_insert_id-slave.opt
      65a12f45
  7. 25 Jul, 2003 2 commits
  8. 24 Jul, 2003 1 commit
    • unknown's avatar
      Print accounts in error messages as 'user'@'host' rather than 'user@host'. · 3a8d1c3c
      unknown authored
      The latter is misleading because differs from the syntax used for GRANT/REVOKE.
      
      Fix up test result affected by error message edits.
      
      
      mysql-test/r/grant_cache.result:
        Fix up test result to match error message edit.
      sql/share/czech/errmsg.txt:
        Print user@host in syntax actually used for GRANT/REVOKE.
      sql/share/danish/errmsg.txt:
        Print user@host in syntax actually used for GRANT/REVOKE.
      sql/share/dutch/errmsg.txt:
        Print user@host in syntax actually used for GRANT/REVOKE.
      sql/share/english/errmsg.txt:
        Print user@host in syntax actually used for GRANT/REVOKE.
      sql/share/estonian/errmsg.txt:
        Print user@host in syntax actually used for GRANT/REVOKE.
      sql/share/french/errmsg.txt:
        Print user@host in syntax actually used for GRANT/REVOKE.
      sql/share/german/errmsg.txt:
        Print user@host in syntax actually used for GRANT/REVOKE.
      sql/share/greek/errmsg.txt:
        Print user@host in syntax actually used for GRANT/REVOKE.
      sql/share/hungarian/errmsg.txt:
        Print user@host in syntax actually used for GRANT/REVOKE.
      sql/share/italian/errmsg.txt:
        Print user@host in syntax actually used for GRANT/REVOKE.
      sql/share/japanese/errmsg.txt:
        Print user@host in syntax actually used for GRANT/REVOKE.
      sql/share/korean/errmsg.txt:
        Print user@host in syntax actually used for GRANT/REVOKE.
      sql/share/norwegian-ny/errmsg.txt:
        Print user@host in syntax actually used for GRANT/REVOKE.
      sql/share/norwegian/errmsg.txt:
        Print user@host in syntax actually used for GRANT/REVOKE.
      sql/share/polish/errmsg.txt:
        Print user@host in syntax actually used for GRANT/REVOKE.
      sql/share/portuguese/errmsg.txt:
        Print user@host in syntax actually used for GRANT/REVOKE.
      sql/share/romanian/errmsg.txt:
        Print user@host in syntax actually used for GRANT/REVOKE.
      sql/share/russian/errmsg.txt:
        Print user@host in syntax actually used for GRANT/REVOKE.
      sql/share/serbian/errmsg.txt:
        Print user@host in syntax actually used for GRANT/REVOKE.
      sql/share/slovak/errmsg.txt:
        Print user@host in syntax actually used for GRANT/REVOKE.
      sql/share/spanish/errmsg.txt:
        Print user@host in syntax actually used for GRANT/REVOKE.
      sql/share/swedish/errmsg.txt:
        Print user@host in syntax actually used for GRANT/REVOKE.
      sql/share/ukrainian/errmsg.txt:
        Print user@host in syntax actually used for GRANT/REVOKE.
      3a8d1c3c
  9. 23 Jul, 2003 7 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · fb98d363
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-local
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      fb98d363
    • unknown's avatar
      Fix security bug. mysqld server without ssl support was completly · af8d09ff
      unknown authored
      ignorant about ssl_type attribute
      
      
      sql/sql_acl.cc:
        Now acl_getroot() honors ssl_type attribute even if we compile without openssl
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      af8d09ff
    • unknown's avatar
      temporary modification of rpl_loaddata.test until 4.0 is merged in 4.1. · 3be8c60c
      unknown authored
      This is to avoid a test failure, which is fixed in 4.0 in
      ChangeSet@1.1455.34.1, 2003-06-10 23:29:49+02:00, guilhem@mysql.com
      by making RESET SLAVE reset the error.
      
      
      mysql-test/r/rpl_loaddata.result:
        temporary modification until 4.0 is merged in 4.1
      mysql-test/t/rpl_loaddata.test:
        temporary modification until 4.0 is merged in 4.1
      3be8c60c
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · bacddcc5
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1
      
      
      bacddcc5
    • unknown's avatar
      On Feb 4th, 2003, Monty said he would push my patch to print replicate-do-table · dae34fb6
      unknown authored
      and other replicate-*-table options in SHOW SLAVE STATUS.
      Seems like it had not been done, so I push it now:
      there's 4 new columns to SHOW SLAVE STATUS.
      
      
      mysql-test/r/rpl000015.result:
        Result update (more columns)
      mysql-test/r/rpl_empty_master_crash.result:
        Result update (more columns)
      mysql-test/r/rpl_flush_log_loop.result:
        Result update (more columns)
      mysql-test/r/rpl_log.result:
        Result update (more columns)
      mysql-test/r/rpl_log_pos.result:
        Result update (more columns)
      mysql-test/r/rpl_redirect.result:
        Result update (more columns)
      mysql-test/r/rpl_replicate_do.result:
        Result update (more columns)
      mysql-test/r/rpl_rotate_logs.result:
        Result update (more columns)
      mysql-test/t/rpl_replicate_do.test:
        Result update (more columns)
      sql/slave.cc:
        Print replicate_*_table options in SHOW SLAVE STATUS
      sql/slave.h:
        two functions to make a string of replicate_*_table lists.
      dae34fb6
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · a80c5a9c
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.2way
      
      
      a80c5a9c
    • unknown's avatar
      SCRUM - adding client into embedded server · 41e77ddf
      unknown authored
      error handling fixed
      fetch_lengths made to work differently in embedded and client cases
      
      
      include/mysql.h:
        removed 'embedded' error containers - they're unnecessary now
        added declarations for fetch_lengths to be 'virtual'
      include/sql_common.h:
        fetch_lengths declaration removed
      libmysql/libmysql.c:
        implementations for fetch_lengths to be 'virtual' added
      libmysqld/lib_sql.cc:
        error informations now is moved from thd->net to mysql-net
      libmysqld/libmysqld.c:
        error data is in mysql->net now
      sql-common/client.c:
        we have to return old fetch_lengths implementation for 'client' case
      sql/protocol.cc:
        handling of sqlstate for embedded library added
      41e77ddf
  10. 22 Jul, 2003 5 commits
  11. 21 Jul, 2003 2 commits