Commit graph

30 commits

Author SHA1 Message Date
Kent Boortz
02e07e3b51 Updated/added copyright headers 2011-06-30 17:46:53 +02:00
Kent Boortz
be6c3fd8aa Merge 2010-12-29 01:26:31 +01:00
Kent Boortz
4acfdb9df1 Merge 2010-12-29 00:47:05 +01:00
Kent Boortz
85323eda8a - Added/updated copyright headers
- Removed files specific to compiling on OS/2
- Removed files specific to SCO Unix packaging
- Removed "libmysqld/copyright", text is included in documentation
- Removed LaTeX headers for NDB Doxygen documentation
- Removed obsolete NDB files
- Removed "mkisofs" binaries
- Removed the "cvs2cl.pl" script
- Changed a few GPL texts to use "program" instead of "library"
2010-12-28 19:57:23 +01:00
Davi Arnaut
76382d2746 Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled
Post-merge fix: remove --with-debug=full, it was only used for safemalloc.

BUILD/compile-pentium-mysqlfs-debug:
  Remove build script for a feature that is long gone.
2010-08-06 09:59:38 -03:00
unknown
6b69068d6d Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-27701
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-27701


BUILD/compile-pentium-debug:
  Auto merged
BUILD/compile-pentium-debug-max-no-ndb:
  Auto merged
BUILD/compile-pentium64-debug-max:
  Auto merged
BUILD/compile-pentium64-debug:
  Auto merged
BUILD/compile-pentium-debug-max:
  merge fix
2007-04-11 14:06:03 +02:00
unknown
9cc4031808 BUG#27701 Arguments to some compile-pentium* scripts were not properly passed to SETUP.sh. Besides the old way not working with some shells, single arguments that contained whitespace were also broken up. This patch tries to fix both errors.
BUILD/compile-pentium-debug-max-no-ndb:
  correctly pass arguments to sourced script
BUILD/compile-pentium-debug-max:
  correctly pass arguments to sourced script
BUILD/compile-pentium-debug:
  correctly pass arguments to sourced script
BUILD/compile-pentium64-debug-max:
  correctly pass arguments to sourced script
BUILD/compile-pentium64-debug:
  correctly pass arguments to sourced script
2007-04-10 17:50:43 +02:00
unknown
39104456f5 Merge mysql.com:/home/bar/mysql-5.0.b22378
into  mysql.com:/home/bar/mysql-5.1-new-rpl


strings/ctype-utf8.c:
  Auto merged
BUILD/compile-pentium-debug-max:
  After merge fix
2007-03-29 10:03:59 +05:00
unknown
b1c23f112f Bug#22378 Make error, strings/ctype-utf8.c, uni_plane undeclared
- Fixing utf8_general_cs according to recent changes.
- Compiling utf8_general_cs in pentium-debug-max configuration
  to avoid these problems in the future.


BUILD/compile-pentium-debug-max:
  Enable compiling of experimental collations in compile-pentium-debug-max
config/ac-macros/character_sets.m4:
  Adding hidden flag --with-experimental-collations,
  not seen in "configure --help".
strings/ctype-utf8.c:
  Compilation failure changes:
  catching up with previous character set changes:
  - uni_plane is now not a global variables
  - adding new parameter into my_strnncollsp_utf8_cs
  - adding my_strnxfrm_len into MY_COLLATION_HANDLER 
    for utf8_general_cs
2007-03-27 15:06:41 +05:00
unknown
73a66e27e6 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826


configure.in:
  Auto merged
dbug/dbug.c:
  Auto merged
include/my_sys.h:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/partition_info.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
BUILD/SETUP.sh:
  manual merge
BUILD/compile-pentium-debug-max:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
sql/ha_ndbcluster.h:
  manual merge
sql/ha_partition.cc:
  manual merge
sql/ha_partition.h:
  manual merge
sql/handler.h:
  manual merge
sql/share/errmsg.txt:
  manual merge
sql/sql_table.cc:
  manual merge
sql/unireg.cc:
  manual merge
2006-04-19 21:22:35 -04:00
unknown
bcb8188758 Implement --warning-mode in SETUP.sh. The value of the
argument can be either "pedantic" or "old" (actually, or anything
else). In case of "pedantic" mode, use -ansi -pedantic compilation
flags. Fix the build to compile in pedantic mode. (Version 3 of
the patch, with after-review fixes)


BUILD/SETUP.sh:
  Implement --warning-mode in SETUP.sh. The value of the
  argument can be either "pedantic" or "old" (actually, or anything
  else). In case of "pedantic" mode, use -ansi -pedantic compilation
  flags.
BUILD/compile-pentium-debug-max-no-embedded:
  Rename base_max_configs to base_no_embedded_configs
BUILD/compile-pentium-debug-max:
  Use double quotes around $@
BUILD/compile-pentium-valgrind-max:
  Pass command line arguments to SETUP.sh. Allows calling
  compile-pentium-valgrind-max --warning-mode=pedantic
include/my_global.h:
  Remove an unnecessary ifdef: -pedantic hides the system-wide
  definition of ulong on Linux. In case there is no -pedantic, 
  the system-wide definition is available and HAVE_ULONG is defined
  by configure.
2006-04-07 02:25:59 +04:00
unknown
d99350842a Remove dead code from BUILD/ scripts: $debug_extra_warnings is
never defined.
It was used at some point to add -Wuninitialized to debug flags, 
but not any more. If there is still need to add -Wunitialized,
it can be added directly to $global_warnings.


