1. 07 Nov, 2001 7 commits
  2. 06 Nov, 2001 16 commits
  3. 05 Nov, 2001 11 commits
    • unknown's avatar
      Updated reserved words list (get rid of EVENTS). · db797031
      unknown authored
      db797031
    • 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
      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
      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
    • unknown's avatar
      Fix error messages · 53eac7f4
      unknown authored
      mysqltest now also writes failed error messages to log
      
      
      Docs/manual.texi:
        Applied changes missed in last merge
      client/mysqltest.c:
        Write failed error messages to log.
        Remove space from start of line when doing 'eval'
      mysql-test/include/master-slave.inc:
        Fixed after adding output of error messages to mysqltest
      mysql-test/r/alter_table.result:
        Removed wrong space
      mysql-test/r/rpl000001.result:
        Removed wrong space
      mysql-test/r/rpl000003.result:
        Fixed after adding output of error messages to mysqltest
      mysql-test/r/rpl000015.result:
        Removed wrong space
      mysql-test/r/rpl000016.result:
        Removed wrong space
      mysql-test/t/drop.test:
        Change error numbers
      mysql-test/t/union.test:
        Change error numbers
      sql/share/czech/errmsg.txt:
        Fix error messages
      sql/share/danish/errmsg.txt:
        Fix error messages
      sql/share/english/errmsg.txt:
        Fix error messages
      sql/share/french/errmsg.txt:
        Fix error messages
      sql/share/german/errmsg.txt:
        Fix error messages
      sql/share/greek/errmsg.txt:
        Fix error messages
      sql/share/hungarian/errmsg.txt:
        Fix error messages
      sql/share/italian/errmsg.txt:
        Fix error messages
      sql/share/japanese/errmsg.txt:
        Fix error messages
      sql/share/korean/errmsg.txt:
        Fix error messages
      sql/share/norwegian-ny/errmsg.txt:
        Fix error messages
      sql/share/norwegian/errmsg.txt:
        Fix error messages
      sql/share/polish/errmsg.txt:
        Fix error messages
      sql/share/portuguese/errmsg.txt:
        Fix error messages
      sql/share/romanian/errmsg.txt:
        Fix error messages
      sql/share/slovak/errmsg.txt:
        Fix error messages
      sql/share/spanish/errmsg.txt:
        Fix error messages
      sql/share/swedish/errmsg.txt:
        Fix error messages
      sql/share/ukrainian/errmsg.txt:
        Fix error messages
      53eac7f4
  5. 03 Nov, 2001 2 commits
    • unknown's avatar
      merge · 063df98f
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      acinclude.m4:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      sql/share/french/errmsg.txt:
        Auto merged
      sql/share/german/errmsg.txt:
        Auto merged
      sql/share/romanian/errmsg.txt:
        Auto merged
      sql/share/ukrainian/errmsg.txt:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/share/czech/errmsg.txt:
        Auto merged
      sql/share/danish/errmsg.txt:
        Auto merged
      sql/share/english/errmsg.txt:
        Auto merged
      sql/share/greek/errmsg.txt:
        Auto merged
      sql/share/hungarian/errmsg.txt:
        Auto merged
      sql/share/italian/errmsg.txt:
        Auto merged
      sql/share/japanese/errmsg.txt:
        Auto merged
      sql/share/korean/errmsg.txt:
        Auto merged
      sql/share/norwegian-ny/errmsg.txt:
        Auto merged
      sql/share/norwegian/errmsg.txt:
        Auto merged
      sql/share/polish/errmsg.txt:
        Auto merged
      sql/share/portuguese/errmsg.txt:
        Auto merged
      sql/share/slovak/errmsg.txt:
        Auto merged
      sql/share/spanish/errmsg.txt:
        Auto merged
      sql/share/swedish/errmsg.txt:
        Auto merged
      Docs/manual.texi:
        Bad merge.
      include/mysqld_error.h:
        Merge with 3.23
      063df98f
    • unknown's avatar
      Added STDCALL to mysql_sever and mysql_thread variables · 7edaaf34
      unknown authored
      Merged error messages with 3.23.44
      Fixed bug with DATA DIRECTORY on windows
      
      
      Docs/internals.texi:
        Update coding policies
      Docs/manual.texi:
        Minor general corrections
      acinclude.m4:
        Fixed wrong cpu-test
      configure.in:
        Remove CPU test, because this makes unportable binaries.
      include/mysql.h:
        Added STDCALL to mysql_sever and mysql_thread variables
      include/mysqld_error.h:
        Merged error messages with 3.23.44
      libmysql/libmysql.c:
        Added STDCALL to mysql_sever and mysql_thread variables
      libmysqld/lib_sql.cc:
        Added STDCALL to mysql_sever and mysql_thread variables
      sql-bench/limits/db2.cfg:
        New limits file
      sql-bench/test-select.sh:
        Fixed bug in cache test
      sql/share/czech/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/danish/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/dutch/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/english/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/estonian/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/french/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/german/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/greek/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/hungarian/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/italian/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/japanese/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/korean/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/norwegian-ny/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/norwegian/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/polish/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/portuguese/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/romanian/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/russian/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/slovak/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/spanish/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/swedish/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/ukrainian/errmsg.txt:
        Merged error messages with 3.23.44
      sql/sql_parse.cc:
        Fix bug with DATA DIRECTORY on windows.
      sql/sql_select.cc:
        Cleanup
      7edaaf34