1. 20 Aug, 2003 1 commit
    • unknown's avatar
      First commit for fixing BUG#1100 · 1542fffb
      unknown authored
      "LOAD DATA INFILE is badly filtered by binlog-*-db rules".
      There will probably be a second final one to merge Dmitri's changes
      to rpl_log.result and mine.
      2 new tests:
      rpl_loaddata_rule_m : test of logging of LOAD DATA INFILE when the master has binlog-*-db rules,
      rpl_loaddata_rule_s : test of logging of LOAD DATA INFILE when the slave has binlog-*-db rules and --log-slave-updates.
      
      
      mysql-test/r/rpl_loaddata.result:
        Test that logging of LOAD DATA INFILE is done on the slave
      mysql-test/t/rpl_loaddata.test:
        Test that logging of LOAD DATA is done on the slave
      sql/log.cc:
        debug info
      sql/log_event.cc:
        * Append_block, Exec_load and Delete_file now have a member 'db' like Create_file.
        This member is filled by mysql_load(). It is used for filtering by binlog-*-db rules,
        that's all. It's not written to the binlog, and so can't be read from the binlog.
        In other words, that's temporary info which is stored in the event and lost when
        it is written and deleted.
        * Better error messages in Append_block et al. events.
        * The slave now logs (log-slave-updates) the Create_file et al. events in mysql_load()
        (they are not directly copied from the events in the relay log, because this
        prevented filtering by binlog-*-db rules). Before, mysql_load() in the slave
        did no logging, now it does the logging, as in any regular thread.
      sql/log_event.h:
        New member 'db' for Append_block et al. events.
      sql/slave.cc:
        Removed useless code. Why was it useless:
        - CREATE_FILE_EVENT is not defined in 3.23. It appeared in 4.0.
        - in queue_old_event(), which is called only if the master is 3.23, we had a
        case CREATE_FILE_EVENT:
        so this case can be removed.
        - this case was the only caller of process_io_create_file() so this function
        can be removed.
      sql/sql_load.cc:
        Pass the db to events, so that they can be well filtered.
      sql/sql_repl.cc:
        Pass the db to events so that they can be well filtered.
      1542fffb
  2. 19 Aug, 2003 8 commits
    • unknown's avatar
      Use my_b_append instead of my_b_write on a SEQ_READ_APPEND cache, when we write · d43a347d
      unknown authored
      the first 4 bytes of the relay log. Indeed comments in mysys/mf_iocache.c 
      say we must always use my_b_append for such a cache.
      This *could* avoid a very rare assertion failure which is: 
      030524 19:32:38  Slave SQL thread initialized, starting replication in log 'FIRST' at position 0, relay log '/
      users/gbichot/4.1.1/mysql-test/var/log/slave-relay-bin.000001' position: 4
      030524 19:32:38  next log '/users/gbichot/4.1.1/mysql-test/var/log/slave-relay-bin.000002' is currently active
      mysqld: mf_iocache.c:701: _my_b_seq_read: Assertion `pos_in_file == info->end_of_file' failed.
      and which seemed to happen always when the SQL thread and/or the I/O thread
      were at position 4 in a relay log.
      
      
      include/my_sys.h:
        moving a function from log_event.cc so that it can be widely used
      mysys/mf_iocache.c:
        moving a function from log_event.cc so that it can be widely used
      sql/log.cc:
        my_b_write should not be used on a SEQ_READ_APPEND cache, one should use my_b_append
        (otherwise there could be some locking problems).
      sql/log_event.cc:
        moved to mysys/mf_iocache.c for wider use.
        A typo.
      d43a347d
    • unknown's avatar
      Fix for BUG#1096 which is: · fe0e5464
      unknown authored
      "mysqlbinlog does not comment the original LOAD DATA INFILE if it has a "use xx""
      
      
      client/mysqlbinlog.cc:
        a comment
      sql/log_event.cc:
        in mysqlbinlog we want to have a leading '#' before LOAD DATA INFILE when we
        print a Create_file event.
        This was not done properly when the query had *2* lines: only the "use db" got
        commented.
        To fix this I had to add an argument to Load_log_event::print, it could not be
        handled in Create_file_log_event::print alone.
      sql/log_event.h:
        prototype
      fe0e5464
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 · 4392456b
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.0
      
      
      4392456b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 245da393
      unknown authored
      into mashka.mysql.fi:/home/my/mysql-4.0
      
      
      245da393
    • unknown's avatar
      Fixes for BUG#1091,1092,1093. Synopsis of these bugs: · c7578701
      unknown authored
      mysqlbinlog segfaults if --position is just before Exec_load event
      mysqlbinlog prints uncommented warnings if --database and compiled with debug
      mysqlbinlog --database does not filter LOAD DATA INFILE
      
      
      client/mysqlbinlog.cc:
        * Don't stop in Append_block when there is no Create_file. Just print a warning.
        * Test LOAD DATA (Create_file) against --database.
        * Don't print "no skip" when you don't skip an event when using --database (it
        causes syntax errors in 'mysql').
        * Print a warning in Exec_load if there is no Create_file.
      c7578701
    • unknown's avatar
      Fix test case · de9a0cbe
      unknown authored
      de9a0cbe
    • unknown's avatar
      - Do-pkg can now create a separate package including a MySQL Startup Item · a8aaa3ef
      unknown authored
         for Mac OS X and add it to the installation Disk Image.
      
      
      Build-tools/Do-pkg:
         - added code to build the StartupItem PKG along with the MySQL PKG and
           add it to the resulting Disk Image (can be skipped with --skip-si)
         - lots of cleanups (use more builtin Perl functions instead of 
           subprocesses, enable a full dry run without errors)
      support-files/MacOSX/StartupItem.Info.plist:
         - removed IFPkgFlagOverwritePermissions and IFPkgFlagUseUserMask
      a8aaa3ef
    • unknown's avatar
      - Optimized and cleaned up the Do-rpm and Bootstrap Perl scripts · 9194f5ef
      unknown authored
       - Enhanced Do-rpm to support building RPMs with different compilers
         and options
      
      
      Build-tools/Bootstrap:
         - small optimization (use builtin Perl cwd() function instead of running
           "pwd" twice)
      Build-tools/Do-rpm:
         - added options to handle different compilers and compile flags (e.g. when
           compiling on IA64 using the Intel ecc compiler)
         - code cleanups (use more builtin Perl functions instead of forking
           subrocesses)
         - don't try to probe various distribution-specific RPM options - query rpm
           directly instead
         - Pass the MySQL version as an argument, not an option (as it's not
           optional anyway)
      9194f5ef
  3. 17 Aug, 2003 4 commits
  4. 16 Aug, 2003 1 commit
  5. 15 Aug, 2003 3 commits
    • unknown's avatar
      - Added some files to support-files/MacOSX to enable building the Mac OS X · 4363c28c
      unknown authored
         startup item: MySQL (the startup script), StartupItem.Description.plist,
         StartupItem.Info.plist (PKGMaker control files), StartupItem.postinstall
         (post-installation script for the Startup Item package)
       - modified support-files/MacOSX/Makefile.am to include the newly added files
         in the source distribution
      
      
      BitKeeper/etc/ignore:
        Added scripts/make_win_src_distribution to the ignore list
      support-files/MacOSX/Makefile.am:
        - added the Mac OS X StartupItem files to the source distribution
      4363c28c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 02d844ee
      unknown authored
      into mashka.mysql.fi:/home/my/mysql-4.0
      
      
      02d844ee
    • unknown's avatar
      Cleanups to recent patches · ccd82890
      unknown authored
      Fix packet error when using wrong GRANT command
      
      
      include/config-win.h:
        Changed back to test for HAVE_SETFILEPOINTER instead of operating system
      mysql-test/r/grant.result:
        Extra test to catch wrong packet bug
      mysql-test/t/grant.test:
        Extra test to catch wrong packet bug
      mysys/my_chsize.c:
        Cleanup
      sql/opt_range.cc:
        Fix to recent BETWEEN patch
      sql/sql_acl.cc:
        Fix packet error when using wrong GRANT command
      sql/sql_select.cc:
        Cleanups
        Added not critical out-of-memory check
      ccd82890
  6. 14 Aug, 2003 1 commit
  7. 13 Aug, 2003 10 commits
    • unknown's avatar
      make_win_src_distribution.sh: · 9ac61d15
      unknown authored
        Add --zip option for finer grain control over what package formats are created
      Bootstrap:
        Create both Windows source packages
      
      
      Build-tools/Bootstrap:
        Create both Windows source packages
      scripts/make_win_src_distribution.sh:
        Add --zip option for finer grain control over what package formats are created
      9ac61d15
    • unknown's avatar
      make_win_src_distribution.sh: · e4e8a2f3
      unknown authored
        'tools' contains intermediate files
      
      
      scripts/make_win_src_distribution.sh:
        'tools' contains intermediate files
      e4e8a2f3
    • unknown's avatar
      make_win_src_distribution.sh: · 88977ce1
      unknown authored
        Adding *.txt here didn't work well-- infolist.txt is in a path containing spaces
      
      
      scripts/make_win_src_distribution.sh:
        Adding *.txt here didn't work well-- infolist.txt is in a path containing spaces
      88977ce1
    • unknown's avatar
      make_win_src_distribution.sh: · 78b59b19
      unknown authored
        Clean up script, add needed modifications to generate a complete 4.0 Windows source package
      
      
      scripts/make_win_src_distribution.sh:
        Clean up script, add needed modifications to generate a complete 4.0 Windows source package
      78b59b19
    • unknown's avatar
      Merge build.mysql.com:/home/bk/mysql-4.0 · 8cc3906e
      unknown authored
      into build.mysql.com:/users/gweir/mysql-4.0
      
      
      8cc3906e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 5c9e0cdc
      unknown authored
      into mashka.mysql.fi:/home/my/mysql-4.0
      
      
      sql/sql_select.cc:
        Auto merged
      5c9e0cdc
    • unknown's avatar
      06451ae4
    • unknown's avatar
      Fixed typo in the Boostrap strip · c32ebf3a
      unknown authored
      
      Build-tools/Bootstrap:
         - fixed typo
      c32ebf3a
    • unknown's avatar
      make_win_src_distribution.sh: · 79158101
      unknown authored
        Copy some previously missed files
      
      
      scripts/make_win_src_distribution.sh:
        Copy some previously missed files
      79158101
    • unknown's avatar
      Bootstrap: · 7d6f4747
      unknown authored
        Corrections to Bootstrap for --win-dist
      
      
      
      Build-tools/Bootstrap:
        Corrections to for --win-dist
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      7d6f4747
  8. 12 Aug, 2003 11 commits
  9. 11 Aug, 2003 1 commit