BUILD/compile-amd64-debug-max-no-ndb:
  Remove a no-op.
BUILD/compile-amd64-debug-max:
  Remove a no-op.
BUILD/compile-darwin-mwcc:
  Remove a no-op.
BUILD/compile-pentium-debug-max-no-embedded:
  Remove a no-op.
BUILD/compile-pentium-debug-max-no-ndb:
  Remove a no-op.
BUILD/compile-pentium-debug-max:
  Remove a no-op.
BUILD/compile-pentium-debug-openssl:
  Remove a no-op.
BUILD/compile-pentium-debug-yassl:
  Remove a no-op.
BUILD/compile-pentium-debug:
  Remove a no-op.
BUILD/compile-pentium-mysqlfs-debug:
  Remove a no-op.
BUILD/compile-pentium-valgrind-max:
  Remove a no-op.
BUILD/compile-pentium64-debug-max:
  Remove a no-op.
BUILD/compile-pentium64-debug:
  Remove a no-op.
BUILD/compile-pentium64-valgrind-max:
  Remove a no-op.
BUILD/compile-ppc-debug-max-no-ndb:
  Remove a no-op.
BUILD/compile-ppc-debug-max:
  Remove a no-op.
BUILD/compile-ppc-debug:
  Remove a no-op.
2006-04-05 17:50:33 +04:00
unknown
fb4bd32a37 Remove dead code from BUILD/ scripts.
BUILD/SETUP.sh:
  Remove dead options.
BUILD/compile-amd64-debug-max-no-ndb:
  Remove dead options.
BUILD/compile-amd64-debug-max:
  Remove dead options.
BUILD/compile-amd64-max:
  Remove dead options.
BUILD/compile-darwin-mwcc:
  Remove dead options.
BUILD/compile-pentium-debug-max-no-embedded:
  Remove dead options.
BUILD/compile-pentium-debug-max-no-ndb:
  Remove dead options.
BUILD/compile-pentium-debug-max:
  Remove dead options.
BUILD/compile-pentium-icc-valgrind-max:
  Remove dead options.
BUILD/compile-pentium-max:
  Remove dead options.
BUILD/compile-pentium-valgrind-max:
  Remove dead options. There is no ISAM any more.
BUILD/compile-pentium64-debug-max:
  Remove dead options.
BUILD/compile-pentium64-valgrind-max:
  Remove dead options. There is no ISAM any more.
BUILD/compile-ppc-debug-max-no-ndb:
  Remove dead options.
BUILD/compile-ppc-debug-max:
  Remove dead options.
BUILD/compile-ppc-max:
  Remove dead options.
2006-04-05 16:50:12 +04:00
unknown
e254606f0b WL #2826: Sixth step, made it work with test cases
BUILD/SETUP.sh:
  Fixed BUILD scripts
BUILD/compile-pentium-debug-max:
  Fixed BUILD scripts
sql/ha_partition.cc:
  Need to handle states differently when creating handler files
sql/mysql_priv.h:
  Some error inject fixes
sql/mysqld.cc:
  Some error inject fixes
sql/set_var.cc:
  Some error inject fixes
sql/sql_partition.cc:
  Fixing a bug with generate partition syntax
  A number of fixes
sql/sql_table.cc:
  Fix a few bugs
sql/table.cc:
  fix
2006-02-03 12:05:29 -05:00
unknown
520dffb520 WL 2826: First step in error handling of ALTER TABLE for partitioning
BUILD/SETUP.sh:
  Add possibility for BUILD scripts to add error inject flag
BUILD/compile-pentium-debug-max:
  Add error inject flag to this script
configure.in:
  Add handling of --with-error-inject in configure script
sql/ha_ndbcluster.cc:
  Add possibility to rename handler file
sql/ha_ndbcluster.h:
  Add possibility to rename handler file
sql/ha_partition.cc:
  Add possibility to rename handler file
sql/ha_partition.h:
  Add possibility to rename handler file
sql/handler.h:
  Add possibility to rename handler file
sql/mysql_priv.h:
  Add error inject macros
sql/mysqld.cc:
  Add error inject system variables
sql/set_var.cc:
  Add error inject system variables
sql/sql_class.h:
  Add error inject system variables
sql/sql_table.cc:
  Start modifying code for introducing table log, Step 1
sql/unireg.cc:
  Add rename flag to handler file call
sql/sql_partition.cc:
  Changes to ADD/DROP/CHANGE partitions
2006-02-01 10:06:07 +01:00
unknown
5cf29b3b60 Fixed bug detected by sp-tests
Cleanup during reviews of new pushed code


BUILD/compile-pentium-debug-max:
  Use --debug=full as default
BUILD/compile-pentium-debug:
  Use --debug=full as default
mysys/my_alloc.c:
  More debugging
sql/item_func.cc:
  Cleanup new code
  Don't call insert_id() for last_insert_id(value) to avoid side effects
sql/item_subselect.cc:
  Fixed DBUG output
sql/sp_head.cc:
  Simple cleanup
