1. 01 Jun, 2001 20 commits
    • unknown's avatar
      sql/slave.cc · 20763b0d
      unknown authored
          fixed bad merge
      
      
      sql/slave.cc:
        fixed bad merge
      20763b0d
    • unknown's avatar
      Merge mysql.sashanet.com:/home/sasha/src/bk/mysql · 2c15fdb5
      unknown authored
      into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
      
      
      2c15fdb5
    • unknown's avatar
      d405cfb9
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 · e587f1cb
      unknown authored
      into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/slave.cc:
        Auto merged
      e587f1cb
    • unknown's avatar
      fixed new bug in fn_format() · dc1104c1
      unknown authored
      
      mysys/mf_format.c:
        fixed a typo bug
      dc1104c1
    • unknown's avatar
      merge · 9f0b7b7c
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      include/my_sys.h:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      sql/share/portuguese/errmsg.txt:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      9f0b7b7c
    • unknown's avatar
      worked around one bug in the new symlink code, but hit another · 3be9c739
      unknown authored
      test case included ( drop) - currently fails, along with rpl000009
      
      
      mysql-test/r/drop.result:
        new test
      mysql-test/t/drop.test:
        expose a bug in the new symlink table code
      sql/slave.cc:
        turn off symlink bit to avoid a bug
      sql/sql_repl.cc:
        turn off symlink bit to avoid a bug
      3be9c739
    • unknown's avatar
      Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql · 3e8412b8
      unknown authored
      
      Docs/manual.texi:
        Auto merged
      3e8412b8
    • unknown's avatar
      Fixed bug that caused client to hang because mysqld never did send an · 7c077e68
      unknown authored
      error message if the table open or the index creation failed.
      Updated portuguese error messages.
      Fix for OS/2 that affected CHECK TABLE.
      
      
      Docs/manual.texi:
        Changelog.
      libmysql/errmsg.c:
        Updated portuguese error messages
      mysys/my_copy.c:
        Fix for OS/2
      sql/net_pkg.cc:
        cleanup
      sql/share/portuguese/errmsg.txt:
        Updated portuguese error messages
      sql/slave.cc:
        Cleanup.
        Fixed bug that caused client to hang because mysqld never did
        send an error message if the table open or the index creation failed.
      sql/sql_parse.cc:
        Moved handling of 'no_send_ok' to fetch_nx_table.
      sql/sql_table.cc:
        Cleanup.
      7c077e68
    • unknown's avatar
      manual.texi Changed Jay Flaherty's email address. · 6c7dd045
      unknown authored
      
      Docs/manual.texi:
        Changed Jay Flaherty's email address.
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      6c7dd045
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 · 7f4df541
      unknown authored
      into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
      
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      sql/slave.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      7f4df541
    • unknown's avatar
      fixed bug in count(distinct) · 1a2b5bb0
      unknown authored
      
      BitKeeper/etc/ignore:
        Added bdb/include/rpc_server_ext.h to the ignore list
      1a2b5bb0
    • unknown's avatar
      Added --skip-symlinks · 455b6952
      unknown authored
      Don't force repair of tables that are not closed properly.
      
      
      Docs/manual.texi:
        Added information about symbolic links.
      include/my_sys.h:
        symbolic link support
      myisam/mi_check.c:
        Don't force repair of tables that are not closed properly.
      myisam/myisamchk.c:
        Version number change.
      mysys/my_static.c:
        symbolic link support
      mysys/my_symlink2.c:
        Disabling of symbolic link support
      sql/mysqld.cc:
        Disabling of symbolic link support
      455b6952
    • unknown's avatar
      Makefile.am removed automake complaints about "sqlobjects" · 14cc2b78
      unknown authored
      Makefile.shared	removed automake complaints about "sqlobjects"
      .del-violite.c~53d4251a69d3c	Delete: sql/violite.c
      
      
      BitKeeper/deleted/.del-violite.c~53d4251a69d3c:
        Delete: sql/violite.c
      libmysql/Makefile.shared:
        removed automake complaints about "sqlobjects"
      libmysql/Makefile.am:
        removed automake complaints about "sqlobjects"
      14cc2b78
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 · 9d7d92d9
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      include/my_sys.h:
        Auto merged
      libmysql/Makefile.shared:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      9d7d92d9
    • unknown's avatar
      Added support for symlinked tables. · e59d0778
      unknown authored
      myisamchk: Don't force a repair if the only problem was that the
      open count wasn't correct.
      Added missing error messages.
      
      
      include/my_sys.h:
        Cleanup comments
      libmysql/Makefile.shared:
        Added symlink library.
      myisam/mi_check.c:
        Added support for symlinked tables
      myisam/mi_delete_table.c:
        Added support for symlinked tables
      myisam/mi_open.c:
        Added support for symlinked tables
      myisam/mi_rename.c:
        Added support for symlinked tables
      myisam/myisamchk.c:
        Added support for symlinked tables.
        Don't force a repair if the only problem was that the open count
        wasn't correct.
      pstack/bucomm.c:
        use mkstemp() instead of mytemp()
      sql/ha_myisam.cc:
        Added support for symlinked tables
      sql/ha_myisam.h:
        Added support for symlinked tables
      sql/ha_myisammrg.cc:
        Added support for symlinked tables
      sql/handler.cc:
        Added support for symlinked tables
      sql/handler.h:
        Added support for symlinked tables
      sql/lex.h:
        Added support for symlinked tables
      sql/share/czech/errmsg.txt:
        Added missing error messages
      sql/share/danish/errmsg.txt:
        Added missing error messages
      sql/share/dutch/errmsg.txt:
        Added missing error messages
      sql/share/estonian/errmsg.txt:
        Added missing error messages
      sql/share/french/errmsg.txt:
        Added missing error messages
      sql/share/german/errmsg.txt:
        Added missing error messages
      sql/share/greek/errmsg.txt:
        Added missing error messages
      sql/share/hungarian/errmsg.txt:
        Added missing error messages
      sql/share/italian/errmsg.txt:
        Added missing error messages
      sql/share/japanese/errmsg.txt:
        Added missing error messages
      sql/share/korean/errmsg.txt:
        Added missing error messages
      sql/share/norwegian-ny/errmsg.txt:
        Added missing error messages
      sql/share/norwegian/errmsg.txt:
        Added missing error messages
      sql/share/polish/errmsg.txt:
        Added missing error messages
      sql/share/portuguese/errmsg.txt:
        Added missing error messages
      sql/share/romanian/errmsg.txt:
        Added missing error messages
      sql/share/russian/errmsg.txt:
        Added missing error messages
      sql/share/slovak/errmsg.txt:
        Added missing error messages
      sql/share/spanish/errmsg.txt:
        Added missing error messages
      sql/share/swedish/errmsg.OLD:
        Added missing error messages
      sql/share/swedish/errmsg.txt:
        Added missing error messages
      sql/sql_db.cc:
        Added support for symlinked tables
      sql/sql_parse.cc:
        Added support for symlinked tables
      sql/sql_table.cc:
        Added support for symlinked tables with ALTER TABLE
      sql/sql_yacc.yy:
        Added option to create symlinked tables.
      e59d0778
    • unknown's avatar
      Merge work.mysql.com:/home/bk/mysql · 2085b195
      unknown authored
      into work.mysql.com:/home/bk/mysql-4.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      Docs/manual.texi:
        Auto merged
      include/my_sys.h:
        Auto merged
      libmysql/Makefile.shared:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      2085b195
    • unknown's avatar
      Added ER_SAFE() for cases when the error message could be out of bands · 7032533d
      unknown authored
      
      sql/slave.cc:
        Cleanup up indentation.
        Change to use ER_SAFE() instead of ER().
      sql/unireg.h:
        Added ER_SAFE()
      7032533d
    • unknown's avatar
      24d065d9
    • unknown's avatar
      Added symlink support to mysys library. · b4773dc2
      unknown authored
      
      Docs/manual.texi:
        Link info change
      include/my_sys.h:
        Added functions for symlink support
      libmysql/Makefile.shared:
        Added mf_symlink.c to library.
      mysys/Makefile.am:
        Added functions for symlink support
      mysys/mf_same.c:
        cleanup
      mysys/my_symlink.c:
        Added functions for symlink support
      b4773dc2
  2. 31 May, 2001 17 commits
    • unknown's avatar
      Merge mysql.sashanet.com:/home/sasha/src/bk/mysql · 98026209
      unknown authored
      into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/slave.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      98026209
    • unknown's avatar
      fixed bug in CHANGE MASTER TO · a28d5ad9
      unknown authored
      a28d5ad9
    • unknown's avatar
      Merge work:/home/bk/mysql · 14dba1af
      unknown authored
      into mysql.sashanet.com:/home/sasha/src/bk/mysql
      
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      14dba1af
    • unknown's avatar
      deal with errno out of range when reading it from the master · 18da1d3f
      unknown authored
      
      sql/slave.cc:
        print expected error number
      sql/unireg.h:
        sanity check for errno range in ER(X)
      18da1d3f
    • unknown's avatar
      make vio compile · a2458dd7
      unknown authored
      
      BitKeeper/deleted/.del-rpc_server_ext.h~952741fb85de2b80:
        Delete: bdb/include/rpc_server_ext.h
      BitKeeper/deleted/.del-vio.h~c62fd2b86c03da7d:
        Delete: include/vio.h
      client/Makefile.am:
        Added libvio use
      include/mysql_com.h:
        Bugfix
      libmysql/net.c:
        mysql_com.h added to make it compile
      sql/mini_client.cc:
        mysql_com.h added to make it compile
      sql/mysql_priv.h:
        Changed place of inlude to make it compile.
      sql/net_serv.cc:
        mysql_com.h added to make it compile
      a2458dd7
    • unknown's avatar
      Merge tonu@work.mysql.com:/home/bk/mysql-4.0 · fb15124a
      unknown authored
      into hundin.mysql.fi:/home/tonu/mysql-4.0
      
      
      include/mysql_com.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      fb15124a
    • unknown's avatar
      Support for VIO library · 20d04c92
      unknown authored
      
      Makefile.am:
        Added vio
      include/mysql_com.h:
        Removed ancient defines from Vio++ times
      include/violite.h:
        Added vio
      libmysql/Makefile.shared:
        Removed sqlobject line with violite.lo
      libmysql/libmysql.c:
        Openssl stuff & sons
      sql/Makefile.am:
        Added vio
      sql/mini_client.cc:
        Added vio
      sql/mysqld.cc:
        Added vio
      sql/net_serv.cc:
        Added vio
      sql/sql_parse.cc:
        Added vio
      vio/Makefile.am:
        Removed C++ stuff
      vio/vio.c:
        st_vio -> Vio
      vio/viosocket.c:
        st_vio -> Vio
      vio/viossl.c:
        st_vio -> Vio
      vio/viosslfactories.c:
        vio.h-> violite.h
      20d04c92
    • unknown's avatar
      sync0sync.ic Had deleted inadvertently lock word = 0 from the non-gcc+i86 case... · a9642208
      unknown authored
      sync0sync.ic	Had deleted inadvertently lock word = 0 from the non-gcc+i86 case in mutex_reset_lock_word
      
      
      innobase/include/sync0sync.ic:
        Had deleted inadvertently lock word = 0 from the non-gcc+i86 case in mutex_reset_lock_word
      a9642208
    • unknown's avatar
      sync0sync.ic Use XCHG also to reset the mutex lock word: it makes a... · 7176e43d
      unknown authored
      sync0sync.ic	Use XCHG also to reset the mutex lock word: it makes a serialization point to code on Intel and gives more safety
      
      
      innobase/include/sync0sync.ic:
        Use XCHG also to reset the mutex lock word: it makes a serialization point to code on Intel and gives more safety
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      7176e43d
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 · ef678c6a
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      ef678c6a
    • unknown's avatar
      Removed compiler warnings. · d9a9f38e
      unknown authored
      Added preliminary handling of symlinks in MyISAM.
      When using myisamchk to check tables with --force, don't repair
      tables that are marked as 'not closed' if they are ok.
      Change fn_format() to use my_real_path and my_symlink
      
      
      include/myisam.h:
        Added handling of symlinks
      myisam/ft_boolean_search.c:
        cleanup
      myisam/ft_dump.c:
        cleanup
      myisam/mi_check.c:
        Added handling of symlinks.
        When using check and --force, don't repair tables that are marked
        as 'not closed' if they are ok.
      myisam/mi_create.c:
        Added handling of symlinks.
      myisam/mi_dbug.c:
        Added handling of symlinks.
      myisam/mi_info.c:
        Added handling of symlinks.
      myisam/mi_open.c:
        Added handling of symlinks.
      myisam/mi_search.c:
        cleanup
      myisam/myisamchk.c:
        Added handling of symlinks.
      myisam/myisamdef.h:
        Added handling of symlinks.
      myisam/myisamlog.c:
        Fixed bug when using new trees
      myisam/myisampack.c:
        cleanup
      mysys/mf_cache.c:
        cleanup
      mysys/mf_format.c:
        Change to use my_real_path and my_symlink
      mysys/my_alloc.c:
        cleanup
      BitKeeper/etc/ignore:
        Added libmysqld/sql_command libmysqld/backup_dir libmysqld/simple-test to the ignore list
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      d9a9f38e
    • unknown's avatar
      merge · e6ecbfd6
      unknown authored
      
      BitKeeper/triggers/post-commit:
        Auto merged
      acinclude.m4:
        Auto merged
      configure.in:
        Auto merged
      Docs/manual.texi:
        Auto merged
      include/my_sys.h:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/share/estonian/errmsg.txt:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      e6ecbfd6
    • unknown's avatar
      Fixed typo from last checkin · 8c824491
      unknown authored
      
      Docs/manual.texi:
        Changelog
      8c824491
    • unknown's avatar
      Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql · b369c09d
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      configure.in:
        Auto merged
      Docs/manual.texi:
        Auto merged
      b369c09d
    • unknown's avatar
      Added functions for symbolic link handling to make it possible to · b6cae0f6
      unknown authored
      backport things from 4.0. This is safe as the functions are not used!
      Fixed bug in new mutex handling in InnoDB
      Make allow_break() and dont_break() defines.
      
      
      Docs/manual.texi:
        Remove -fomit-frame-pointer from default binaries
      configure.in:
        Use -lcma library on HPUX
      include/my_sys.h:
        Added functions for symbolic link handling to make it possible to
        backport things from 4.0. (This is safe as the functions are not used!)
      include/mysys_err.h:
        Error messages for symlink functions.
      innobase/include/sync0sync.ic:
        Fixed bug in new mutex handling
      mysys/Makefile.am:
        Symlink handling
      mysys/errors.c:
        Symlink handling
      mysys/mf_brkhant.c:
        Make allow_break() and dont_break() defines.
      sql/sql_select.h:
        Fix for Intel compiler.
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      b6cae0f6
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 · a14542a6
      unknown authored
      into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
      
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      a14542a6
    • unknown's avatar
      A slave now can optionally register with the master providing the · ecba7868
      unknown authored
      info on how to connect to the slave for the clients that connect to
      the master, but would like to know where the slaves are
      
      
      include/mysql_com.h:
        register slaves
      mysql-test/mysql-test-run.sh:
        parameters to test slave registration
      mysql-test/r/rpl000002.result:
        test of slave registration
      mysql-test/t/rpl000002.test:
        test slave registration
      sql/mysql_priv.h:
        slave registration
      sql/mysqld.cc:
        slave registration
      sql/slave.cc:
        slave registration
      sql/slave.h:
        slave registration
      sql/sql_lex.h:
        slave registration
      sql/sql_parse.cc:
        slave registration
      sql/sql_repl.cc:
        slave registration
      sql/sql_repl.h:
        slave registration
      sql/sql_yacc.yy:
        slave registration
      ecba7868
  3. 30 May, 2001 3 commits