1. 20 Aug, 2001 2 commits
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 · 8d982e76
      unknown authored
      into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
      
      
      8d982e76
    • unknown's avatar
      fixes in mysqltest and mysqlbinlog · 9326aa42
      unknown authored
      trying to understand why --bootstrap option does not create tables
      on disk, hope the problem will be fixed when I pull, if not will
      debug, but need to commit in order to pull
      
      
      client/mysqltest.c:
        added safe_connect() and chaned all calls to mysql_real_connect() to
        safe_connect()
      mysql-test/install_test_db.sh:
        more diagnostic
      sql/log_event.cc:
        fixed compile error in mysqlbinlog
      9326aa42
  2. 19 Aug, 2001 4 commits
    • unknown's avatar
      Add my_dup.c · f3171b49
      unknown authored
      
      sql/sql_parse.cc:
        cleanup
      f3171b49
    • unknown's avatar
      Fix of UNION code · cfdf5fee
      unknown authored
      Added heap_delete_table
      Added HA_EXTRA_PREPARE_FOR_DELETE
      Added and use my_dup() for faster open of tables.
      Removed not working no-mix-table-type
      
      
      BitKeeper/deleted/.del-=6~33f33b0a159dc5d5:
        Delete: =6
      heap/hp_clear.c:
        Cleanup
      heap/hp_close.c:
        Added delayed delete
      heap/hp_create.c:
        Added heap_delete_table
      heap/hp_delete.c:
        cleanup
      heap/hp_test2.c:
        Added heap_delete_table
      include/heap.h:
        Added heap_delete_table
      include/my_base.h:
        Added HA_EXTRA_PREPARE_FOR_DELETE
      include/my_sys.h:
        Adde my_dup and set_prealloc_root
      isam/extra.c:
        Added HA_EXTRA_PREPARE_FOR_DELETE
      myisam/mi_check.c:
        use my_dup
      myisam/mi_extra.c:
        use my_dup
      myisam/mi_open.c:
        use my_dup
      myisam/myisamchk.c:
        use my_dup
      myisam/myisamdef.h:
        use my_dup
      mysys/Makefile.am:
        my_dup
      mysys/hash.c:
        Add hash_replace
      mysys/mf_pack.c:
        cleanup
      mysys/my_alloc.c:
        Add set_prealloc_root
      mysys/my_fstream.c:
        cleanup
      mysys/my_lib.c:
        cleanup
      mysys/my_seek.c:
        cleanup
      sql/ha_heap.cc:
        Uses heap_delete_table()
      sql/mysqld.cc:
        Fix SIGHUP usage
        Remove no-mix-table-types
      sql/share/czech/errmsg.txt:
        new error message
      sql/share/danish/errmsg.txt:
        new error message
      sql/share/dutch/errmsg.txt:
        new error message
      sql/share/english/errmsg.txt:
        new error message
      sql/share/estonian/errmsg.txt:
        new error message
      sql/share/french/errmsg.txt:
        new error message
      sql/share/german/errmsg.txt:
        new error message
      sql/share/greek/errmsg.txt:
        new error message
      sql/share/hungarian/errmsg.txt:
        new error message
      sql/share/italian/errmsg.txt:
        new error message
      sql/share/japanese/errmsg.txt:
        new error message
      sql/share/korean/errmsg.txt:
        new error message
      sql/share/norwegian-ny/errmsg.txt:
        new error message
      sql/share/norwegian/errmsg.txt:
        new error message
      sql/share/polish/errmsg.txt:
        new error message
      sql/share/portuguese/errmsg.txt:
        new error message
      sql/share/romanian/errmsg.txt:
        new error message
      sql/share/russian/errmsg.txt:
        new error message
      sql/share/slovak/errmsg.txt:
        new error message
      sql/share/spanish/errmsg.txt:
        new error message
      sql/share/swedish/errmsg.txt:
        new error message
      sql/sql_base.cc:
        remove no-mix-table-type
      sql/sql_parse.cc:
        Fix UNION code
      cfdf5fee
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 · e704dd72
      unknown authored
      into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
      
      
      e704dd72
    • unknown's avatar
      make LOAD DATA INFILE replication work with multi-character · 87a85f7f
      unknown authored
      delimiters/starters/terminators
      
      started work on server management daemon
      
      
      mysql-test/r/rpl_log.result:
        fixed result
      sql/log_event.cc:
        make LOAD DATA INFILE replication
        work with multi-character delimiters/starters/terminators
      sql/log_event.h:
        make LOAD DATA INFILE replication
        work with multi-character delimiters/starters/terminators
      87a85f7f
  3. 18 Aug, 2001 1 commit
    • unknown's avatar
      New startup options and some cleanups · e3a9e7e4
      unknown authored
      
      BitKeeper/etc/ignore:
        Added =6 to the ignore list
      include/mysqld_error.h:
        Error message for no-mixing of table types..
      sql/mysql_priv.h:
        New option
      sql/mysqld.cc:
        New option
      sql/share/english/errmsg.txt:
        Error message for no-mixing of table types..
      sql/sql_base.cc:
        Checking of the mixing of table types
      sql/sql_parse.cc:
        some fixes
      e3a9e7e4
  4. 15 Aug, 2001 8 commits
  5. 14 Aug, 2001 6 commits
    • unknown's avatar
    • unknown's avatar
      Remove warnings and portability fixes · 410dd077
      unknown authored
      New global read lock code
      Fixed bug in DATETIME with WHERE optimization
      Made UNION code more general.
      
      
      include/global.h:
        Remove warning on Linux Alpha
      include/mysql_com.h:
        Move some C variables inside extern "C" block.
      include/mysqld_error.h:
        New error mesages
      myisam/mi_write.c:
        cleanup
      mysql-test/r/select.result:
        Fix because of table lists now always has a database argument.
      mysql-test/r/type_datetime.result:
        Test for bug with datetime and where optimization
      mysql-test/r/union.result:
        Updated result
      mysql-test/t/type_datetime.test:
        New test for datetime
      mysql-test/t/union.test:
        More testing of error conditions
      sql/item_sum.cc:
        Remove warnings on Linux Alpha
      sql/item_sum.h:
        Cleanup
      sql/lock.cc:
        Cleaned up global lock handling
      sql/log_event.cc:
        Removed default arguments from declarations (not allowed in cxx)
      sql/mysql_priv.h:
        New prototypes
      sql/mysqld.cc:
        Fix for global locks
      sql/opt_range.cc:
        Cleanup
      sql/share/czech/errmsg.txt:
        New errors
      sql/share/danish/errmsg.txt:
        New errors
      sql/share/dutch/errmsg.txt:
        New errors
      sql/share/english/errmsg.txt:
        New errors
      sql/share/estonian/errmsg.txt:
        New errors
      sql/share/french/errmsg.txt:
        New errors
      sql/share/german/errmsg.txt:
        New errors
      sql/share/greek/errmsg.txt:
        New errors
      sql/share/hungarian/errmsg.txt:
        New errors
      sql/share/italian/errmsg.txt:
        New errors
      sql/share/japanese/errmsg.txt:
        New errors
      sql/share/korean/errmsg.txt:
        New errors
      sql/share/norwegian-ny/errmsg.txt:
        New errors
      sql/share/norwegian/errmsg.txt:
        New errors
      sql/share/polish/errmsg.txt:
        New errors
      sql/share/portuguese/errmsg.txt:
        New errors
      sql/share/romanian/errmsg.txt:
        New errors
      sql/share/russian/errmsg.txt:
        New errors
      sql/share/slovak/errmsg.txt:
        New errors
      sql/share/spanish/errmsg.txt:
        New errors
      sql/share/swedish/errmsg.OLD:
        New errors
      sql/share/swedish/errmsg.txt:
        New errors
      sql/sql_acl.cc:
        Use thd->host_or_ip
      sql/sql_class.cc:
        Use new global lock code
      sql/sql_class.h:
        host_or_ip
      sql/sql_db.cc:
        host_or_ip
      sql/sql_delete.cc:
        Use now global lock code
      sql/sql_lex.h:
        Cleanup of not used states and variables
      sql/sql_parse.cc:
        Use now global locks.
        Made UNION code more general.
        Change to use thd->hosts_or_ip.
        TABLE_LIST now always has 'db' set.
      sql/sql_repl.cc:
        Portability fixes.
        Changed wrong usage of my_vsnprintf -> my_snprintf
      sql/sql_select.cc:
        Changes for UNION
      sql/sql_show.cc:
        Cleanup
      sql/sql_union.cc:
        Handle 'select_result' outside of mysql_union().
      sql/sql_yacc.yy:
        Fixes for union
      410dd077
    • unknown's avatar
      mysqlbinlog.cc #include <my_pthread.h> before thr_alarm.h · d49afa05
      unknown authored
      
      client/mysqlbinlog.cc:
        #include <my_pthread.h> before thr_alarm.h
      d49afa05
    • unknown's avatar
      manual.texi Updated InnoDB section to reflect rel. .41 · bb639d60
      unknown authored
      
      Docs/manual.texi:
        Updated InnoDB section to reflect rel. .41
      bb639d60
    • unknown's avatar
      audio completion notification · aaf71625
      unknown authored
      aaf71625
    • unknown's avatar
      fixed HUP bug, last fix was not complete · acc79d65
      unknown authored
      acc79d65
  6. 13 Aug, 2001 5 commits
    • unknown's avatar
      Merge work:/home/bk/mysql · e4190f34
      unknown authored
      into mysql.sashanet.com:/home/sasha/src/bk/mysql
      
      
      e4190f34
    • unknown's avatar
      Replaced @strong{MySQL} with MySQL · 577f5ea1
      unknown authored
      Replaced @strong{MySQL AB} with MySQL AB
      
      
      577f5ea1
    • unknown's avatar
      row0sel.c Fix a memory freeing bug when a row which contains an externally... · edccd23f
      unknown authored
      row0sel.c	Fix a memory freeing bug when a row which contains an externally stored long field in the middle of the row is fetched in a SELECT
      srv0start.c	Allow drive name followed by a ':' in a data file path
      ha_innobase.cc	Allow drive name followed by a ':' in a data file path
      
      
      sql/ha_innobase.cc:
        Allow drive name followed by a ':' in a data file path
      innobase/srv/srv0start.c:
        Allow drive name followed by a ':' in a data file path
      innobase/row/row0sel.c:
        Fix a memory freeing bug when a row which contains an externally stored long field in the middle of the row is fetched in a SELECT
      edccd23f
    • unknown's avatar
      Cleanups · 97250b9c
      unknown authored
      
      client/mysqltest.c:
        Made mysqltest compatible with 3.23
      sql/slave.cc:
        Marked removable code
      vio/viossl.c:
        change to use DBUG_ASSERT
      97250b9c
    • unknown's avatar
      Fix error messages after merge from 3.23 · 638a9678
      unknown authored
      
      include/mysqld_error.h:
        Fix error messages
      mysql-test/t/fulltext.test:
        Fixed wrong error numbers
      mysql-test/t/union.test:
        Update error numbers after merge with 3.23
      sql/share/czech/errmsg.txt:
        Fix of merge
      sql/share/danish/errmsg.txt:
        Updated error messages from 3.23
      sql/share/dutch/errmsg.txt:
        Updated error messages from 3.23
      sql/share/english/errmsg.txt:
        Updated error messages
      sql/share/estonian/errmsg.txt:
        Fix of merge
      sql/share/french/errmsg.txt:
        Fix of merge
      sql/share/german/errmsg.txt:
        Fix of merge
      sql/share/greek/errmsg.txt:
        Fix of merge
      sql/share/hungarian/errmsg.txt:
        Fix of merge
      sql/share/italian/errmsg.txt:
        Fix of merge
      sql/share/japanese/errmsg.txt:
        Fix of merge
      sql/share/korean/errmsg.txt:
        Fix of merge
      sql/share/norwegian-ny/errmsg.txt:
        Fix of merge
      sql/share/norwegian/errmsg.txt:
        Fix of merge
      sql/share/polish/errmsg.txt:
        Fix of merge
      sql/share/portuguese/errmsg.txt:
        Updated error messages
      sql/share/romanian/errmsg.txt:
        Fix of merge
      sql/share/russian/errmsg.txt:
        Fix of merge
      sql/share/slovak/errmsg.txt:
        Fix of merge
      sql/share/spanish/errmsg.txt:
        Fix of merge
      sql/share/swedish/errmsg.txt:
        Fix of merge
      638a9678
  7. 12 Aug, 2001 4 commits
    • unknown's avatar
      Monty, your comments ?? · 91df9462
      unknown authored
      
      mysql-test/t/union.test:
        A test case for :
        
        CREATE TABLE .. SELECT .... UNION SELECT ... UNION SELECT .....
        
        and
        
        INSERT INTO ... SELECT .... UNION SELECT ... UNION SELECT ....
        
        Monty, please let me know what changes do you want me to make. 
        I could not make both in the same function, as insert requires
        that table is open.
        
        Let me know what changes to make before I plunge into:
        
        EXPLAIN SELECT ... UNION ... SELECT ......
      91df9462
    • unknown's avatar
      Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 · 89b28ebd
      unknown authored
      into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
      
      
      BitKeeper/etc/ignore:
        auto-union
      sql/mysql_priv.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      89b28ebd
    • unknown's avatar
      Changes so that CREATE and INSERT work from UNION's · 02e0db5a
      unknown authored
      
      BitKeeper/etc/ignore:
        Added innobase/conftest.s1 innobase/conftest.subs sql/sql_select.cc.orig to the ignore list
      02e0db5a
    • unknown's avatar
      post-merge fixes to make it compile. It still fails the fulltext test, · 2aed7cf9
      unknown authored
       (wrong error code) but I'll push it so that Sergei could clean up
       my merge
      
      
      include/mysqld_error.h:
        fixed typo
      mysql-test/r/order_by.result:
        updated result for merged test
      sql/Makefile.am:
        put back sql_union.cc lost during merge
      sql/mysql_priv.h:
        restored variables lost in the merge
      sql/mysqld.cc:
        put back lost variable declarations
      sql/share/czech/errmsg.txt:
        merge fix
      sql/share/danish/errmsg.txt:
        merge fix
      sql/share/dutch/errmsg.txt:
        merge fix
      sql/share/english/errmsg.txt:
        merge fix
      sql/share/estonian/errmsg.txt:
        merge fix
      sql/share/french/errmsg.txt:
        merge fix
      sql/share/german/errmsg.txt:
        merge fix
      sql/share/greek/errmsg.txt:
        merge fix
      sql/share/hungarian/errmsg.txt:
        merge fix
      sql/share/italian/errmsg.txt:
        merge fix
      sql/share/japanese/errmsg.txt:
        merge fix
      sql/share/korean/errmsg.txt:
        merge fix
      sql/share/norwegian-ny/errmsg.txt:
        merge fix
      sql/share/norwegian/errmsg.txt:
        merge fix
      sql/share/polish/errmsg.txt:
        merge fix
      sql/share/portuguese/errmsg.txt:
        merge fix
      sql/share/romanian/errmsg.txt:
        merge fix
      sql/share/russian/errmsg.txt:
        merge fix
      sql/share/slovak/errmsg.txt:
        merge fix
      sql/share/spanish/errmsg.txt:
        merge fix
      sql/share/swedish/errmsg.txt:
        merge fix
      sql/sql_acl.cc:
        merge fix
      2aed7cf9
  8. 11 Aug, 2001 10 commits
    • unknown's avatar
      merged · c9dbb4b7
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      BitKeeper/etc/ignore:
        auto-union
      acinclude.m4:
        Auto merged
      BitKeeper/deleted/.del-rpc_server_ext.h~952741fb85de2b80:
        Auto merged
      client/mysqlbinlog.cc:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      sql-bench/Makefile.am:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      sql/sql_list.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      Docs/manual.texi:
        merge
      include/mysql_com.h:
        merge
      include/mysqld_error.h:
        merge
      mysql-test/install_test_db.sh:
        merge
      sql/mysql_priv.h:
        merge
      sql/mysqld.cc:
        merge
      sql/share/czech/errmsg.txt:
        merge
      sql/share/danish/errmsg.txt:
        merge
      sql/share/dutch/errmsg.txt:
        merge
      sql/share/english/errmsg.txt:
        merge
      sql/share/estonian/errmsg.txt:
        merge
      sql/share/french/errmsg.txt:
        merge
      sql/share/german/errmsg.txt:
        merge
      sql/share/greek/errmsg.txt:
        merge
      sql/share/hungarian/errmsg.txt:
        merge
      sql/share/italian/errmsg.txt:
        merge
      sql/share/japanese/errmsg.txt:
        merge
      sql/share/korean/errmsg.txt:
        merge
      sql/share/norwegian-ny/errmsg.txt:
        merge
      sql/share/norwegian/errmsg.txt:
        merge
      sql/share/polish/errmsg.txt:
        merge
      sql/share/portuguese/errmsg.txt:
        merge
      sql/share/romanian/errmsg.txt:
        merge
      sql/share/russian/errmsg.txt:
        merge
      sql/share/slovak/errmsg.txt:
        merge
      sql/share/spanish/errmsg.txt:
        merge
      sql/share/swedish/errmsg.txt:
        merge
      sql/sql_base.cc:
        merge
      sql/sql_table.cc:
        merge
      c9dbb4b7
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 · d7c5327d
      unknown authored
      into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      libmysql/libmysql.c:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      d7c5327d
    • unknown's avatar
      temp commit working on a merge · 7a4b7c4f
      unknown authored
      
      client/mysqlbinlog.cc:
        remove unused variables
      sql/log_event.h:
        fix bad merge
      7a4b7c4f
    • unknown's avatar
      Merge work:/home/bk/mysql · 23d5f3f9
      unknown authored
      into mysql.sashanet.com:/home/sasha/src/bk/mysql
      
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      client/mysqlbinlog.cc:
        Auto merged
      23d5f3f9
    • unknown's avatar
      Portability fix for windows · f6751dd8
      unknown authored
      
      Docs/manual.texi:
        Changelog
      f6751dd8
    • unknown's avatar
      Merge hundin:/my/mysql into bitch.mysql.fi:/my/mysql · 48d48eac
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      48d48eac
    • unknown's avatar
      delete generated files · cc32440c
      unknown authored
      
      BitKeeper/deleted/.del-rpc_server_ext.h~952741fb85de2b80:
        Delete: bdb/include/rpc_server_ext.h
      BitKeeper/deleted/.del-rpc_client_ext.h~85436ca9b5691338:
        Delete: bdb/include/rpc_client_ext.h
      BitKeeper/etc/ignore:
        added bdb/include/rpc_client_ext.h
      cc32440c
    • unknown's avatar
      ignore generated include file · 1e5b7a20
      unknown authored
      
      BitKeeper/etc/ignore:
        added include/widec.h
      1e5b7a20
    • unknown's avatar
      152de4fe
    • unknown's avatar
      Made SIGTERM safer for Solaris · cb1c0b08
      unknown authored
      
      BitKeeper/etc/ignore:
        added */*_pure_*warnings
      BUILD/compile-solaris-sparc:
        Optimized build for ultrasparc
      sql/mysqld.cc:
        Made SIGTERM safer for Solaris as it sometimes delivered a not catched
        signal during shutdown
      cb1c0b08