sql/sql_lex.cc:
  Moved usage of arguments first in lex_start to make their usage clearer
  Remove sl->expr_list.deleete_elements() becasue:
  - It didn't do anything (delete_elements on a list of list is a no-op operation)
  - The deleted for loop used SELECT_LEX elements that was allocated in mysql_new_select() in sp-head, but freed
  when sphead->mem_root was freed. (delete sphead doesn't remove used SELECT_LEX elements from the global all_selects_list)
sql/sql_parse.cc:
  More DBUG entries
2005-02-05 16:05:46 +02:00
unknown
98713d6482 Fix all BUILD/*max* scripts to use -DBIG_TABLES, like our real Max builds do.
(Simpler fix than last commit -- no need to mess with base_cxxflags.)


BUILD/compile-amd64-max:
  use $max_cflags
BUILD/compile-pentium-debug-max:
  use $max_cflags
BUILD/compile-pentium-debug-max-no-embedded:
  use $max_cflags
BUILD/compile-pentium-max:
  use $max_cflags
BUILD/compile-pentium-valgrind-max:
  use $max_cflags
BUILD/compile-ppc-debug-max:
  use $max_cflags
BUILD/compile-ppc-max:
  use $max_cflags
BUILD/compile-amd64-debug-max:
  use $max_cflags, remove unnecessary base_cxxflags stuff
2005-01-19 10:24:51 -08:00
unknown
77bba943cb Put flags for -max building in BUILD/SETUP.sh so they are consistent across
all architectures, and in sync with the flags used to build the MySQL Max
packages. Also back-port AMD64 build scripts from 5.0.


BUILD/SETUP.sh:
  Add $max_configs (and variants) and amd64_*
BUILD/compile-pentium-debug-max:
  Use $max_configs
BUILD/compile-pentium-debug-max-no-embedded:
  Use $max_no_es_configs
BUILD/compile-pentium-max:
  Use $max_configs
BUILD/compile-pentium-valgrind-max:
  Use $max_leave_isam_configs
BUILD/compile-ppc-debug-max:
  Use $max_configs
BUILD/compile-ppc-max:
  Use $max_configs
2005-01-13 09:05:23 -08:00
unknown
4bde9b834a - enabled compiling with NDB cluster in compile-pentium-debug-max
BUILD/compile-pentium-debug-max:
   - enable compiling with NDB cluster
2004-05-03 12:56:51 +02:00
unknown
a8aacf8764 merge with 4.0
BitKeeper/etc/logging_ok:
  auto-union
VC++Files/innobase/innobase.dsp:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-com0shm.c~6a16f0c3d81de1f:
  Auto merged
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
  Auto merged
extra/replace.c:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/btr/btr0pcur.c:
  Auto merged
innobase/btr/btr0sea.c:
  Auto merged
innobase/configure.in:
  Auto merged
innobase/data/data0data.c:
  Auto merged
innobase/dict/dict0boot.c:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/dict/dict0mem.c:
  Auto merged
innobase/ha/ha0ha.c:
  Auto merged
innobase/ha/hash0hash.c:
  Auto merged
innobase/include/btr0btr.ic:
  Auto merged
innobase/include/data0type.ic:
  Auto merged
innobase/include/dict0mem.h:
  Auto merged
innobase/include/log0log.ic:
  Auto merged
innobase/include/mach0data.ic:
  Auto merged
innobase/include/mtr0log.h:
  Auto merged
innobase/include/mtr0mtr.h:
  Auto merged
innobase/include/os0file.h:
  Auto merged
innobase/include/row0upd.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/sync0sync.h:
  Auto merged
innobase/include/trx0rseg.ic:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
innobase/mem/mem0dbg.c:
  Auto merged
innobase/mtr/mtr0log.c:
  Auto merged
innobase/mtr/mtr0mtr.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/page/page0cur.c:
  Auto merged
innobase/page/page0page.c:
  Auto merged
innobase/pars/lexyy.c:
  Auto merged
innobase/read/read0read.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/rem/rem0rec.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0purge.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/row/row0undo.c:
  Auto merged
innobase/row/row0upd.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/sync/sync0rw.c:
  Auto merged
innobase/thr/thr0loc.c:
  Auto merged
innobase/trx/trx0purge.c:
  Auto merged
innobase/trx/trx0rec.c:
  Auto merged
innobase/trx/trx0roll.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/trx/trx0undo.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/r/multi_update.result:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/r/rpl_error_ignored_table.result:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
mysys/mf_pack.c:
  Auto merged
mysys/my_getopt.c:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
tests/thread_test.c:
  Auto merged
client/mysqldump.c:
  Keep original indentation
mysql-test/r/merge.result:
  keep old file
scripts/mysql_fix_privilege_tables.sh:
  Keep old structure in merge with 4.0
sql/table.cc:
  merge with 4.0 + simple optimizations
2004-03-16 22:41:30 +02:00
unknown
221397cdbe Fixed memory leak in DROP DATABASE when using RAID tables (Bug #2882)
BUILD/compile-pentium-debug-max:
  Added --with-raid
configure.in:
  Removed -DFN_NO_CASE_SENCE for Mac OS X as this is not always true
mysql-test/install_test_db.sh:
  Added --skip-warnings
mysql-test/mysql-test-run.sh:
  Fixes to get --gdb and --ddd to work
mysql-test/r/lowercase_table2.result:
  Test for lower_case_table_names=2 and temporary tables
mysql-test/r/lowercase_table3.result:
  Fixed error message
mysql-test/r/multi_update.result:
  Test of behaviour of multi-table-delete and alias
mysql-test/t/lowercase_table2.test:
  Test for lower_case_table_names=2 and temporary tables
mysql-test/t/lowercase_table3.test:
  Fixed error
mysql-test/t/multi_update.test:
  Test of behaviour of multi-table-delete and alias (Bug #2940)
mysys/mf_iocache.c:
  Renamed _flush_io_cache to my_b_flush_io_cache
sql/ha_myisam.cc:
  Added comment
sql/lock.cc:
  Extra debugging
sql/log.cc:
  New parameter to flush_relay_log_info
sql/log_event.cc:
  New parameter to flush_relay_log_info
sql/mf_iocache.cc:
  Removed not used header files
sql/mysqld.cc:
  More debugging info
  Less warnings when run with --skip-warnings
sql/opt_range.cc:
  More debug information
sql/repl_failsafe.cc:
  New parameter to flush_relay_log_info
sql/slave.cc:
  First start SQL thread, then start IO thread. This fixed a raze condition in SLAVE START (Bug #2921)
  Ensure that we have a lock on the IO thread before flushing a relay log file that. The original code could core dump when a relay log rotated.
sql/slave.h:
  New parameter to flush_relay_log_info
sql/sql_base.cc:
  Added warning
sql/sql_handler.cc:
  Indentation fix
sql/sql_repl.cc:
  New parameter to flush_relay_log_info
sql/sql_select.cc:
  Fixed problem with deleting temporary tables when using lower_case_table_names=2. (Bug #2858)
sql/sql_table.cc:
  Fixed comment
sql/sql_yacc.yy:
  Removed compiler warning
include/my_sys.h:
  Fixed usage of unpack_filename
mysys/mf_pack.c:
  Changed unpack_filename() to return length of result string.
mysys/test_fn.c:
  Fixed usage of unpack_filename
sql/sql_db.cc:
  Fixed memory leak with raid tables
sql/table.cc:
  Fixed usage of unpack_filename
2004-03-10 13:46:11 +02:00
unknown
eaae714708 Added missing file keycache.h
BUILD/compile-pentium-debug-max:
  s
2003-11-21 12:22:51 +02:00
unknown
034b44cb9f Merge with 4.0.14
BitKeeper/etc/logging_ok:
  auto-union
scripts/make_win_src_distribution.old:
  Merge rename: scripts/make_win_src_distribution.sh -> scripts/make_win_src_distribution.old
BUILD/compile-pentium-debug-max:
  Auto merged
BitKeeper/deleted/.del-sel000001.result~383913ae4505ec86:
  Auto merged
BitKeeper/deleted/.del-sel000001.test~9567c1646058cc:
  Auto merged
Build-tools/Bootstrap:
  Auto merged
Build-tools/Do-compile:
  Auto merged
Docs/Makefile.am:
  Auto merged
client/get_password.c:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/perror.c:
  Auto merged
include/config-win.h:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/btr/btr0pcur.c:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/buf/buf0flu.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/include/buf0buf.h:
  Auto merged
innobase/include/log0recv.h:
  Auto merged
innobase/include/row0sel.h:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/ut0mem.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/mem/mem0pool.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/trx/trx0sys.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/ut/ut0mem.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_extra.c:
  Auto merged
myisam/mi_key.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
myisammrg/myrg_queue.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ctype_latin1_de.result:
  Auto merged
mysql-test/r/flush.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/grant_cache.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/rpl000018.result:
  Auto merged
mysql-test/r/rpl_insert_id.result:
  Auto merged
mysql-test/r/rpl_master_pos_wait.result:
  Auto merged
mysql-test/r/rpl_relayspace.result:
  Auto merged
mysql-test/r/select_safe.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/alias.test:
  Auto merged
mysql-test/t/ctype_latin1_de.test:
  Auto merged
mysql-test/t/fulltext_left_join.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/range.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl000018.test:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
mysql-test/t/sel000100.test:
  Auto merged
mysql-test/t/select_safe.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/mf_format.c:
  Auto merged
mysys/my_getopt.c:
  Auto merged
mysys/thr_lock.c:
  Auto merged
mysys/tree.c:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/nt_servc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/uniques.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
vio/viosocket.c:
  Auto merged
BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e:
  merge
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
  merge
acinclude.m4:
  Merge with 4.0 (openssl patch)
client/mysqlbinlog.cc:
  Merge with 4.0 in which we had added code from 4.1
  (We are basicly only using the 4.1 code here)
configure.in:
  Keep 4.1 file
heap/hp_open.c:
  merge with 4.0
include/my_base.h:
  merge with 4.0
include/my_global.h:
  merge with 4.0
include/mysqld_error.h:
  merge with 4.0
innobase/ha/ha0ha.c:
  merge with 4.0
  (Code should be same but we use indentaion from 4.0)
innobase/log/log0recv.c:
  merge with 4.0
libmysql/libmysql.c:
  Remove with 4.0 code that was ported from 4.1
libmysqld/lib_sql.cc:
  merge with 4.0
myisam/mi_open.c:
  Remove 4.0 specific code
myisam/myisamchk.c:
  merge with 4.0
myisammrg/myrg_rkey.c:
  merge with 4.0
mysql-test/r/alter_table.result:
  May need to be fixed after merge
mysql-test/r/create.result:
  May need to be fixed after merge
mysql-test/r/distinct.result:
  May need to be fixed after merge
mysql-test/r/drop.result:
  May need to be fixed after merge
mysql-test/r/fulltext.result:
  May need to be fixed after merge
mysql-test/r/func_set.result:
  May need to be fixed after merge
mysql-test/r/func_str.result:
  May need to be fixed after merge
mysql-test/r/func_test.result:
  May need to be fixed after merge
mysql-test/r/grant.result:
  May need to be fixed after merge
mysql-test/r/group_by.result:
  May need to be fixed after merge
mysql-test/r/handler.result:
  May need to be fixed after merge
mysql-test/r/heap.result:
  May need to be fixed after merge
mysql-test/r/innodb.result:
  May need to be fixed after merge
mysql-test/r/insert.result:
  May need to be fixed after merge
mysql-test/r/insert_select.result:
  May need to be fixed after merge
mysql-test/r/key_diff.result:
  May need to be fixed after merge
mysql-test/r/merge.result:
  May need to be fixed after merge
mysql-test/r/myisam.result:
  May need to be fixed after merge
mysql-test/r/order_by.result:
  May need to be fixed after merge
mysql-test/r/query_cache.result:
  May need to be fixed after merge
mysql-test/r/rpl_flush_log_loop.result:
  May need to be fixed after merge
mysql-test/r/rpl_loaddata.result:
  May need to be fixed after merge
mysql-test/r/rpl_log.result:
  May need to be fixed after merge
mysql-test/r/rpl_log_pos.result:
  May need to be fixed after merge
mysql-test/r/rpl_rotate_logs.result:
  May need to be fixed after merge
mysql-test/r/select.result:
  May need to be fixed after merge
mysql-test/r/union.result:
  May need to be fixed after merge
mysql-test/r/user_var.result:
  May need to be fixed after merge
mysql-test/t/alter_table.test:
  merge with 4.0
mysql-test/t/create.test:
  merge with 4.0
mysql-test/t/distinct.test:
  merge with 4.0
mysql-test/t/drop.test:
  merge with 4.0
mysql-test/t/flush.test:
  merge with 4.0
mysql-test/t/fulltext.test:
  merge with 4.0
mysql-test/t/func_set.test:
  merge with 4.0
mysql-test/t/func_str.test:
  merge with 4.0
mysql-test/t/func_test.test:
  merge with 4.0
mysql-test/t/grant.test:
  merge with 4.0
mysql-test/t/grant_cache.test:
  merge with 4.0
mysql-test/t/innodb.test:
  Add back EXPLAIN and SHOW KEYS statements, but make them independent of number of rows returned by InnoDB
mysql-test/t/insert.test:
  merge with 4.0
mysql-test/t/insert_select.test:
  merge with 4.0
mysql-test/t/merge.test:
  merge with 4.0
mysql-test/t/query_cache.test:
  merge with 4.0
mysql-test/t/rpl_flush_log_loop.test:
  merge with 4.0
mysql-test/t/rpl_loaddata.test:
  merge with 4.0
mysql-test/t/rpl_rotate_logs.test:
  merge with 4.0
mysql-test/t/select.test:
  merge with 4.0
mysql-test/t/symlink.test:
  merge with 4.0
mysql-test/t/union.test:
  merge with 4.0
mysys/charset.c:
  merge with 4.0
scripts/mysql_fix_privilege_tables.sh:
  merge with 4.0 (Add quoting for some variables)
sql/field.h:
  merge with 4.0
sql/ha_innodb.cc:
  merge with 4.0
sql/item_cmpfunc.cc:
  merge with 4.0
sql/item_cmpfunc.h:
  merge with 4.0
sql/item_func.h:
  merge with 4.0
sql/item_strfunc.cc:
  merge with 4.0
  Fixed null handling with ELT()
sql/item_timefunc.h:
  merge with 4.0
sql/lex.h:
  merge with 4.0
sql/log.cc:
  merge with 4.0
sql/log_event.cc:
  Merge with 4.0
  Cleanups:
  - Indentation
  - #endif comments
  - Replace strmov() with *pos++= for two byte strings
  - Moved variable declarations to start of functions
  - Merged identical code (LOAD_EVENT)
  - Added casts when subtracting pointers
  Did a full diff between this and 4.0 to ensure that the file is correct after merge.
sql/log_event.h:
  merge with 4.0
sql/mysql_priv.h:
  merge with 4.0
sql/mysqld.cc:
  merge with 4.0
sql/repl_failsafe.cc:
  merge with 4.0
sql/set_var.cc:
  merge with 4.0
sql/set_var.h:
  merge with 4.0
sql/share/czech/errmsg.txt:
  merge with 4.0
sql/share/danish/errmsg.txt:
  merge with 4.0
sql/share/dutch/errmsg.txt:
  merge with 4.0
sql/share/english/errmsg.txt:
  merge with 4.0
sql/share/estonian/errmsg.txt:
  merge with 4.0
sql/share/french/errmsg.txt:
  merge with 4.0
sql/share/german/errmsg.txt:
  merge with 4.0
sql/share/greek/errmsg.txt:
  merge with 4.0
sql/share/hungarian/errmsg.txt:
  merge with 4.0
sql/share/italian/errmsg.txt:
  merge with 4.0
sql/share/japanese/errmsg.txt:
  merge with 4.0
sql/share/korean/errmsg.txt:
  merge with 4.0
sql/share/norwegian-ny/errmsg.txt:
  merge with 4.0
sql/share/norwegian/errmsg.txt:
  merge with 4.0
sql/share/polish/errmsg.txt:
  merge with 4.0
sql/share/portuguese/errmsg.txt:
  merge with 4.0
sql/share/romanian/errmsg.txt:
  merge with 4.0
sql/share/russian/errmsg.txt:
  merge with 4.0
sql/share/slovak/errmsg.txt:
  merge with 4.0
sql/share/spanish/errmsg.txt:
  merge with 4.0
sql/share/swedish/errmsg.txt:
  merge with 4.0
sql/share/ukrainian/errmsg.txt:
  merge with 4.0
sql/slave.cc:
  Merge + some indentation fixes
sql/slave.h:
  merge with 4.0
sql/sql_acl.cc:
  merge with 4.0
  Some end space removal to make it easier to do future merges
sql/sql_acl.h:
  merge with 4.0
sql/sql_cache.cc:
  merge with 4.0
sql/sql_class.h:
  merge with 4.0
sql/sql_handler.cc:
  merge with 4.0
sql/sql_lex.cc:
  merge with 4.0
sql/sql_lex.h:
  merge with 4.0
sql/sql_parse.cc:
  merge with 4.0
sql/sql_repl.cc:
  merge with 4.0
sql/sql_select.cc:
  merge with 4.0
sql/sql_table.cc:
  merge with 4.0
sql/sql_union.cc:
  Merge with 4.0
  Note that I couldn't find out how to merge OPTION_FOUND_ROWS handling so this has to be fixed later
sql/sql_yacc.yy:
  merge with 4.0
  Removed end space to make merge easier
vio/Makefile.am:
  merge with 4.0
2003-08-11 22:44:43 +03:00
unknown
e224c1238d SET CHARACTER SET DEFAULT didn't work (Bug #462)
BUILD/compile-pentium-debug-max:
  Removed -DBIG_TABLES because of problems with gdb 5.3
sql/set_var.cc:
  SET CHARACTER SET DEFAULT didn't work
sql/set_var.h:
  SET CHARACTER SET DEFAULT didn't work
2003-06-29 12:58:43 +03:00
unknown
9f22d16669 Give warning if MySQL doesn't honor given storage engine
Allow syntax CREATE TABLE t1 (LIKE t2)


BUILD/compile-pentium-debug-max:
  Disable isam
BUILD/compile-pentium-valgrind-max:
  Disable isam
include/mysqld_error.h:
  New error
mysql-test/r/bdb.result:
  new error message
mysql-test/r/innodb.result:
  new error message
mysql-test/r/subselect.result:
  New test
mysql-test/r/variables.result:
  New test
mysql-test/r/warnings.result:
  Test of warning if MySQL creates table with another handler than specified
mysql-test/t/innodb.test:
  Added test case for derivied tables
mysql-test/t/subselect.test:
  New test
mysql-test/t/variables-master.opt:
  Fixed wrong parameter
mysql-test/t/warnings.test:
  Test if creating handler of not existing table type
sql/ha_isam.cc:
  Added option --skip-isam
sql/ha_isam.h:
  Added option --skip-isam
sql/handler.cc:
  Added option --skip-isam
sql/item.cc:
  Deleted probably wrong bug fix
sql/mysqld.cc:
  Added option --skip-isam
sql/share/czech/errmsg.txt:
  Added missing ','
sql/share/danish/errmsg.txt:
  Added missing ','
sql/share/dutch/errmsg.txt:
  Added missing ','
sql/share/english/errmsg.txt:
  Added missing ','
  changed table handler -> storage engine
sql/share/estonian/errmsg.txt:
  Added missing ','
sql/share/french/errmsg.txt:
  Added missing ','
sql/share/german/errmsg.txt:
  Added missing ','
sql/share/greek/errmsg.txt:
  Added missing ','
sql/share/hungarian/errmsg.txt:
  Added missing ','
sql/share/italian/errmsg.txt:
  Added missing ','
sql/share/japanese/errmsg.txt:
  Added missing ','
sql/share/korean/errmsg.txt:
  Added missing ','
sql/share/norwegian-ny/errmsg.txt:
  Added missing ','
sql/share/norwegian/errmsg.txt:
  Added missing ','
sql/share/polish/errmsg.txt:
  Added missing ','
sql/share/portuguese/errmsg.txt:
  Added missing ','
sql/share/romanian/errmsg.txt:
  Added missing ','
sql/share/russian/errmsg.txt:
  Added missing ','
sql/share/serbian/errmsg.txt:
  Added missing ','
sql/share/slovak/errmsg.txt:
  Added missing ','
sql/share/spanish/errmsg.txt:
  Added missing ','
sql/share/swedish/errmsg.txt:
  Added missing ','
sql/share/ukrainian/errmsg.txt:
  Added missing ','
sql/sql_acl.cc:
  Fix bug in access checking of derived tables
sql/sql_base.cc:
  Indentation change
sql/sql_parse.cc:
  Fix bug in access checking of derived tables
sql/sql_select.cc:
  Fixed bug in new sub select optimization
sql/sql_table.cc:
  Give warning if MySQL doesn't honor given storage engine
sql/sql_yacc.yy:
  Allow syntax CREATE TABLE t1 (LIKE t2).
2003-05-13 11:15:11 +03:00
unknown
a54c17cef3 Portability fix for HPUX10.20
BUILD/compile-pentium-debug-max:
  Added -DBIG_TABLES
sql/mysqld.cc:
  Simple code cleanup
2003-02-25 21:43:24 +02:00
unknown
9385d3aba5 New test results
BUILD/compile-pentium-debug-max:
  Compile with openssl
mysql-test/r/innodb.result:
  New test result
2001-12-13 20:20:19 +02:00
unknown
e96fcbcfe9 Fixed multi-table-delete
Optimize fixed length MyISAM rows to use pread/pwrite.


BUILD/compile-pentium-debug-max:
  Also build embedded server
libmysqld/lib_vio.c:
  Add vio_poll_read()
myisam/mi_statrec.c:
  Use pread()/pwrite() instead of seek+read/write
mysql-test/r/multi_update.result:
  Fix multi-table-delete test
mysql-test/t/multi_update.test:
  Fix multi-table-delete test
sql/filesort.cc:
  Fix multi-table-delete
sql/mysql_priv.h:
  Fix multi-table-delete
sql/sql_class.h:
  Fix multi-table-delete
sql/sql_delete.cc:
  Fix multi-table-delete
sql/sql_parse.cc:
  Fix multi-table-delete
sql/sql_select.cc:
  Fix multi-table-delete
sql/sql_table.cc:
  cleanup
sql/sql_unions.cc:
  cleanup
sql/sql_yacc.yy:
  cleanup/ optimize
sql/structs.h:
  Fix multi-table-delete
sql/uniques.cc:
  Fix multi-table-delete
2001-06-15 05:03:15 +03:00
unknown
3e6215d9d0 Changed Innobase to Innodb
Deleted a lot of old benchmark runs


BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.14_i686_xeon~3e820c28bf4af63a:
  Delete: sql-bench/Results/ATIS-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.14_i686_xeon~17854e751e1d9d1d:
  Delete: sql-bench/Results/RUN-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.14_i686_xeon~64cc4b874cd6fabf:
  Delete: sql-bench/Results/alter-table-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.14_i686_xeon~290c2c3de9d8e6b:
  Delete: sql-bench/Results/big-tables-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.14_i686_xeon~ea19dc3ec55b3618:
  Delete: sql-bench/Results/connect-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-create-mysql-Linux_2.2.14_i686_xeon~50d15991293030ef:
  Delete: sql-bench/Results/create-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.14_i686_xeon~c683ee4b9d214298:
  Delete: sql-bench/Results/insert-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-select-mysql-Linux_2.2.14_i686_xeon~ead3f11b46ac626f:
  Delete: sql-bench/Results/select-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.14_i686_xeon~7525b23938631801:
  Delete: sql-bench/Results/wisconsin-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.14_my_SMP_i686~d275df58a04737c8:
  Delete: sql-bench/Results/ATIS-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.14_my_SMP_i686~d4766c7f8e70d7a2:
  Delete: sql-bench/Results/RUN-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.14_my_SMP_i686~155a83b53c0e9d6:
  Delete: sql-bench/Results/alter-table-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.14_my_SMP_i686~f1127add9307098b:
  Delete: sql-bench/Results/big-tables-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.14_my_SMP_i686~45d2cdf9bea9cc37:
  Delete: sql-bench/Results/connect-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-create-mysql-Linux_2.2.14_my_SMP_i686~d46860c29c5d51ee:
  Delete: sql-bench/Results/create-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.14_my_SMP_i686~e1771e0a164bc310:
  Delete: sql-bench/Results/insert-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-select-mysql-Linux_2.2.14_my_SMP_i686~ee2a063d66a183d:
  Delete: sql-bench/Results/select-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.14_my_SMP_i686~b7552710d35202b6:
  Delete: sql-bench/Results/wisconsin-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-ATIS-mysql-3.21-Linux_2.2.1_i686~660fb76ed6ccfb6f:
  Delete: sql-bench/Results/ATIS-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-RUN-mysql-3.21-Linux_2.2.1_i686~f6fdd64859e11de9:
  Delete: sql-bench/Results/RUN-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-alter-table-mysql-3.21-Linux_2.2.1_i686~f6f7ccd7b3c35f97:
  Delete: sql-bench/Results/alter-table-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-big-tables-mysql-3.21-Linux_2.2.1_i686~baa649caba113497:
  Delete: sql-bench/Results/big-tables-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-connect-mysql-3.21-Linux_2.2.1_i686~c0c26d4320182d85:
  Delete: sql-bench/Results/connect-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-create-mysql-3.21-Linux_2.2.1_i686~51581b24f45e0f5c:
  Delete: sql-bench/Results/create-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-insert-mysql-3.21-Linux_2.2.1_i686~fd082017c7c57a6:
  Delete: sql-bench/Results/insert-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-select-mysql-3.21-Linux_2.2.1_i686~ed3687e713ff0571:
  Delete: sql-bench/Results/select-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-wisconsin-mysql-3.21-Linux_2.2.1_i686~8147dc16a1dc6c47:
  Delete: sql-bench/Results/wisconsin-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-ATIS-mysql_3.21-Linux_2.0.35_i686~c25425e045ca8dfc:
  Delete: sql-bench/Results/ATIS-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-RUN-mysql_3.21-Linux_2.0.35_i686~ea8672d8473435:
  Delete: sql-bench/Results/RUN-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-alter-table-mysql_3.21-Linux_2.0.35_i686~762639f2560976bd:
  Delete: sql-bench/Results/alter-table-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-big-tables-mysql_3.21-Linux_2.0.35_i686~190e827e569c99a4:
  Delete: sql-bench/Results/big-tables-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-connect-mysql_3.21-Linux_2.0.35_i686~650abd213e6828c6:
  Delete: sql-bench/Results/connect-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-create-mysql_3.21-Linux_2.0.35_i686~df1b037d17b33587:
  Delete: sql-bench/Results/create-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-insert-mysql_3.21-Linux_2.0.35_i686~60c0965dff31db07:
  Delete: sql-bench/Results/insert-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-select-mysql_3.21-Linux_2.0.35_i686~5fadbac5f98696a:
  Delete: sql-bench/Results/select-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-wisconsin-mysql_3.21-Linux_2.0.35_i686~31703d40ea6b4f66:
  Delete: sql-bench/Results/wisconsin-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.10_i686~3fa4d167cceff7e8:
  Delete: sql-bench/Results/ATIS-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.10_i686~712f52be5d195406:
  Delete: sql-bench/Results/RUN-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.10_i686~93b78a85b720a186:
  Delete: sql-bench/Results/alter-table-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.10_i686~99daa1c5370d077d:
  Delete: sql-bench/Results/big-tables-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.10_i686~c92505d77e19d5ec:
  Delete: sql-bench/Results/connect-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-create-mysql-Linux_2.2.10_i686~9e7822f66df6aa76:
  Delete: sql-bench/Results/create-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.10_i686~763edf9aec633f51:
  Delete: sql-bench/Results/insert-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-select-mysql-Linux_2.2.10_i686~a2e264d777b787d:
  Delete: sql-bench/Results/select-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.10_i686~301a82b12a84922b:
  Delete: sql-bench/Results/wisconsin-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-ATIS-mysql-win98~cd0705815d3af451:
  Delete: sql-bench/Results-win32/ATIS-mysql-win98
BitKeeper/deleted/.del-RUN-mysql-win98~7f09e396772a8665:
  Delete: sql-bench/Results-win32/RUN-mysql-win98
BitKeeper/deleted/.del-alter-table-mysql-win98~e8743982f790462:
  Delete: sql-bench/Results-win32/alter-table-mysql-win98
BitKeeper/deleted/.del-big-tables-mysql-win98~99a1882effebbdf2:
  Delete: sql-bench/Results-win32/big-tables-mysql-win98
BitKeeper/deleted/.del-connect-mysql-win98~2a11d5e3dfc0bc67:
  Delete: sql-bench/Results-win32/connect-mysql-win98
BitKeeper/deleted/.del-create-mysql-win98~f66c2cb2909c4792:
  Delete: sql-bench/Results-win32/create-mysql-win98
BitKeeper/deleted/.del-insert-mysql-win98~6d6cafc85a6c837:
  Delete: sql-bench/Results-win32/insert-mysql-win98
BitKeeper/deleted/.del-select-mysql-win98~f370fac2d66a9faf:
  Delete: sql-bench/Results-win32/select-mysql-win98
BitKeeper/deleted/.del-wisconsin-mysql-win98~8b3da9c5c5d2365b:
  Delete: sql-bench/Results-win32/wisconsin-mysql-win98
BUILD/compile-pentium-debug-max:
  Innobase -> Innodb
BUILD/compile-pentium-max:
  Innobase -> Innodb
Docs/manual.texi:
  Innobase -> Innodb
acinclude.m4:
  Innobase -> Innodb
bdb/Makefile.in:
  Fix that make clean works
configure.in:
  Innobase -> Innodb
mysql-test/include/have_innodb.inc:
  Innobase -> Innodb
mysql-test/install_test_db.sh:
  Innobase -> Innodb
mysql-test/mysql-test-run.sh:
  Innobase -> Innodb
mysql-test/r/have_innodb.require:
  Innobase -> Innodb
mysql-test/r/innodb.result:
  Innobase -> Innodb
mysql-test/t/innodb.test:
  Innobase -> Innodb
scripts/mysql_install_db.sh:
  Innobase -> Innodb
scripts/mysqlhotcopy.sh:
  Remove some warnings
sql-bench/server-cfg.sh:
  Innobase -> Innodb
sql/Makefile.am:
  Innobase -> Innodb
sql/ha_innobase.cc:
  Innobase -> Innodb
sql/ha_innobase.h:
  Innobase -> Innodb
sql/handler.cc:
  Innobase -> Innodb
sql/mysqld.cc:
  Innobase -> Innodb
sql/sql_delete.cc:
  Innobase -> Innodb
support-files/my-huge.cnf.sh:
  Innobase -> Innodb
support-files/my-large.cnf.sh:
  Innobase -> Innodb
support-files/my-medium.cnf.sh:
  Innobase -> Innodb
support-files/my-small.cnf.sh:
  Innobase -> Innodb
support-files/mysql-max.spec.sh:
  Innobase -> Innodb
support-files/mysql.spec.sh:
  Innobase -> Innodb
tests/fork_big.pl:
  Added checking of whole database
2001-04-13 12:25:12 +03:00
unknown
96c3bd9432 moved bdb/innobase to compile-pentium-debug-max
fixed bug in variable assignment in mysqltest
fixed coredump on conversion from empty blob/text to date
added test case for empty blob conversion to date


BUILD/compile-pentium-debug:
  move bdb/innobase to compile-pentium-debug-max
client/mysqltest.c:
  fixed bug in variable assignment
sql/time.cc:
  fixed coredump on conversion from empty blob/text to date
2001-04-05 19:04:34 -06:00