1. 19 Jun, 2003 4 commits
  2. 18 Jun, 2003 6 commits
    • unknown's avatar
      - added sql-common subdirectory and sql_common.h to source distribution · 4e115621
      unknown authored
      
      Makefile.am:
         - added sql-common directory to distribution
      configure.in:
         - minor fixes
         - added sql-common/Makefile to AC_OUTPUT
      include/Makefile.am:
         - added sql_common.h to distribution
      4e115621
    • unknown's avatar
      Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 · 366089da
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      366089da
    • unknown's avatar
      INSTALL-WIN-SOURCE: · a4ab246a
      unknown authored
        More edits to INSTALL-WIN-SOURCE.
      
      
      INSTALL-WIN-SOURCE:
        More edits to INSTALL-WIN-SOURCE.
      a4ab246a
    • unknown's avatar
      Merge · cca4d5c3
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      cca4d5c3
    • unknown's avatar
      triggers magic · c1aea8e8
      unknown authored
      enforce REAL_EMAIL
      
      
      BitKeeper/deleted/.del-post-incoming~9f2168f531f09f3b:
        Delete: BitKeeper/triggers/post-incoming
      BitKeeper/deleted/.del-post-outgoing~1dd3d8f0f6e8f3cd:
        Delete: BitKeeper/triggers/post-outgoing
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      c1aea8e8
    • unknown's avatar
      Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 · 09cea5b6
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      09cea5b6
  3. 17 Jun, 2003 4 commits
  4. 16 Jun, 2003 1 commit
  5. 15 Jun, 2003 8 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · 4537f15b
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      sql/sql_yacc.yy:
        Auto merged
      4537f15b
    • unknown's avatar
      Add missing defines · 2b763eae
      unknown authored
      2b763eae
    • unknown's avatar
      bad merge fixed · 47d97685
      unknown authored
      
      mysql-test/r/fulltext.result:
        test for CREATE FULLTEXT INDEX
      mysql-test/t/fulltext.test:
        test for CREATE FULLTEXT INDEX
      47d97685
    • unknown's avatar
      merge · 4e82116e
      unknown authored
      
      sql-common/client.c:
        Auto merged
      scripts/mysql_install_db.sh:
        Use local version
      4e82116e
    • unknown's avatar
      Fix for compilation error. · fff9d1cd
      unknown authored
      Compiler can signal error when init_sigpipe_variables expands as empty place.
      Had to remove all semicolons after init_sigpipe_variables
      
      
      libmysql/client_settings.h:
        semicolon added
      sql-common/client.c:
        we don't need semicolons after init_sigpipe_variables
      fff9d1cd
    • unknown's avatar
      Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 · 10051610
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
      
      10051610
    • unknown's avatar
      Fixes for make_win_src_distributions · 102ecc86
      unknown authored
      Removed compiler warnings
      
      
      scripts/make_win_src_distribution.sh:
        Added option --dirname
        Also copy sql-common directory
        Create mysql data files even if mysqld is not installed
      scripts/mysql_create_system_tables.sh:
        Update for usage with make_win_src_distribution
      scripts/mysql_install_db.sh:
        Update for usage with make_win_src_distribution
      sql-common/client.c:
        Portability fix
      sql/item_cmpfunc.cc:
        Removed compiler warning
      sql/sql_acl.cc:
        Indentation cleanup
        Removed compiler warning
      sql/sql_parse.cc:
        Removed compiler warning
      sql/sql_select.cc:
        Removed compiler warning
      sql/sql_yacc.yy:
        Removed compiler warning
      strings/ctype-utf8.c:
        Removed compiler warning
      102ecc86
    • unknown's avatar
      LAST_INSERT_ID()}will now return 0 if the last INSERT didn't insert any rows. · 5aee95d1
      unknown authored
      
      mysql-test/r/auto_increment.result:
        Update results after bug fix
      5aee95d1
  6. 14 Jun, 2003 3 commits
    • unknown's avatar
      fixed bug with './' prefix in mysql_install_db · 74cd07b1
      unknown authored
      
      scripts/mysql_install_db.sh:
        fixed bug with './' prefix
      74cd07b1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 6481edae
      unknown authored
      into narttu.mysql.fi:/my/mysql-4.1
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/r/type_blob.result:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      6481edae
    • unknown's avatar
      Cleanup after split of libmysql.c to client.c and libmysql.c. A 4.1... · cb9dfd2a
      unknown authored
      Cleanup after split of libmysql.c to client.c and libmysql.c.  A 4.1 master/slave will now use the 4.1 protocol
      Fixed wrong value for SQLSTATE_LENGTH
      Added CLIENT_REMEMBER_OPTIONS to mysql_real_connect()
      Changed mysql_port and mysql_unix_port to mysqld_xxxx
      
      
      client/mysql.cc:
        Removed valgrind & compiler warnings
      client/sql_string.h:
        Fix to remove valgrind warnings
      include/mysql.h:
        Added read_timeout and write_timeout to mysql options struct.
        This is to be used for slave when connection to master.
        code cleanup
      include/mysql_com.h:
        Fixed wrong value for SQLSTATE_LENGTH
        Added CLIENT_REMEMBER_OPTIONS
      include/sql_common.h:
        Cleanup after split of libmysql.c to client.c and libmysql.c
      include/sql_state.h:
        Removed default states
      libmysql/client_settings.h:
        Cleanup after split of libmysql.c to client.c and libmysql.c
      libmysql/libmysql.c:
        Cleanup after split of libmysql.c to client.c and libmysql.c
      mysql-test/r/type_blob.result:
        Update results after someone updated error messages without running tests
      mysys/charset.c:
        More debug information
      mysys/errors.c:
        Fixed wrong error message
      sql-common/client.c:
        Cleanup after split of libmysql.c to client.c and libmysql.c
      sql/Makefile.am:
        Added sql_client.cc
      sql/client_settings.h:
        Cleanup after split of libmysql.c to client.c and libmysql.c
      sql/log.cc:
        Changed mysql_port and mysql_unix_port to mysqld_xxxx
      sql/mysql_priv.h:
        Changed mysql_port and mysql_unix_port to mysqld_xxxx
      sql/mysqld.cc:
        Changed mysql_port and mysql_unix_port to mysqld_xxxx
      sql/protocol.cc:
        Fix for SQLSTATE_LENGTH
        Moved function to sql_client.c
      sql/repl_failsafe.cc:
        Cleanup after split of libmysql.c to client.c and libmysql.c
      sql/set_var.cc:
        Changed mysql_port and mysql_unix_port to mysqld_xxxx
      sql/slave.cc:
        Cleanup after split of libmysql.c to client.c and libmysql.c
      cb9dfd2a
  7. 13 Jun, 2003 9 commits
  8. 12 Jun, 2003 5 commits
    • unknown's avatar
      user change to avoid conflicts with user 'test' · 9ba894a6
      unknown authored
      
      mysql-test/t/rpl_temporary.test:
        user change to avoid conflicts with user 'test'
        (to which test connect.test gives password "gambling", so depending
        on the order of the tests, 'test' has password '' or 'gambling':
        better to use an unknown user which will be directed to ''@localhost
        with password always '').
      9ba894a6
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · 5bd3dfd9
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      5bd3dfd9
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 53a3b02d
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-4.1
      
      53a3b02d
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · 069d98db
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1
      
      069d98db
    • unknown's avatar
      See each file's changeset for details. · 817c329e
      unknown authored
      - Comments for future devs.
      - Start_log_event::exec_event() : when we hit it, do a rollback.
      - We don't need LOG_EVENT_FORCED_ROTATE_F.
      - Stop_log_event::exec_event() : when we hit it, we needn't clean anything.
      - Removed LOG_EVENT_TIME_F and LOG_EVENT_FORCED_ROTATE_F.
      - We don't need Stop events in the relay log.
      - Now filtering of server id is done in the I/O thread first.
      
      
      sql/log.cc:
        We don't need LOG_EVENT_FORCED_ROTATE_F
      sql/log_event.cc:
        - Comments for future devs.
        - Start_log_event::exec_event() : when we hit it, do a rollback. If the SQL
        thread was inside a transaction (for example, the master died while writing
        to the binlog, so did not commit (because we write to the binlog before committing),
        so will rollback), it's sensible to rollback. If we're not in a transaction,
        rollback will not hurt (it will do nothing).
        - We don't need LOG_EVENT_FORCED_ROTATE_F.
        - Stop_log_event::exec_event() : when we hit it, we needn't clean anything, because
        each threads has already written some cleaning statements (DROP TEMPORARY TABLE,
        DO RELEASE_LOCK); we still clean in Start_log_event::exec_event() (if 4.x).
      sql/log_event.h:
        - Comments for future devs.
        - Removed LOG_EVENT_TIME_F and LOG_EVENT_FORCED_ROTATE_F.
      sql/slave.cc:
        - We don't need Stop events in the relay log (see changeset's description about
        log_event.cc). So we can make event queuing (writing to the relay log) simpler.
        - Something that was marked TODO: now filtering of server id (if the server id
        of this event is the same as mine ignore it) is done in the I/O thread if
        the master is 4.x (it still also done in the SQL thread whatever the version of
        the master is, for safe upgrades). This saves disk space.
      sql/slave.h:
        We don't need master_info.ignore_stop_event anymore, as we don't write Stop_event
        to the relay log anymore.
      817c329e