1. 24 Jul, 2003 4 commits
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 · ba375ff0
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.0
      
      ba375ff0
    • unknown's avatar
      Fix for BUG#858 "CHANGE MASTER forgets to update relay-log.info"; · d1fc0bae
      unknown authored
      just a flush_relay_log_info() at the end of CHANGE MASTER
      (there was already flush_master_info()).
      
      
      sql/sql_repl.cc:
        Comments.
        Flush relay-log.info after CHANGE MASTER, or the changes
        to the relay log parameters (relay log name and position, and
        the corresponding master's binlog name and position) will be
        lost if the slave mysqld is shutdown immediately after the 
        CHANGE MASTER (without the slave threads being started).
      d1fc0bae
    • unknown's avatar
      WL#1036 (print the db in slave error messages). · adedde52
      unknown authored
      I extended the task to cleaning error messages, making them look nicer,
      and making the output of SHOW SLAVE STATUS (column Last_error) be as complete
      as what's printed on the .err file;
      previously we would have, for a failure of a replicated LOAD DATA INFILE:
      - in the .err, 2 lines:
      "duplicate entry 2708 for key 1"
      "failed loading SQL_LOAD-5-2-2.info"
      - and in SHOW SLAVE STATUS, only:
      "failed loading SQL_LOAD-5-2-2.info".
      Now SHOW SLAVE STATUS will contain the concatenation of the 2 messages.
      
      
      sql/log_event.cc:
        Print the default database when replication stops because of an error. Previously, we had:
        "error "Duplicate entry 87987 for key 1", query 'insert into t values(87987)'", ie the db
        was not mentioned, making it hard for cases where the same table name is used in
        several databases.
        Lengthened some error messages (for failing replication of LOAD DATA: mention the table
        and the db).
        Changes so that SHOW SLAVE STATUS reports as complete errors as the .err file.
      sql/slave.cc:
        Removed a useless declaration (the rewrite_db() function is already declared in slave.h).
        Added missing ')' in error messages.
        Tried to make error messages look nicer (previously we had
        "do START SLAVE;, error_code=1062"
        now we'll have
        "do START SLAVE; . Error_code=1062".
        This form has been discussed, I agree it's no panacea, but it's still more readable
        like this. To be improved in the future :)
      sql/slave.h:
        declarations.
      adedde52
    • unknown's avatar
      ce977ef5
  2. 23 Jul, 2003 1 commit
  3. 22 Jul, 2003 6 commits
  4. 21 Jul, 2003 3 commits
  5. 19 Jul, 2003 2 commits
  6. 18 Jul, 2003 7 commits
  7. 17 Jul, 2003 1 commit
  8. 16 Jul, 2003 5 commits
  9. 15 Jul, 2003 4 commits
  10. 14 Jul, 2003 7 commits
    • unknown's avatar
      merge · 21721b97
      unknown authored
      
      mysql-test/r/rpl_max_relay_size.result:
        Auto merged
      21721b97
    • unknown's avatar
      Fixed wrong test in LOG::close · 462b47e2
      unknown authored
      Fixed test for binary build
      
      
      mysql-test/r/rpl_max_relay_size.result:
        Fixed test for binary build
      mysql-test/t/rpl_max_relay_size.test:
        Fixed test for binary build
      sql/log.cc:
        Fixed wrong test in close
      462b47e2
    • unknown's avatar
      Added missing --replace_result for ports in SHOW SLAVE STATUS. · ca7418c7
      unknown authored
      
      mysql-test/r/rpl_max_relay_size.result:
        result update
      mysql-test/t/rpl_max_relay_size.test:
        port-independent test
      ca7418c7
    • unknown's avatar
      errmsg.txt: · 792d66df
      unknown authored
        Correct a misleading error message about max row length
      
      
      sql/share/english/errmsg.txt:
        Correct a misleading error message about max row length
      792d66df
    • unknown's avatar
      ha_innodb.h: · 12ada73a
      unknown authored
        Revert the previous patch: MySQL would not allow creation of VARCHAR columns whose total max length is > 8000 bytes, though InnoDB can easily store them as trailing spaces are removed
      
      
      sql/ha_innodb.h:
        Revert the previous patch: MySQL would not allow creation of VARCHAR columns whose total max length is > 8000 bytes, though InnoDB can easily store them as trailing spaces are removed
      12ada73a
    • unknown's avatar
      ha_innodb.h: · 84c7130f
      unknown authored
        Fix wrong error message: If one tried to create table with a very big row len, MySQL claimed the max len is 64 kB for InnoDB, while it normally is 8000 bytes
      
      
      sql/ha_innodb.h:
        Fix wrong error message: If one tried to create table with a very big row len, MySQL claimed the max len is 64 kB for InnoDB, while it normally is 8000 bytes
      84c7130f
    • unknown's avatar
      Better fix for bug #791: At binlog rotation, INSERTs may not find their way into the binlog · 467e193a
      unknown authored
      
      mysql-test/t/rpl_flush_log_loop.test:
        Add timer to avoid problem when 'flush logs' is executed before we have read all data from master
      sql/log.cc:
        Better fix for bug #791:
        Mark log as LOG_TO_BE_OPENED instead of LOG_CLOSED when it's closed and opened.
      sql/mysqld.cc:
        Better startup message
      sql/slave.cc:
        Fix argument to close()
      sql/sql_class.h:
        Better handling of log.close()
      467e193a