1. 07 Nov, 2001 1 commit
    • unknown's avatar
      Portability fix. · d9555360
      unknown authored
      Fixed linking problem with InnoDB.
      
      
      BUILD/compile-alpha-cxx:
        Fix for using innodb
      acinclude.m4:
        Fix problem with linking mysqld after Heikkis last changes.
      client/mysql.cc:
        Fixed linking problem
      client/mysqlmanager-pwgen.c:
        Portability fix
      innobase/que/que0que.c:
        Removed some blanks
      myisam/ft_boolean_search.c:
        Portability fix
      myisam/sort.c:
        Portability fix
      mysys/queues.c:
        Portability fix
      strings/ctype-latin1_de.c:
        Portability fix
      tools/mysqlmanager.c:
        Portability fix
      d9555360
  2. 06 Nov, 2001 21 commits
    • unknown's avatar
      merge · 22e7f26e
      unknown authored
      
      innobase/include/srv0srv.h:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      innobase/srv/srv0srv.c:
        Auto merged
      innobase/srv/srv0start.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/ha_innobase.cc:
        Auto merged
      22e7f26e
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 · 8f9a5a9d
      unknown authored
      
      Docs/manual.texi:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      8f9a5a9d
    • unknown's avatar
      Portability fix · 285f6bb4
      unknown authored
      Cleanup typos (like SKIPP -> SKIP)
      
      
      BUILD/compile-alpha-cxx:
        Fix when using InnoDB
      Docs/manual.texi:
        FreeBSD note
      client/mysqlmanager-pwgen.c:
        Portability fix
      include/my_base.h:
        Cleanup typos
      isam/_dynrec.c:
        Cleanup typos
      isam/_packrec.c:
        Cleanup typos
      isam/create.c:
        Cleanup typos
      isam/pack_isam.c:
        Cleanup typos
      isam/test1.c:
        Cleanup typos
      isam/test2.c:
        Cleanup typos
      libmysql/manager.c:
        Portability fix
      myisam/ft_eval.c:
        Cleanup typos
      myisam/ft_test1.c:
        Cleanup typos
      myisam/mi_create.c:
        Cleanup typos
      myisam/mi_dynrec.c:
        Cleanup typos
      myisam/mi_packrec.c:
        Cleanup typos
      myisam/mi_test1.c:
        Cleanup typos
      myisam/mi_test2.c:
        Cleanup typos
      myisam/myisampack.c:
        Cleanup typos
      sql/field.cc:
        Cleanup typos
      sql/field.h:
        Cleanup typos
      sql/filesort.cc:
        Cleanup typos
      sql/gen_lex_hash.cc:
        Cleanup typos
      sql/ha_isam.cc:
        Cleanup typos
      sql/ha_myisam.cc:
        Cleanup typos
      sql/handler.h:
        Cleanup typos
      sql/hash_filo.h:
        Cleanup typos
      sql/item.h:
        Cleanup typos
      sql/item_cmpfunc.cc:
        Cleanup typos
      sql/item_strfunc.cc:
        Cleanup typos
      sql/key.cc:
        Cleanup typos
      sql/mysqld.cc:
        Cleanup typos
      sql/opt_range.cc:
        Cleanup typos
      sql/opt_sum.cc:
        Cleanup typos
      sql/sql_acl.cc:
        Cleanup typos
      sql/sql_class.h:
        Cleanup typos
      sql/sql_insert.cc:
        Cleanup typos
      sql/sql_lex.cc:
        Cleanup typos
      sql/sql_list.h:
        Cleanup typos
      sql/sql_load.cc:
        Cleanup typos
      sql/sql_parse.cc:
        Cleanup typos
      sql/sql_rename.cc:
        Cleanup typos
      sql/sql_select.cc:
        Cleanup typos
      sql/sql_string.cc:
        Cleanup typos
      sql/sql_yacc.yy:
        Fix bug in last changeset
      sql/structs.h:
        Cleanup typos
      sql/table.cc:
        Cleanup typos
      sql/time.cc:
        Cleanup typos
      sql/unireg.h:
        Cleanup typos
      285f6bb4
    • unknown's avatar
      dee891ca
    • unknown's avatar
      Added missing mysqlbinlog to binary distributions. · a70d567d
      unknown authored
      Applied patch to mysqlhotcopy
      
      
      myisam/mi_open.c:
        Fixed some purify warnings
      mysql-test/mysql-test-run.sh:
        Added --core as default to test suite
      scripts/make_binary_distribution.sh:
        Added missing mysqlbinlog
      scripts/mysqlhotcopy.sh:
        Applied patch with --record-log option
      sql/item_timefunc.cc:
        Fixed problem with SEC_TO_TIME() for long signed integers.
      a70d567d
    • unknown's avatar
      Added internal command \! to mysql client which can be used · 94e1b0fd
      unknown authored
      to execute system commands within the client in UNIX.
      
      
      client/mysql.cc:
        Added option to run shell commands from the mysql client (\!)
      94e1b0fd
    • unknown's avatar
      Merge stuff · d4ab8ed5
      unknown authored
      d4ab8ed5
    • unknown's avatar
      des_encrypt(), des_decrypt() functions added. Not finally ready yet, so I will clean it up later. · 41912624
      unknown authored
      
      sql/item_strfunc.cc:
        des_encrypt(), des_decrypt() functions added
      sql/item_strfunc.h:
        des_encrypt(), des_decrypt() functions added
      sql/lex.h:
        des_encrypt(), des_decrypt() functions added
      41912624
    • unknown's avatar
      cleanup · 58f53e00
      unknown authored
      58f53e00
    • unknown's avatar
      Merge · 9ddc8306
      unknown authored
      
      myisam/ft_boolean_search.c:
        SCCS merged
      9ddc8306
    • unknown's avatar
      ft boolean search by table scan; queue_fix() · 8fac9a27
      unknown authored
      
      include/queues.h:
        queue_fix() introduced
      myisam/ft_boolean_search.c:
        ft boolean search by table scan
      myisam/ft_parser.c:
        ft boolean search by table scan
      myisam/ft_update.c:
        ft boolean search by table scan
      myisam/ftdefs.h:
        ft boolean search by table scan
      mysql-test/r/fulltext_cache.result:
        ft boolean search by table scan
      mysql-test/t/fulltext_cache.test:
        ft boolean search by table scan
      mysys/queues.c:
        queue_fix() introduced
      8fac9a27
    • unknown's avatar
      Merge work.mysql.com:/home/bk/mysql-4.0 into black.box:/u/home/tim/my/4 · fb716979
      unknown authored
      
      Docs/manual.texi:
        Auto merged
      fb716979
    • unknown's avatar
      Merge · da298900
      unknown authored
      
      Docs/manual.texi:
        SCCS merged
      libmysql/libmysql.c:
        SCCS merged
      da298900
    • unknown's avatar
    • unknown's avatar
      Merge jamppa@work:/home/bk/mysql-4.0/ · 29e19f19
      unknown authored
      into hynda.mysql.fi:/data/my/bk/mysql-4.0-quick-fixes
      
      29e19f19
    • unknown's avatar
      Copyright fixups and typo. From Erik Grandstrom. · f2fb8f36
      unknown authored
      f2fb8f36
    • unknown's avatar
      Fixed a bug in mysql.cc · eab5a91e
      unknown authored
      
      client/mysql.cc:
        Fixed a bug with too early freeing for 'charsets_dir'.
      eab5a91e
    • unknown's avatar
      Merge arjen@work.mysql.com:/home/bk/mysql-4.0 · 80fabff0
      unknown authored
      into co3064164-a.bitbike.com:c:/home/mysql-4.0
      
      80fabff0
    • unknown's avatar
    • unknown's avatar
      Do not print a warning message when the server's character set is · 5b2e0c8c
      unknown authored
      not found by the client.  This is especially important for PHP, which
      only includes the latin1 character set in the bundled libmysql.
      
      
      libmysql/libmysql.c:
        Do not print a warning message when the server's character set is
        not found by the client.  (In this case, the client has always fallen
        back on the default character set - this change just turns off the
        warning.)
      mysys/charset.c:
        Pass flags in from the outside, instead of hard coding MY_WME, in
        add_charset().
      5b2e0c8c
    • unknown's avatar
      manual.texi Remove upper-case emphasis (e.g., NOT -> @strong{not}) · f1cd6731
      unknown authored
      
      Docs/manual.texi:
        Remove upper-case emphasis (e.g., NOT -> @strong{not})
      f1cd6731
  3. 05 Nov, 2001 14 commits
    • unknown's avatar
      Updated reserved words list (get rid of EVENTS). · db797031
      unknown authored
      db797031
    • unknown's avatar
      5c7aad77
    • unknown's avatar
      emove purify warnings · 6c8e3cd4
      unknown authored
      
      myisam/mi_open.c:
        Remove purify warnings
      mysql-test/t/rpl000016.test:
        Fix test case
      sql/sql_yacc.yy:
        Cleanup & remove purify warnings
      6c8e3cd4
    • unknown's avatar
      Added xml patch to mysqldump. · a6879a48
      unknown authored
      Made innodb to compile more cleanly with debugging options
      enabled. Fixed a few bugs and found a few possible bugs, which
      I hope Heikki will check. Comments needs to be fixed too. Some
      while() functions should be changed to do ... until for documenting
      purposes, because some of them must and will be processed at least
      once, or a variable would be used uninitialized.
      
      Regards,
      Jani
      
      
      client/mysqldump.c:
        Added xml output. Patch originally from Gary Huntress, but needed
        a some clean up.
      innobase/btr/btr0btr.c:
        cleaner compiling
      innobase/btr/btr0cur.c:
        cleaner compiling
      innobase/btr/btr0sea.c:
        cleaner compiling / found a bug ??
      innobase/buf/buf0buf.c:
        Fixed a bug.
      innobase/buf/buf0lru.c:
        Fixed a bug.
      innobase/data/data0data.c:
        cleaner compiling
      innobase/dict/dict0boot.c:
        cleaner compiling
      innobase/dict/dict0crea.c:
        cleaner compiling
      innobase/dict/dict0dict.c:
        cleaner compiling
      innobase/dict/dict0load.c:
        cleaner compiling
      innobase/eval/eval0eval.c:
        cleaner compiling / found a bug ??
      innobase/fil/fil0fil.c:
        cleaner compiling
      innobase/fsp/fsp0fsp.c:
        cleaner compiling
      innobase/ibuf/ibuf0ibuf.c:
        cleaner compiling
      innobase/include/btr0btr.ic:
        cleaner compiling
      innobase/include/buf0buf.ic:
        cleaner compiling
      innobase/include/dict0dict.ic:
        cleaner compiling
      innobase/include/ha0ha.ic:
        cleaner compiling
      innobase/include/row0mysql.ic:
        cleaner compiling
      innobase/include/row0vers.ic:
        cleaner compiling
      innobase/include/sync0rw.ic:
        cleaner compiling
      innobase/lock/lock0lock.c:
        cleaner compiling
      innobase/mem/mem0dbg.c:
        cleaner compiling
      innobase/mtr/mtr0mtr.c:
        cleaner compiling
      innobase/odbc/odbc0odbc.c:
        cleaner compiling
      innobase/os/os0thread.c:
        cleaner compiling
      innobase/page/page0cur.c:
        cleaner compiling. while() should be changed to do ... until
        for documenting purposes.
      innobase/page/page0page.c:
        cleaner compiling
      innobase/pars/pars0opt.c:
        cleaner compiling. while() should be changed to do ... until,
        because it will and must be processed at least once (for documenting
        purposes)
      innobase/pars/pars0pars.c:
        cleaner compiling
      innobase/que/que0que.c:
        cleaner compiling
      innobase/rem/rem0cmp.c:
        cleaner compiling
      innobase/rem/rem0rec.c:
        cleaner compiling
      innobase/row/row0ins.c:
        cleaner compiling
      innobase/row/row0mysql.c:
        cleaner compiling
      innobase/row/row0purge.c:
        cleaner compiling
      innobase/row/row0sel.c:
        cleaner compiling
      innobase/row/row0uins.c:
        cleaner compiling
      innobase/row/row0umod.c:
        cleaner compiling
      innobase/row/row0upd.c:
        cleaner compiling
      innobase/srv/srv0srv.c:
        cleaner compiling
      innobase/srv/srv0start.c:
        cleaner compiling
      innobase/sync/sync0arr.c:
        cleaner compiling
      innobase/sync/sync0rw.c:
        cleaner compiling
      innobase/sync/sync0sync.c:
        cleaner compiling
      innobase/trx/trx0purge.c:
        cleaner compiling. in theory this could also be a bug, although
        probably not. But the logic needs to be checked, it could be that
        these variables may be used uninitialized.
      innobase/trx/trx0rec.c:
        cleaner compiling
      innobase/trx/trx0roll.c:
        cleaner compiling
      innobase/trx/trx0trx.c:
        cleaner compiling
      innobase/trx/trx0undo.c:
        cleaner compiling
      a6879a48
    • unknown's avatar
      updated · 5b90a877
      unknown authored
      5b90a877
    • unknown's avatar
      Merge work.mysql.com:/home/bk/mysql-4.0 · 0aed5eae
      unknown authored
      into volk.internalnet:/home/tonu/mysql-4.0
      
      
      sql/sql_yacc.yy:
        Auto merged
      Docs/manual.texi:
        Auto merged
      0aed5eae
    • unknown's avatar
      sql_yacc.yy des_encrpyt · 1496f5af
      unknown authored
      
      sql/sql_yacc.yy:
        des_encrpyt
      1496f5af
    • unknown's avatar
      67033f1c
    • unknown's avatar
      Another typo fix. Thanks to Bejamin Pflugmann · 203162dd
      unknown authored
      203162dd
    • unknown's avatar
      Heaps of fixups for MGM/Kaj. · fc39328b
      unknown authored
      fc39328b
    • unknown's avatar
      Merge arjen@work.mysql.com:/home/bk/mysql-4.0 · 2af3b93e
      unknown authored
      into co3064164-a.bitbike.com:c:/home/mysql-4.0
      
      2af3b93e
    • unknown's avatar
    • unknown's avatar
    • unknown's avatar
      Make ft_xxx variables ulong to not break mysqld.cc init of variables. · 7fe05cc4
      unknown authored
      mysqltest: replace_result now also affects error messages
      
      
      client/mysqltest.c:
        replace_result now also affects error messages
      include/ft_global.h:
        Make variables ulong to not break mysqld.cc init of variables.
      myisam/ft_static.c:
        Make variables ulong to not break mysqld.cc init of variables.
      mysql-test/r/join.result:
        Fix for 64 bit systems
      mysql-test/t/join.test:
        Fix for 64 bit systems
      7fe05cc4
  4. 04 Nov, 2001 4 commits
    • unknown's avatar
      Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0 · 46e1a659
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      mysys/my_alloc.c:
        Auto merged
      46e1a659
    • unknown's avatar
      Fixes up things after merge from 3.23.44 · 62c7375d
      unknown authored
      Portability fixes.
      Don't delete temporary tables on FLUSH tables.
      
      
      client/client_priv.h:
        Fix after merge
      client/mysqldump.c:
        Fix after merge
      include/my_global.h:
        Change CMP -> CMP_NUM because CMP was used in other places
      include/violite.h:
        Added missing prototype
      myisam/ft_boolean_search.c:
        Removed warnings
      myisam/ft_nlq_search.c:
        Removed warnings
      myisam/mi_search.c:
        CMP -> CMP_NUM
      mysql-test/mysql-test-run.sh:
        Write all logs to log directory
      mysql-test/r/func_time.result:
        Fix test results after merge
      mysql-test/r/having.result:
        Fix test results after merge
      mysql-test/r/join.result:
        Fix test results after merge
      mysql-test/r/rpl000012.result:
        Fix test results after merge
      mysys/mf_iocache.c:
        Allow multiple call to end_iocache.
      sql/ha_innobase.cc:
        Removed possible problem with using uninitialized variable
      sql/log_event.cc:
        Don't delete temporary tables on FLUSH tables.
        (Needs to be fixed properly)
      62c7375d
    • unknown's avatar
      use local version when doing merge with 3.23.44 · ca133bc9
      unknown authored
      ca133bc9
    • unknown's avatar
      merge with 3.23.44 · 9facbc80
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      Docs/manual.texi:
        Auto merged
      include/my_base.h:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/join.test:
        Auto merged
      mysql-test/t/rpl000012.test:
        Auto merged
      BUILD/FINISH.sh:
        Auto merged
      BitKeeper/deleted/.del-db_ext.h~a1e210bbd0de0a48:
        Auto merged
      BitKeeper/deleted/.del-mutex_ext.h~f20f47ddc346598b:
        Auto merged
      BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
        Auto merged
      BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
        Auto merged
      Build-tools/Do-all-build-steps:
        Auto merged
      client/client_priv.h:
        Auto merged
      client/mysqladmin.c:
        Auto merged
      innobase/include/srv0srv.h:
        Auto merged
      innobase/include/univ.i:
        Auto merged
      innobase/log/log0log.c:
        Auto merged
      innobase/srv/srv0srv.c:
        Auto merged
      innobase/srv/srv0start.c:
        Auto merged
      isam/pack_isam.c:
        Auto merged
      libmysql_r/Makefile.am:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      mysql-test/t/having.test:
        Auto merged
      mysql-test/t/rpl000015-slave.sh:
        Auto merged
      mysql-test/t/rpl000016-slave.sh:
        Auto merged
      mysys/mf_cache.c:
        Auto merged
      mysys/mf_casecnv.c:
        Auto merged
      mysys/mf_tempfile.c:
        Auto merged
      readline/vi_mode.c:
        Auto merged
      strings/strto.c:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/ha_berkeley.cc:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/time.cc:
        Auto merged
      BUILD/SETUP.sh:
        Use -mcpu as default (safe for all x86 cpu's)
      client/mysqldump.c:
        Merge from 3.23.44
      configure.in:
        Update version number
      extra/resolveip.c:
        Portability fix
      9facbc80