database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-06-03 07:02:23 +03:00
Code
59,222 Commits 3,015 Branches 355 Tags
Commit Graph

948 Commits

Author SHA1 Message Date
unknown
634d3ff2c6 Fixes a number of problems with time/datetime <-> string conversion functions: 
- bug #11655 "Wrong time is returning from nested selects - maximum time exists
- input and output TIME values were not validated properly in several conversion functions
- bug #20927 "sec_to_time treats big unsigned as signed"
- integer overflows were not checked in several functions. As a result, input values like 2^32 or 3600*2^32 were treated as 0
- BIGINT UNSIGNED values were treated as SIGNED in several functions
- in cases where both input string truncation and out-of-range TIME value occur, only 'truncated incorrect time value' warning was produced


include/my_time.h:
  Added defines for the TIME limits
  Added defines for the warning flags set by str_to_time() and check_time_range()
  Added check_time_range() declaration
mysql-test/r/func_sapdb.result:
  Fixed testcases which relied on incorrect TIMEDIFF() behaviour
mysql-test/r/func_time.result:
  Fixed testcase which relied on incorrect behaviour
  Added testcases for out-of-range values in SEC_TO_TIME(), TIME_TO_SEC(), ADDTIME(), SUBTIME() and EXTRACT()
mysql-test/t/func_time.test:
  Added testcases for out-of-range values in SEC_TO_TIME(), TIME_TO_SEC(), ADDTIME(), SUBTIME() and EXTRACT()
sql-common/my_time.c:
  Added check_time_range() to be used from str_to_time() and item_timefunc.cc
  Added new out-of-range flag to str_to_time() warnings
  Use '%u' instead of '%d' in my_*_to_str() because the arguments are unsigned
sql/field.cc:
  Replaced out-of-range checks with checks for flags returned by str_to_time()
sql/item_timefunc.cc:
  Added wrappers over make_datetime() and make_time() which perform out-of-range checks on input values
  Moved common code in Item_func_sec_to_time::val_str() and Item_func_sec_to_time::val_int() into a separate function sec_to_time()
  Replaced calls to make_datetime() with make_datetime_with_warn() in Item_func_add_time and Item_func_timediff
  Checks for 'unsigned int' overflows in Item_func_maketime
  Use make_time_with_warn() instead of make_time() in Item_func_maketime
  Fixed incorrect sizeof() in Item_func_str_to_date::get_time()
sql/time.cc:
  Check for return value of str_to_time() along with warning flags
 2006-10-04 17:13:32 +04:00
unknown
c9970c5b41 Merge bk-internal:/home/bk/mysql-5.1-new-rpl 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


client/mysql.cc:
  Auto merged
include/m_ctype.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2006-10-03 15:56:56 +02:00
unknown
7d74876585 Merge bk-internal:/home/bk/mysql-5.0-rpl 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysql.cc:
  Auto merged
include/m_ctype.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
 2006-10-03 14:24:43 +02:00
unknown
fd5ea175a3 sql_yacc.yy: 
After merge fix.
field.cc:
  After merge fix


sql/field.cc:
  After merge fix
sql/sql_yacc.yy:
  After merge fix.
 2006-10-03 17:05:33 +05:00
unknown
7dad8e692e After merge fix 
BitKeeper/deleted/.del-ps_6bdb.result:
  Auto merged
client/mysql.cc:
  Auto merged
include/m_ctype.h:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-cp932.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-eucjpms.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
 2006-10-03 16:00:09 +05:00
unknown
f0cd4a8311 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug22271/my50-bug22271


sql/field.cc:
  Auto merged
 2006-10-03 09:00:03 +05:00
unknown
68fa1c27be Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug22271/my51-bug22271


sql/field.cc:
  Auto merged
 2006-10-03 08:56:19 +05:00
unknown
4a09aeb3a7 Merge mysql.com:/usr/home/ram/work/bug22271/my50-bug22271 
into  mysql.com:/usr/home/ram/work/bug22271/my51-bug22271


mysql-test/r/type_bit.result:
  Auto merged
sql/field.cc:
  Auto merged
 2006-10-03 08:51:59 +05:00
unknown
53de6c3901 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my50-bug20778 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my51-bug20778


mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/warnings.test:
  Auto merged
sql/field.cc:
  Auto merged
 2006-09-29 11:14:28 -04:00
unknown
4357e22061 Merge mysql.com:/usr/home/bar/mysql-5.0.b6147v2 
into  mysql.com:/usr/home/bar/mysql-5.0.b6147rpl


mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
sql/field.cc:
  Auto merged
 2006-09-29 16:40:18 +05:00
unknown
880c9b2a8b Bug#21620 ALTER TABLE affects other columns 
Problem: for character sets having mbmaxlen==2,
  any ALTER TABLE changed TEXT column type to MEDIUMTEXT,
  due to wrong "internal length to create length" formula.
  Fix: removing rounding code introduced in early 4.1 time,
  which is not correct anymore.


mysql-test/r/ctype_gbk.result:
  Adding test case
mysql-test/t/ctype_gbk.test:
  Adding test case
sql/field.cc:
  Fixing "internal length to create length" formula.
 2006-09-29 16:24:11 +05:00
unknown
2b3633c7bd Fix for bug #22271: data casting may affect data stored in the next column(s?) 
Using wrong filling value may cause unneeded extra bit rewriting.

Fix: use proper value to fill uneven bits.


mysql-test/r/type_bit.result:
  Fix for bug #22271: data casting may affect data stored in the next column(s?)
    - test case.
mysql-test/t/type_bit.test:
  Fix for bug #22271: data casting may affect data stored in the next column(s?)
    - test result.
sql/field.cc:
  Fix for bug #22271: data casting may affect data stored in the next column(s?)
    - use ((1 << bit_len) - 1) instead of 0xff to fill uneven bits 
      in order not to change other's bits.
 2006-09-28 17:00:29 +05:00
unknown
033db2d038 Bug #20778: strange characters in warning message 1366 when called in SP 
The function receives an exactly-sized buffer (not a C NUL-terminated string)
and passes it into a printf function to be interpreted with "%s".

Instead, create an intermediate String object, and copy the data into it, 
and pass in a pointer to the String's NUL-terminated buffer.


mysql-test/r/warnings.result:
  Test that warnings do not read outside its intended memory space.
mysql-test/t/warnings.test:
  Test that warnings do not read outside its intended memory space.
sql/field.cc:
  Create a new String object and use a pointer to its data instead of the 
  exactly-sized buffer to be interpreted as a C string deep within the 
  errmsg.txt list via printf.
 2006-09-27 19:26:25 -04:00
unknown
21263710af Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl


mysql-test/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
mysql-test/t/disabled.def:
  SCCS merged
 2006-09-19 13:47:15 +02:00
unknown
3936ce19d2 WL#3259 (RBR with more columns on slave than master): 
Incorporating changes from review.
Fixing one bug that surfaced.


mysql-test/extra/rpl_tests/rpl_row_tabledefs.test:
  Adding tests that UPDATE and DELETE does not generate an error.
mysql-test/r/rpl_row_tabledefs_2myisam.result:
  Result change.
mysql-test/r/rpl_row_tabledefs_3innodb.result:
  Result change.
mysql-test/t/disabled.def:
  Enabling rpl_sp_effects (even though it gives a result mismatch currently).
sql/field.cc:
  Using constant to denote undefined last null byte.
sql/field.h:
  Using constant to denote undefined last null byte.
  Adding documentation.
sql/log_event.cc:
  Not generating error for non-NULL no-DEFAULT columns when updating or deleting row.
  Better documentation and comments.
sql/rpl_utility.cc:
  Moving documentation to header file.
sql/rpl_utility.h:
  Documenting class and members.
 2006-09-13 19:25:12 +02:00
unknown
45546f3de8 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


BitKeeper/deleted/.del-rpl_heap.test:
  Auto merged
Makefile.am:
  Auto merged
mysql-test/extra/binlog_tests/binlog.test:
  Auto merged
mysql-test/r/binlog_stm_binlog.result:
  Auto merged
mysql-test/r/rpl_switch_stm_row_mixed.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/rpl_trigger.test:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
unittest/README.txt:
  Auto merged
unittest/unit.pl:
  Auto merged
mysql-test/t/disabled.def:
  Merge (main -> rpl 5.1)
 2006-09-11 13:34:44 +02:00
unknown
0ec1397d03 Post-merge fixes. 
mysql-test/lib/mtr_process.pl:
  Apply manually the merge from 5.0
mysql-test/mysql-test-run.pl:
  Apply manually the merge from 5.0
mysql-test/r/grant.result:
  A post-merge fix.
mysql-test/r/im_cmd_line.result:
  A post-merge fix.
mysql-test/r/im_instance_conf.result:
  A post-merge fix.
mysql-test/r/sp.result:
  A post-merge fix.
mysql-test/t/grant.test:
  A post-merge fix.
mysql-test/t/im_cmd_line.imtest:
  A post-merge fix.
mysql-test/t/im_instance_conf.imtest:
  A post-merge fix.
sql/field.cc:
  A post-merge fix.
sql/item_cmpfunc.cc:
  A post-merge fix.
sql/sp_head.cc:
  A post-merge fix.
sql/sp_head.h:
  A post-merge fix.
 2006-08-30 23:09:47 +04:00
unknown
5fab3969af Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


BitKeeper/deleted/.del-im_check_os.inc:
  Auto merged
BitKeeper/deleted/.del-im_options_set.imtest~b53d9d60e5684833:
  Auto merged
BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921:
  Auto merged
BitKeeper/deleted/.del-im_options_unset.imtest~768eb186b51d0048:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/r/im_daemon_life_cycle.result:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/r/im_utils.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/type_varchar.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged
mysql-test/t/im_utils.imtest:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/type_varchar.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_row.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_error.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_trigger.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/mysql-test-run.pl:
  Use local. Alik will merge his changes manually.
mysql-test/lib/mtr_process.pl:
  Use local.
mysql-test/r/grant.result:
  Use local.
mysql-test/r/sp.result:
  Use local.
mysql-test/r/ps.result:
  Manual merge.
mysql-test/t/grant.test:
  Manual merge.
mysql-test/t/ps.test:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.
sql/Makefile.am:
  Manual merge.
sql/field.cc:
  Manual merge.
sql/mysqld.cc:
  Manual merge.
sql/share/errmsg.txt:
  Manual merge.
sql/sp.cc:
  Manual merge.
sql/sp_head.h:
  Manual merge.
sql/sql_trigger.cc:
  Manual merge.
sql/sql_view.cc:
  Manual merge.
 2006-08-30 03:00:19 +04:00
unknown
8ea5f31a46 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-14897


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
mysql-test/r/grant.result:
  Manual merge.
mysql-test/r/view.result:
  Manual merge.
mysql-test/t/grant.test:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
 2006-08-30 00:45:33 +04:00
unknown
4355ea5a38 A fix for Bug#14897 "ResultSet.getString("table.column") sometimes 
doesn't find the column"

When a user was using 4.1 tables with VARCHAR column and 5.0 server
and a query that used a temporary table to resolve itself, the
table metadata for the varchar column sent to client was incorrect:
MYSQL_FIELD::table member was empty.

The bug was caused by implicit "upgrade" from old VARCHAR to new
VARCHAR hard-coded in Field::new_field, which did not preserve
the information about the original table. Thus, the field metadata
of the "upgraded" field pointed to an auxiliary temporary table
created for query execution.

The fix is to copy the pointer to the original table to the new field.


mysql-test/r/type_varchar.result:
  Update test results (Bug#14897)
mysql-test/t/type_varchar.test:
  Add a test case for Bug#14897 "ResultSet.getString("table.column") 
  sometimes doesn't find the column"
sql/field.cc:
  Preserve the original table name when converting fields from 
  old VARCHAR to new VARCHAR.
mysql-test/std_data/14897.frm:
  New BitKeeper file ``mysql-test/std_data/14897.frm''
 2006-08-30 00:38:58 +04:00
unknown
4ec86b1c04 This is a cleanup of warnings that windows is complaining about. 
client/mysql.cc:
  Windows warnings clean up
server-tools/instance-manager/parse.cc:
  Cleanedup warning
sql/field.cc:
  Removed unused variables
sql/filesort.cc:
  Removed unused variables
sql/ha_innodb.cc:
  Removed unused variables
sql/ha_partition.cc:
  Fixing warning
sql/partition_element.h:
  Fixing declaration for warnings
 2006-08-23 15:12:42 -07:00
unknown
f17a35a948 WL#3259 (RBR with more columns on slave than on master): 
Post-merge fixes.


mysql-test/r/rpl_row_tabledefs_3innodb.result:
  Result change
mysql-test/t/disabled.def:
  Disabling test that appear to be fixed in other clones
sql/field.cc:
  Post-merge fix
sql/log_event.cc:
  Changes to unpack_row():
  - Documentation
  - New parameter, the write/read set
  - R/W set now 0-indexed instead of 1-indexed
  - Removed column value printing
  Changes to replace_record():
  - Documentation
  - Removed column value printing
  Removed unused function print_column_values()
 2006-08-22 10:36:11 +02:00
unknown
7ed6333681 Merge romeo.(none):/home/bkroot/mysql-5.1-wl3228 
into  romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl


sql/field.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/Makefile.am:
  Merge patch for worklog 3259 into mysql-5.1-rpl
sql/field.cc:
  Merge patch for worklog 3259 into mysql-5.1-rpl
sql/log_event.cc:
  Merge patch for worklog 3259 into mysql-5.1-rpl
 2006-08-21 10:54:41 +02:00
unknown
2a56517972 Cheery picked Antony's patch to allow for Window's builds in 5.1 
BitKeeper/deleted/.del-bt_compact.c:
  Delete: storage/bdb/btree/bt_compact.c
BitKeeper/deleted/.del-bt_compare.c:
  Delete: storage/bdb/btree/bt_compare.c
BitKeeper/deleted/.del-bt_conv.c:
  Delete: storage/bdb/btree/bt_conv.c
BitKeeper/deleted/.del-bt_curadj.c:
  Delete: storage/bdb/btree/bt_curadj.c
BitKeeper/deleted/.del-bt_cursor.c:
  Delete: storage/bdb/btree/bt_cursor.c
BitKeeper/deleted/.del-bt_delete.c:
  Delete: storage/bdb/btree/bt_delete.c
BitKeeper/deleted/.del-bt_method.c:
  Delete: storage/bdb/btree/bt_method.c
BitKeeper/deleted/.del-bt_open.c:
  Delete: storage/bdb/btree/bt_open.c
BitKeeper/deleted/.del-bt_put.c:
  Delete: storage/bdb/btree/bt_put.c
BitKeeper/deleted/.del-bt_rec.c:
  Delete: storage/bdb/btree/bt_rec.c
BitKeeper/deleted/.del-bt_reclaim.c:
  Delete: storage/bdb/btree/bt_reclaim.c
BitKeeper/deleted/.del-bt_recno.c:
  Delete: storage/bdb/btree/bt_recno.c
BitKeeper/deleted/.del-bt_rsearch.c:
  Delete: storage/bdb/btree/bt_rsearch.c
BitKeeper/deleted/.del-bt_search.c:
  Delete: storage/bdb/btree/bt_search.c
BitKeeper/deleted/.del-bt_split.c:
  Delete: storage/bdb/btree/bt_split.c
BitKeeper/deleted/.del-bt_stat.c:
  Delete: storage/bdb/btree/bt_stat.c
BitKeeper/deleted/.del-.IGNORE_ME:
  Delete: storage/bdb/build_unix/.IGNORE_ME
BitKeeper/deleted/.del-Berkeley_DB.dsw:
  Delete: storage/bdb/build_win32/Berkeley_DB.dsw
BitKeeper/deleted/.del-app_dsp.src:
  Delete: storage/bdb/build_win32/app_dsp.src
BitKeeper/deleted/.del-app_dsp.src~dcf703e0c9c72e4a:
  Delete: storage/bdb/build_win64/app_dsp.src
BitKeeper/deleted/.del-bt_upgrade.c:
  Delete: storage/bdb/btree/bt_upgrade.c
BitKeeper/deleted/.del-bt_verify.c:
  Delete: storage/bdb/btree/bt_verify.c
BitKeeper/deleted/.del-btree.src:
  Delete: storage/bdb/btree/btree.src
BitKeeper/deleted/.del-db_java_xaj.mak:
  Delete: storage/bdb/build_win32/db_java_xaj.mak
BitKeeper/deleted/.del-db_test.src:
  Delete: storage/bdb/build_win32/db_test.src
BitKeeper/deleted/.del-dbkill.cpp:
  Delete: storage/bdb/build_win32/dbkill.cpp
BitKeeper/deleted/.del-dllmain.c:
  Delete: storage/bdb/build_win32/dllmain.c
BitKeeper/deleted/.del-dynamic_dsp.src:
  Delete: storage/bdb/build_win32/dynamic_dsp.src
BitKeeper/deleted/.del-java_dsp.src:
  Delete: storage/bdb/build_win32/java_dsp.src
BitKeeper/deleted/.del-libdb_tcl.def:
  Delete: storage/bdb/build_win32/libdb_tcl.def
BitKeeper/deleted/.del-libdbrc.src:
  Delete: storage/bdb/build_win32/libdbrc.src
BitKeeper/deleted/.del-small_dsp.src:
  Delete: storage/bdb/build_win32/small_dsp.src
BitKeeper/deleted/.del-srcfile_dsp.src:
  Delete: storage/bdb/build_win32/srcfile_dsp.src
BitKeeper/deleted/.del-static_dsp.src:
  Delete: storage/bdb/build_win32/static_dsp.src
BitKeeper/deleted/.del-tcl_dsp.src:
  Delete: storage/bdb/build_win32/tcl_dsp.src
BitKeeper/deleted/.del-db_test.src~2521827764f86c53:
  Delete: storage/bdb/build_win64/db_test.src
BitKeeper/deleted/.del-dynamic_dsp.src~95360632a65b4e62:
  Delete: storage/bdb/build_win64/dynamic_dsp.src
BitKeeper/deleted/.del-ex_repquote.src:
  Delete: storage/bdb/build_win64/ex_repquote.src
BitKeeper/deleted/.del-getcwd.c:
  Delete: storage/bdb/clib/getcwd.c
BitKeeper/deleted/.del-getopt.c:
  Delete: storage/bdb/clib/getopt.c
BitKeeper/deleted/.del-java_dsp.src~e42f32427327f5b5:
  Delete: storage/bdb/build_win64/java_dsp.src
BitKeeper/deleted/.del-libdbrc.src~d22fea70774c5e98:
  Delete: storage/bdb/build_win64/libdbrc.src
BitKeeper/deleted/.del-memcmp.c:
  Delete: storage/bdb/clib/memcmp.c
BitKeeper/deleted/.del-memmove.c:
  Delete: storage/bdb/clib/memmove.c
BitKeeper/deleted/.del-raise.c:
  Delete: storage/bdb/clib/raise.c
BitKeeper/deleted/.del-small_dsp.src~96bb604dd8041058:
  Delete: storage/bdb/build_win64/small_dsp.src
BitKeeper/deleted/.del-snprintf.c:
  Delete: storage/bdb/clib/snprintf.c
BitKeeper/deleted/.del-srcfile_dsp.src~45382c1414b89bb1:
  Delete: storage/bdb/build_win64/srcfile_dsp.src
BitKeeper/deleted/.del-static_dsp.src~3f1945d094870d53:
  Delete: storage/bdb/build_win64/static_dsp.src
BitKeeper/deleted/.del-strcasecmp.c:
  Delete: storage/bdb/clib/strcasecmp.c
BitKeeper/deleted/.del-strdup.c:
  Delete: storage/bdb/clib/strdup.c
BitKeeper/deleted/.del-strerror.c:
  Delete: storage/bdb/clib/strerror.c
BitKeeper/deleted/.del-strtol.c:
  Delete: storage/bdb/clib/strtol.c
BitKeeper/deleted/.del-tcl_dsp.src~7fd8c5914db07070:
  Delete: storage/bdb/build_win64/tcl_dsp.src
BitKeeper/deleted/.del-aes_method.c:
  Delete: storage/bdb/crypto/aes_method.c
BitKeeper/deleted/.del-crypto.c:
  Delete: storage/bdb/crypto/crypto.c
BitKeeper/deleted/.del-crypto.html:
  Delete: storage/bdb/crypto/crypto.html
BitKeeper/deleted/.del-crypto_stub.c:
  Delete: storage/bdb/common/crypto_stub.c
BitKeeper/deleted/.del-db_byteorder.c:
  Delete: storage/bdb/common/db_byteorder.c
BitKeeper/deleted/.del-db_clock.c:
  Delete: storage/bdb/common/db_clock.c
BitKeeper/deleted/.del-db_err.c:
  Delete: storage/bdb/common/db_err.c
BitKeeper/deleted/.del-db_getlong.c:
  Delete: storage/bdb/common/db_getlong.c
BitKeeper/deleted/.del-db_idspace.c:
  Delete: storage/bdb/common/db_idspace.c
BitKeeper/deleted/.del-db_log2.c:
  Delete: storage/bdb/common/db_log2.c
BitKeeper/deleted/.del-mt19937db.c:
  Delete: storage/bdb/crypto/mersenne/mt19937db.c
BitKeeper/deleted/.del-rijndael-alg-fst.c:
  Delete: storage/bdb/crypto/rijndael/rijndael-alg-fst.c
BitKeeper/deleted/.del-rijndael-alg-fst.h:
  Delete: storage/bdb/crypto/rijndael/rijndael-alg-fst.h
BitKeeper/deleted/.del-strtoul.c:
  Delete: storage/bdb/clib/strtoul.c
BitKeeper/deleted/.del-util_arg.c:
  Delete: storage/bdb/common/util_arg.c
BitKeeper/deleted/.del-util_cache.c:
  Delete: storage/bdb/common/util_cache.c
BitKeeper/deleted/.del-util_log.c:
  Delete: storage/bdb/common/util_log.c
BitKeeper/deleted/.del-util_sig.c:
  Delete: storage/bdb/common/util_sig.c
BitKeeper/deleted/.del-vsnprintf.c:
  Delete: storage/bdb/clib/vsnprintf.c
BitKeeper/deleted/.del-crdel.src:
  Delete: storage/bdb/db/crdel.src
BitKeeper/deleted/.del-crdel_rec.c:
  Delete: storage/bdb/db/crdel_rec.c
BitKeeper/deleted/.del-cxx_db.cpp:
  Delete: storage/bdb/cxx/cxx_db.cpp
BitKeeper/deleted/.del-cxx_dbc.cpp:
  Delete: storage/bdb/cxx/cxx_dbc.cpp
BitKeeper/deleted/.del-cxx_dbt.cpp:
  Delete: storage/bdb/cxx/cxx_dbt.cpp
BitKeeper/deleted/.del-cxx_env.cpp:
  Delete: storage/bdb/cxx/cxx_env.cpp
BitKeeper/deleted/.del-cxx_except.cpp:
  Delete: storage/bdb/cxx/cxx_except.cpp
BitKeeper/deleted/.del-cxx_lock.cpp:
  Delete: storage/bdb/cxx/cxx_lock.cpp
BitKeeper/deleted/.del-cxx_logc.cpp:
  Delete: storage/bdb/cxx/cxx_logc.cpp
BitKeeper/deleted/.del-cxx_mpool.cpp:
  Delete: storage/bdb/cxx/cxx_mpool.cpp
BitKeeper/deleted/.del-cxx_multi.cpp:
  Delete: storage/bdb/cxx/cxx_multi.cpp
BitKeeper/deleted/.del-cxx_seq.cpp:
  Delete: storage/bdb/cxx/cxx_seq.cpp
BitKeeper/deleted/.del-cxx_txn.cpp:
  Delete: storage/bdb/cxx/cxx_txn.cpp
BitKeeper/deleted/.del-db.c:
  Delete: storage/bdb/db/db.c
BitKeeper/deleted/.del-rijndael-api-fst.c:
  Delete: storage/bdb/crypto/rijndael/rijndael-api-fst.c
BitKeeper/deleted/.del-rijndael-api-fst.h:
  Delete: storage/bdb/crypto/rijndael/rijndael-api-fst.h
BitKeeper/deleted/.del-db.src:
  Delete: storage/bdb/db/db.src
BitKeeper/deleted/.del-db_am.c:
  Delete: storage/bdb/db/db_am.c
BitKeeper/deleted/.del-db_cam.c:
  Delete: storage/bdb/db/db_cam.c
BitKeeper/deleted/.del-db_conv.c:
  Delete: storage/bdb/db/db_conv.c
BitKeeper/deleted/.del-db_dispatch.c:
  Delete: storage/bdb/db/db_dispatch.c
BitKeeper/deleted/.del-db_dup.c:
  Delete: storage/bdb/db/db_dup.c
BitKeeper/deleted/.del-db_iface.c:
  Delete: storage/bdb/db/db_iface.c
BitKeeper/deleted/.del-db_join.c:
  Delete: storage/bdb/db/db_join.c
BitKeeper/deleted/.del-db_meta.c:
  Delete: storage/bdb/db/db_meta.c
BitKeeper/deleted/.del-db_method.c:
  Delete: storage/bdb/db/db_method.c
BitKeeper/deleted/.del-db_open.c:
  Delete: storage/bdb/db/db_open.c
BitKeeper/deleted/.del-db_overflow.c:
  Delete: storage/bdb/db/db_overflow.c
BitKeeper/deleted/.del-db_ovfl_vrfy.c:
  Delete: storage/bdb/db/db_ovfl_vrfy.c
BitKeeper/deleted/.del-db_pr.c:
  Delete: storage/bdb/db/db_pr.c
BitKeeper/deleted/.del-db_rec.c:
  Delete: storage/bdb/db/db_rec.c
BitKeeper/deleted/.del-db_reclaim.c:
  Delete: storage/bdb/db/db_reclaim.c
BitKeeper/deleted/.del-db_remove.c:
  Delete: storage/bdb/db/db_remove.c
BitKeeper/deleted/.del-db_rename.c:
  Delete: storage/bdb/db/db_rename.c
BitKeeper/deleted/.del-db_ret.c:
  Delete: storage/bdb/db/db_ret.c
BitKeeper/deleted/.del-db185.c:
  Delete: storage/bdb/db185/db185.c
BitKeeper/deleted/.del-db185_int.in:
  Delete: storage/bdb/db185/db185_int.in
BitKeeper/deleted/.del-db_archive.c:
  Delete: storage/bdb/db_archive/db_archive.c
BitKeeper/deleted/.del-db_checkpoint.c:
  Delete: storage/bdb/db_checkpoint/db_checkpoint.c
BitKeeper/deleted/.del-db_deadlock.c:
  Delete: storage/bdb/db_deadlock/db_deadlock.c
BitKeeper/deleted/.del-db_dump.c:
  Delete: storage/bdb/db_dump/db_dump.c
BitKeeper/deleted/.del-db_dump185.c:
  Delete: storage/bdb/db_dump185/db_dump185.c
BitKeeper/deleted/.del-db_hotbackup.c:
  Delete: storage/bdb/db_hotbackup/db_hotbackup.c
BitKeeper/deleted/.del-db_load.c:
  Delete: storage/bdb/db_load/db_load.c
BitKeeper/deleted/.del-db_setid.c:
  Delete: storage/bdb/db/db_setid.c
BitKeeper/deleted/.del-db_setlsn.c:
  Delete: storage/bdb/db/db_setlsn.c
BitKeeper/deleted/.del-db_stati.c:
  Delete: storage/bdb/db/db_stati.c
BitKeeper/deleted/.del-db_truncate.c:
  Delete: storage/bdb/db/db_truncate.c
BitKeeper/deleted/.del-db_upg.c:
  Delete: storage/bdb/db/db_upg.c
BitKeeper/deleted/.del-db_upg_opd.c:
  Delete: storage/bdb/db/db_upg_opd.c
BitKeeper/deleted/.del-db_vrfy.c:
  Delete: storage/bdb/db/db_vrfy.c
BitKeeper/deleted/.del-db_vrfy_stub.c:
  Delete: storage/bdb/db/db_vrfy_stub.c
BitKeeper/deleted/.del-db_vrfyutil.c:
  Delete: storage/bdb/db/db_vrfyutil.c
BitKeeper/deleted/.del-README:
  Delete: storage/bdb/db_printlog/README
BitKeeper/deleted/.del-btree.h:
  Delete: storage/bdb/dbinc/btree.h
BitKeeper/deleted/.del-commit.awk:
  Delete: storage/bdb/db_printlog/commit.awk
BitKeeper/deleted/.del-count.awk:
  Delete: storage/bdb/db_printlog/count.awk
BitKeeper/deleted/.del-db_printlog.c:
  Delete: storage/bdb/db_printlog/db_printlog.c
BitKeeper/deleted/.del-db_recover.c:
  Delete: storage/bdb/db_recover/db_recover.c
BitKeeper/deleted/.del-db_stat.c:
  Delete: storage/bdb/db_stat/db_stat.c
BitKeeper/deleted/.del-db_upgrade.c:
  Delete: storage/bdb/db_upgrade/db_upgrade.c
BitKeeper/deleted/.del-db_verify.c:
  Delete: storage/bdb/db_verify/db_verify.c
BitKeeper/deleted/.del-dbname.awk:
  Delete: storage/bdb/db_printlog/dbname.awk
BitKeeper/deleted/.del-dd.sh:
  Delete: storage/bdb/db_stat/dd.sh
BitKeeper/deleted/.del-fileid.awk:
  Delete: storage/bdb/db_printlog/fileid.awk
BitKeeper/deleted/.del-logstat.awk:
  Delete: storage/bdb/db_printlog/logstat.awk
BitKeeper/deleted/.del-pgno.awk:
  Delete: storage/bdb/db_printlog/pgno.awk
BitKeeper/deleted/.del-range.awk:
  Delete: storage/bdb/db_printlog/range.awk
BitKeeper/deleted/.del-rectype.awk:
  Delete: storage/bdb/db_printlog/rectype.awk
BitKeeper/deleted/.del-status.awk:
  Delete: storage/bdb/db_printlog/status.awk
BitKeeper/deleted/.del-txn.awk:
  Delete: storage/bdb/db_printlog/txn.awk
BitKeeper/deleted/.del-crypto.h:
  Delete: storage/bdb/dbinc/crypto.h
BitKeeper/deleted/.del-cxx_common.h:
  Delete: storage/bdb/dbinc/cxx_common.h
BitKeeper/deleted/.del-cxx_except.h:
  Delete: storage/bdb/dbinc/cxx_except.h
BitKeeper/deleted/.del-cxx_int.h:
  Delete: storage/bdb/dbinc/cxx_int.h
BitKeeper/deleted/.del-db.in:
  Delete: storage/bdb/dbinc/db.in
BitKeeper/deleted/.del-db_185.in:
  Delete: storage/bdb/dbinc/db_185.in
BitKeeper/deleted/.del-db_am.h:
  Delete: storage/bdb/dbinc/db_am.h
BitKeeper/deleted/.del-db_cxx.in:
  Delete: storage/bdb/dbinc/db_cxx.in
BitKeeper/deleted/.del-db_dispatch.h:
  Delete: storage/bdb/dbinc/db_dispatch.h
BitKeeper/deleted/.del-db_int.in:
  Delete: storage/bdb/dbinc/db_int.in
BitKeeper/deleted/.del-db_join.h:
  Delete: storage/bdb/dbinc/db_join.h
BitKeeper/deleted/.del-db_page.h:
  Delete: storage/bdb/dbinc/db_page.h
BitKeeper/deleted/.del-db_server_int.h:
  Delete: storage/bdb/dbinc/db_server_int.h
BitKeeper/deleted/.del-db_shash.h:
  Delete: storage/bdb/dbinc/db_shash.h
BitKeeper/deleted/.del-db_swap.h:
  Delete: storage/bdb/dbinc/db_swap.h
BitKeeper/deleted/.del-db_upgrade.h:
  Delete: storage/bdb/dbinc/db_upgrade.h
BitKeeper/deleted/.del-db_verify.h:
  Delete: storage/bdb/dbinc/db_verify.h
BitKeeper/deleted/.del-debug.h:
  Delete: storage/bdb/dbinc/debug.h
BitKeeper/deleted/.del-fop.h:
  Delete: storage/bdb/dbinc/fop.h
BitKeeper/deleted/.del-globals.h:
  Delete: storage/bdb/dbinc/globals.h
BitKeeper/deleted/.del-hash.h:
  Delete: storage/bdb/dbinc/hash.h
BitKeeper/deleted/.del-hmac.h:
  Delete: storage/bdb/dbinc/hmac.h
BitKeeper/deleted/.del-lock.h:
  Delete: storage/bdb/dbinc/lock.h
BitKeeper/deleted/.del-log.h:
  Delete: storage/bdb/dbinc/log.h
BitKeeper/deleted/.del-mp.h:
  Delete: storage/bdb/dbinc/mp.h
BitKeeper/deleted/.del-mutex.h:
  Delete: storage/bdb/dbinc/mutex.h
BitKeeper/deleted/.del-mutex_int.h:
  Delete: storage/bdb/dbinc/mutex_int.h
BitKeeper/deleted/.del-os.h:
  Delete: storage/bdb/dbinc/os.h
BitKeeper/deleted/.del-qam.h:
  Delete: storage/bdb/dbinc/qam.h
BitKeeper/deleted/.del-queue.h:
  Delete: storage/bdb/dbinc/queue.h
BitKeeper/deleted/.del-region.h:
  Delete: storage/bdb/dbinc/region.h
BitKeeper/deleted/.del-rep.h:
  Delete: storage/bdb/dbinc/rep.h
BitKeeper/deleted/.del-shqueue.h:
  Delete: storage/bdb/dbinc/shqueue.h
BitKeeper/deleted/.del-tcl_db.h:
  Delete: storage/bdb/dbinc/tcl_db.h
BitKeeper/deleted/.del-txn.h:
  Delete: storage/bdb/dbinc/txn.h
BitKeeper/deleted/.del-xa.h:
  Delete: storage/bdb/dbinc/xa.h
BitKeeper/deleted/.del-.empty:
  Delete: storage/bdb/dbinc_auto/.empty
BitKeeper/deleted/.del-Makefile.in~c0ea38ee72675ab4:
  Delete: storage/bdb/dist/Makefile.in
BitKeeper/deleted/.del-RELEASE:
  Delete: storage/bdb/dist/RELEASE
BitKeeper/deleted/.del-buildrel:
  Delete: storage/bdb/dist/buildrel
BitKeeper/deleted/.del-config.guess:
  Delete: storage/bdb/dist/config.guess
BitKeeper/deleted/.del-config.sub:
  Delete: storage/bdb/dist/config.sub
BitKeeper/deleted/.del-configure.ac:
  Delete: storage/bdb/dist/configure.ac
BitKeeper/deleted/.del-db.ecd.in:
  Delete: storage/bdb/dist/db.ecd.in
BitKeeper/deleted/.del-db.spec.in:
  Delete: storage/bdb/dist/db.spec.in
BitKeeper/deleted/.del-dbm.c:
  Delete: storage/bdb/dbm/dbm.c
BitKeeper/deleted/.del-dbreg.c:
  Delete: storage/bdb/dbreg/dbreg.c
BitKeeper/deleted/.del-dbreg.src:
  Delete: storage/bdb/dbreg/dbreg.src
BitKeeper/deleted/.del-dbreg_rec.c:
  Delete: storage/bdb/dbreg/dbreg_rec.c
BitKeeper/deleted/.del-dbreg_stat.c:
  Delete: storage/bdb/dbreg/dbreg_stat.c
BitKeeper/deleted/.del-dbreg_util.c:
  Delete: storage/bdb/dbreg/dbreg_util.c
BitKeeper/deleted/.del-gen_inc.awk:
  Delete: storage/bdb/dist/gen_inc.awk
BitKeeper/deleted/.del-gen_rec.awk:
  Delete: storage/bdb/dist/gen_rec.awk
BitKeeper/deleted/.del-gen_rpc.awk:
  Delete: storage/bdb/dist/gen_rpc.awk
BitKeeper/deleted/.del-install-sh:
  Delete: storage/bdb/dist/install-sh
BitKeeper/deleted/.del-ltmain.sh:
  Delete: storage/bdb/dist/ltmain.sh
BitKeeper/deleted/.del-pubdef.in:
  Delete: storage/bdb/dist/pubdef.in
BitKeeper/deleted/.del-s_all:
  Delete: storage/bdb/dist/s_all
BitKeeper/deleted/.del-s_config:
  Delete: storage/bdb/dist/s_config
BitKeeper/deleted/.del-s_crypto:
  Delete: storage/bdb/dist/s_crypto
BitKeeper/deleted/.del-s_dir:
  Delete: storage/bdb/dist/s_dir
BitKeeper/deleted/.del-s_include:
  Delete: storage/bdb/dist/s_include
BitKeeper/deleted/.del-s_java_const:
  Delete: storage/bdb/dist/s_java_const
BitKeeper/deleted/.del-s_java_stat:
  Delete: storage/bdb/dist/s_java_stat
BitKeeper/deleted/.del-s_java_swig:
  Delete: storage/bdb/dist/s_java_swig
BitKeeper/deleted/.del-s_javah:
  Delete: storage/bdb/dist/s_javah
BitKeeper/deleted/.del-s_java:
  Delete: storage/bdb/dist/s_java
BitKeeper/deleted/.del-s_je2db:
  Delete: storage/bdb/dist/s_je2db
BitKeeper/deleted/.del-s_perm:
  Delete: storage/bdb/dist/s_perm
BitKeeper/deleted/.del-s_readme:
  Delete: storage/bdb/dist/s_readme
BitKeeper/deleted/.del-s_recover:
  Delete: storage/bdb/dist/s_recover
BitKeeper/deleted/.del-s_rpc:
  Delete: storage/bdb/dist/s_rpc
BitKeeper/deleted/.del-s_symlink:
  Delete: storage/bdb/dist/s_symlink
BitKeeper/deleted/.del-config.ac:
  Delete: storage/bdb/dist/aclocal/config.ac
BitKeeper/deleted/.del-cxx.ac:
  Delete: storage/bdb/dist/aclocal/cxx.ac
BitKeeper/deleted/.del-gcc.ac:
  Delete: storage/bdb/dist/aclocal/gcc.ac
BitKeeper/deleted/.del-libtool.ac:
  Delete: storage/bdb/dist/aclocal/libtool.ac
BitKeeper/deleted/.del-mutex.ac:
  Delete: storage/bdb/dist/aclocal/mutex.ac
BitKeeper/deleted/.del-options.ac:
  Delete: storage/bdb/dist/aclocal/options.ac
BitKeeper/deleted/.del-programs.ac:
  Delete: storage/bdb/dist/aclocal/programs.ac
BitKeeper/deleted/.del-s_tags:
  Delete: storage/bdb/dist/s_tags
BitKeeper/deleted/.del-s_test:
  Delete: storage/bdb/dist/s_test
BitKeeper/deleted/.del-s_vxworks:
  Delete: storage/bdb/dist/s_vxworks
BitKeeper/deleted/.del-s_win32_dsp:
  Delete: storage/bdb/dist/s_win32_dsp
BitKeeper/deleted/.del-s_win32:
  Delete: storage/bdb/dist/s_win32
BitKeeper/deleted/.del-s_winmsi:
  Delete: storage/bdb/dist/s_winmsi
BitKeeper/deleted/.del-srcfiles.in:
  Delete: storage/bdb/dist/srcfiles.in
BitKeeper/deleted/.del-vx_buildcd:
  Delete: storage/bdb/dist/vx_buildcd
BitKeeper/deleted/.del-vx_config.in:
  Delete: storage/bdb/dist/vx_config.in
BitKeeper/deleted/.del-win_config.in:
  Delete: storage/bdb/dist/win_config.in
BitKeeper/deleted/.del-win_db.in:
  Delete: storage/bdb/dist/win_db.in
BitKeeper/deleted/.del-win_exports.in:
  Delete: storage/bdb/dist/win_exports.in
BitKeeper/deleted/.del-ac_check_class.ac:
  Delete: storage/bdb/dist/aclocal_java/ac_check_class.ac
BitKeeper/deleted/.del-ac_check_classpath.ac:
  Delete: storage/bdb/dist/aclocal_java/ac_check_classpath.ac
BitKeeper/deleted/.del-ac_check_junit.ac:
  Delete: storage/bdb/dist/aclocal_java/ac_check_junit.ac
BitKeeper/deleted/.del-ac_check_rqrd_class.ac:
  Delete: storage/bdb/dist/aclocal_java/ac_check_rqrd_class.ac
BitKeeper/deleted/.del-ac_java_options.ac:
  Delete: storage/bdb/dist/aclocal_java/ac_java_options.ac
BitKeeper/deleted/.del-ac_jni_include_dirs.ac:
  Delete: storage/bdb/dist/aclocal_java/ac_jni_include_dirs.ac
BitKeeper/deleted/.del-ac_prog_jar.ac:
  Delete: storage/bdb/dist/aclocal_java/ac_prog_jar.ac
BitKeeper/deleted/.del-ac_prog_java.ac:
  Delete: storage/bdb/dist/aclocal_java/ac_prog_java.ac
BitKeeper/deleted/.del-ac_prog_java_works.ac:
  Delete: storage/bdb/dist/aclocal_java/ac_prog_java_works.ac
BitKeeper/deleted/.del-ac_prog_javac.ac:
  Delete: storage/bdb/dist/aclocal_java/ac_prog_javac.ac
BitKeeper/deleted/.del-ac_prog_javac_works.ac:
  Delete: storage/bdb/dist/aclocal_java/ac_prog_javac_works.ac
BitKeeper/deleted/.del-ac_prog_javadoc.ac:
  Delete: storage/bdb/dist/aclocal_java/ac_prog_javadoc.ac
BitKeeper/deleted/.del-ac_prog_javah.ac:
  Delete: storage/bdb/dist/aclocal_java/ac_prog_javah.ac
BitKeeper/deleted/.del-rpc.ac:
  Delete: storage/bdb/dist/aclocal/rpc.ac
BitKeeper/deleted/.del-sequence.ac:
  Delete: storage/bdb/dist/aclocal/sequence.ac
BitKeeper/deleted/.del-sosuffix.ac:
  Delete: storage/bdb/dist/aclocal/sosuffix.ac
BitKeeper/deleted/.del-tcl.ac:
  Delete: storage/bdb/dist/aclocal/tcl.ac
BitKeeper/deleted/.del-types.ac:
  Delete: storage/bdb/dist/aclocal/types.ac
BitKeeper/deleted/.del-BerkeleyDB.wpj:
  Delete: storage/bdb/dist/vx_2.0/BerkeleyDB.wpj
BitKeeper/deleted/.del-BerkeleyDB.wpj~320150f7956cd770:
  Delete: storage/bdb/dist/vx_2.2/BerkeleyDB.wpj
BitKeeper/deleted/.del-BerkeleyDBsmall.wpj:
  Delete: storage/bdb/dist/vx_2.0/BerkeleyDBsmall.wpj
BitKeeper/deleted/.del-BerkeleyDBsmall.wpj~4c4d7f40dbf1664d:
  Delete: storage/bdb/dist/vx_2.2/BerkeleyDBsmall.wpj
BitKeeper/deleted/.del-Makefile.custom:
  Delete: storage/bdb/dist/vx_3.1/Makefile.custom
BitKeeper/deleted/.del-ac_try_compile_java.ac:
  Delete: storage/bdb/dist/aclocal_java/ac_try_compile_java.ac
BitKeeper/deleted/.del-ac_try_run_javac.ac:
  Delete: storage/bdb/dist/aclocal_java/ac_try_run_javac.ac
BitKeeper/deleted/.del-cdf.1:
  Delete: storage/bdb/dist/vx_3.1/cdf.1
BitKeeper/deleted/.del-cdf.2:
  Delete: storage/bdb/dist/vx_3.1/cdf.2
BitKeeper/deleted/.del-cdf.3:
  Delete: storage/bdb/dist/vx_3.1/cdf.3
BitKeeper/deleted/.del-component.cdf:
  Delete: storage/bdb/dist/vx_3.1/component.cdf
BitKeeper/deleted/.del-component.wpj:
  Delete: storage/bdb/dist/vx_3.1/component.wpj
BitKeeper/deleted/.del-rec_ctemp:
  Delete: storage/bdb/dist/template/rec_ctemp
BitKeeper/deleted/.del-rec_rep:
  Delete: storage/bdb/dist/template/rec_rep
BitKeeper/deleted/.del-wpj.1:
  Delete: storage/bdb/dist/vx_3.1/wpj.1
BitKeeper/deleted/.del-wpj.2:
  Delete: storage/bdb/dist/vx_3.1/wpj.2
BitKeeper/deleted/.del-wpj.in:
  Delete: storage/bdb/dist/vx_2.0/wpj.in
BitKeeper/deleted/.del-wpj.in~cd8fd754cedb37b2:
  Delete: storage/bdb/dist/vx_2.2/wpj.in
BitKeeper/deleted/.del-CONFIG.in:
  Delete: storage/bdb/dist/vx_setup/CONFIG.in
BitKeeper/deleted/.del-LICENSE.TXT:
  Delete: storage/bdb/dist/vx_setup/LICENSE.TXT
BitKeeper/deleted/.del-MESSAGES.TCL:
  Delete: storage/bdb/dist/vx_setup/MESSAGES.TCL
BitKeeper/deleted/.del-README.in:
  Delete: storage/bdb/dist/vx_setup/README.in
BitKeeper/deleted/.del-SETUP.BMP:
  Delete: storage/bdb/dist/vx_setup/SETUP.BMP
BitKeeper/deleted/.del-dbcorewix.in:
  Delete: storage/bdb/dist/winmsi/dbcorewix.in
BitKeeper/deleted/.del-dbvarsbat.in:
  Delete: storage/bdb/dist/winmsi/dbvarsbat.in
BitKeeper/deleted/.del-dbwix.m4:
  Delete: storage/bdb/dist/winmsi/dbwix.m4
BitKeeper/deleted/.del-environment.in:
  Delete: storage/bdb/dist/winmsi/environment.in
BitKeeper/deleted/.del-features.in:
  Delete: storage/bdb/dist/winmsi/features.in
BitKeeper/deleted/.del-files.in:
  Delete: storage/bdb/dist/winmsi/files.in
BitKeeper/deleted/.del-links.in:
  Delete: storage/bdb/dist/winmsi/links.in
BitKeeper/deleted/.del-s_winmsi.fcn:
  Delete: storage/bdb/dist/winmsi/s_winmsi.fcn
BitKeeper/deleted/.del-vx_allfile.in:
  Delete: storage/bdb/dist/vx_setup/vx_allfile.in
BitKeeper/deleted/.del-vx_demofile.in:
  Delete: storage/bdb/dist/vx_setup/vx_demofile.in
BitKeeper/deleted/.del-vx_setup.in:
  Delete: storage/bdb/dist/vx_setup/vx_setup.in
BitKeeper/deleted/.del-wpj.3:
  Delete: storage/bdb/dist/vx_3.1/wpj.3
BitKeeper/deleted/.del-wpj.4:
  Delete: storage/bdb/dist/vx_3.1/wpj.4
BitKeeper/deleted/.del-wpj.5:
  Delete: storage/bdb/dist/vx_3.1/wpj.5
BitKeeper/deleted/.del-caticon.ibd:
  Delete: storage/bdb/dist/winmsi/images/caticon.ibd
BitKeeper/deleted/.del-db_salloc.c:
  Delete: storage/bdb/env/db_salloc.c
BitKeeper/deleted/.del-db_shash.c:
  Delete: storage/bdb/env/db_shash.c
BitKeeper/deleted/.del-env_failchk.c:
  Delete: storage/bdb/env/env_failchk.c
BitKeeper/deleted/.del-env_file.c:
  Delete: storage/bdb/env/env_file.c
BitKeeper/deleted/.del-env_method.c.b:
  Delete: storage/bdb/env/env_method.c.b
BitKeeper/deleted/.del-env_method.c:
  Delete: storage/bdb/env/env_method.c
BitKeeper/deleted/.del-env_open.c:
  Delete: storage/bdb/env/env_open.c
BitKeeper/deleted/.del-env_recover.c:
  Delete: storage/bdb/env/env_recover.c
BitKeeper/deleted/.del-env_region.c:
  Delete: storage/bdb/env/env_region.c
BitKeeper/deleted/.del-env_register.c:
  Delete: storage/bdb/env/env_register.c
BitKeeper/deleted/.del-env_stat.c:
  Delete: storage/bdb/env/env_stat.c
BitKeeper/deleted/.del-fileops.src:
  Delete: storage/bdb/fileops/fileops.src
BitKeeper/deleted/.del-foldernew.ibd:
  Delete: storage/bdb/dist/winmsi/images/foldernew.ibd
BitKeeper/deleted/.del-folderup.ibd:
  Delete: storage/bdb/dist/winmsi/images/folderup.ibd
BitKeeper/deleted/.del-sleepycat.jpg:
  Delete: storage/bdb/dist/winmsi/images/sleepycat.jpg
BitKeeper/deleted/.del-topstripe.ibd:
  Delete: storage/bdb/dist/winmsi/images/topstripe.ibd
BitKeeper/deleted/.del-webicon.ico:
  Delete: storage/bdb/dist/winmsi/images/webicon.ico
BitKeeper/deleted/.del-winbuild.bat:
  Delete: storage/bdb/dist/winmsi/winbuild.bat
BitKeeper/deleted/.del-fop_basic.c:
  Delete: storage/bdb/fileops/fop_basic.c
BitKeeper/deleted/.del-fop_rec.c:
  Delete: storage/bdb/fileops/fop_rec.c
BitKeeper/deleted/.del-fop_util.c:
  Delete: storage/bdb/fileops/fop_util.c
BitKeeper/deleted/.del-hash.c:
  Delete: storage/bdb/hash/hash.c
BitKeeper/deleted/.del-hash.src:
  Delete: storage/bdb/hash/hash.src
BitKeeper/deleted/.del-hash_conv.c:
  Delete: storage/bdb/hash/hash_conv.c
BitKeeper/deleted/.del-hash_dup.c:
  Delete: storage/bdb/hash/hash_dup.c
BitKeeper/deleted/.del-hash_func.c:
  Delete: storage/bdb/hash/hash_func.c
BitKeeper/deleted/.del-hash_meta.c:
  Delete: storage/bdb/hash/hash_meta.c
BitKeeper/deleted/.del-hash_method.c:
  Delete: storage/bdb/hash/hash_method.c
BitKeeper/deleted/.del-hash_open.c:
  Delete: storage/bdb/hash/hash_open.c
BitKeeper/deleted/.del-hash_page.c:
  Delete: storage/bdb/hash/hash_page.c
BitKeeper/deleted/.del-hash_rec.c:
  Delete: storage/bdb/hash/hash_rec.c
BitKeeper/deleted/.del-hash_reclaim.c:
  Delete: storage/bdb/hash/hash_reclaim.c
BitKeeper/deleted/.del-hash_stat.c:
  Delete: storage/bdb/hash/hash_stat.c
BitKeeper/deleted/.del-hash_stub.c:
  Delete: storage/bdb/hash/hash_stub.c
BitKeeper/deleted/.del-hash_upgrade.c:
  Delete: storage/bdb/hash/hash_upgrade.c
BitKeeper/deleted/.del-hash_verify.c:
  Delete: storage/bdb/hash/hash_verify.c
BitKeeper/deleted/.del-Design:
  Delete: storage/bdb/lock/Design
BitKeeper/deleted/.del-hmac.c:
  Delete: storage/bdb/hmac/hmac.c
BitKeeper/deleted/.del-hsearch.c:
  Delete: storage/bdb/hsearch/hsearch.c
BitKeeper/deleted/.del-lock.c:
  Delete: storage/bdb/lock/lock.c
BitKeeper/deleted/.del-lock_deadlock.c:
  Delete: storage/bdb/lock/lock_deadlock.c
BitKeeper/deleted/.del-lock_failchk.c:
  Delete: storage/bdb/lock/lock_failchk.c
BitKeeper/deleted/.del-lock_id.c:
  Delete: storage/bdb/lock/lock_id.c
BitKeeper/deleted/.del-lock_list.c:
  Delete: storage/bdb/lock/lock_list.c
BitKeeper/deleted/.del-lock_method.c:
  Delete: storage/bdb/lock/lock_method.c
BitKeeper/deleted/.del-lock_region.c:
  Delete: storage/bdb/lock/lock_region.c
BitKeeper/deleted/.del-lock_stat.c:
  Delete: storage/bdb/lock/lock_stat.c
BitKeeper/deleted/.del-lock_timer.c:
  Delete: storage/bdb/lock/lock_timer.c
BitKeeper/deleted/.del-lock_util.c:
  Delete: storage/bdb/lock/lock_util.c
BitKeeper/deleted/.del-log.c:
  Delete: storage/bdb/log/log.c
BitKeeper/deleted/.del-log_archive.c:
  Delete: storage/bdb/log/log_archive.c
BitKeeper/deleted/.del-log_compare.c:
  Delete: storage/bdb/log/log_compare.c
BitKeeper/deleted/.del-log_debug.c:
  Delete: storage/bdb/log/log_debug.c
BitKeeper/deleted/.del-log_get.c:
  Delete: storage/bdb/log/log_get.c
BitKeeper/deleted/.del-sha1.c:
  Delete: storage/bdb/hmac/sha1.c
BitKeeper/deleted/.del-README~cce8f408842aa70c:
  Delete: storage/bdb/mutex/README
BitKeeper/deleted/.del-log_method.c:
  Delete: storage/bdb/log/log_method.c
BitKeeper/deleted/.del-log_put.c:
  Delete: storage/bdb/log/log_put.c
BitKeeper/deleted/.del-log_stat.c:
  Delete: storage/bdb/log/log_stat.c
BitKeeper/deleted/.del-mp_alloc.c:
  Delete: storage/bdb/mp/mp_alloc.c
BitKeeper/deleted/.del-mp_bh.c:
  Delete: storage/bdb/mp/mp_bh.c
BitKeeper/deleted/.del-mp_fget.c:
  Delete: storage/bdb/mp/mp_fget.c
BitKeeper/deleted/.del-mp_fmethod.c:
  Delete: storage/bdb/mp/mp_fmethod.c
BitKeeper/deleted/.del-mp_fopen.c:
  Delete: storage/bdb/mp/mp_fopen.c
BitKeeper/deleted/.del-mp_fput.c:
  Delete: storage/bdb/mp/mp_fput.c
BitKeeper/deleted/.del-mp_fset.c:
  Delete: storage/bdb/mp/mp_fset.c
BitKeeper/deleted/.del-mp_method.c:
  Delete: storage/bdb/mp/mp_method.c
BitKeeper/deleted/.del-mp_region.c:
  Delete: storage/bdb/mp/mp_region.c
BitKeeper/deleted/.del-mp_register.c:
  Delete: storage/bdb/mp/mp_register.c
BitKeeper/deleted/.del-mp_stat.c:
  Delete: storage/bdb/mp/mp_stat.c
BitKeeper/deleted/.del-mp_sync.c:
  Delete: storage/bdb/mp/mp_sync.c
BitKeeper/deleted/.del-mp_trickle.c:
  Delete: storage/bdb/mp/mp_trickle.c
BitKeeper/deleted/.del-mut_alloc.c:
  Delete: storage/bdb/mutex/mut_alloc.c
BitKeeper/deleted/.del-mut_fcntl.c:
  Delete: storage/bdb/mutex/mut_fcntl.c
BitKeeper/deleted/.del-mut_method.c:
  Delete: storage/bdb/mutex/mut_method.c
BitKeeper/deleted/.del-mut_pthread.c:
  Delete: storage/bdb/mutex/mut_pthread.c
BitKeeper/deleted/.del-mut_region.c:
  Delete: storage/bdb/mutex/mut_region.c
BitKeeper/deleted/.del-mut_stat.c:
  Delete: storage/bdb/mutex/mut_stat.c
BitKeeper/deleted/.del-mut_tas.c:
  Delete: storage/bdb/mutex/mut_tas.c
BitKeeper/deleted/.del-mut_win32.c:
  Delete: storage/bdb/mutex/mut_win32.c
BitKeeper/deleted/.del-os_abs.c:
  Delete: storage/bdb/os/os_abs.c
BitKeeper/deleted/.del-os_alloc.c:
  Delete: storage/bdb/os/os_alloc.c
BitKeeper/deleted/.del-os_clock.c:
  Delete: storage/bdb/os/os_clock.c
BitKeeper/deleted/.del-os_config.c:
  Delete: storage/bdb/os/os_config.c
BitKeeper/deleted/.del-os_dir.c:
  Delete: storage/bdb/os/os_dir.c
BitKeeper/deleted/.del-os_errno.c:
  Delete: storage/bdb/os/os_errno.c
BitKeeper/deleted/.del-os_fid.c:
  Delete: storage/bdb/os/os_fid.c
BitKeeper/deleted/.del-os_flock.c:
  Delete: storage/bdb/os/os_flock.c
BitKeeper/deleted/.del-tm.c:
  Delete: storage/bdb/mutex/tm.c
BitKeeper/deleted/.del-uts4_cc.s:
  Delete: storage/bdb/mutex/uts4_cc.s
BitKeeper/deleted/.del-os_fsync.c:
  Delete: storage/bdb/os/os_fsync.c
BitKeeper/deleted/.del-os_handle.c:
  Delete: storage/bdb/os/os_handle.c
BitKeeper/deleted/.del-os_id.c:
  Delete: storage/bdb/os/os_id.c
BitKeeper/deleted/.del-os_map.c:
  Delete: storage/bdb/os/os_map.c
BitKeeper/deleted/.del-os_method.c:
  Delete: storage/bdb/os/os_method.c
BitKeeper/deleted/.del-os_mkdir.c:
  Delete: storage/bdb/os/os_mkdir.c
BitKeeper/deleted/.del-os_oflags.c:
  Delete: storage/bdb/os/os_oflags.c
BitKeeper/deleted/.del-os_open.c:
  Delete: storage/bdb/os/os_open.c
BitKeeper/deleted/.del-os_region.c:
  Delete: storage/bdb/os/os_region.c
BitKeeper/deleted/.del-os_rename.c:
  Delete: storage/bdb/os/os_rename.c
BitKeeper/deleted/.del-os_root.c:
  Delete: storage/bdb/os/os_root.c
BitKeeper/deleted/.del-os_rpath.c:
  Delete: storage/bdb/os/os_rpath.c
BitKeeper/deleted/.del-os_rw.c:
  Delete: storage/bdb/os/os_rw.c
BitKeeper/deleted/.del-os_seek.c:
  Delete: storage/bdb/os/os_seek.c
BitKeeper/deleted/.del-os_sleep.c:
  Delete: storage/bdb/os/os_sleep.c
BitKeeper/deleted/.del-os_spin.c:
  Delete: storage/bdb/os/os_spin.c
BitKeeper/deleted/.del-os_stat.c:
  Delete: storage/bdb/os/os_stat.c
BitKeeper/deleted/.del-os_tmpdir.c:
  Delete: storage/bdb/os/os_tmpdir.c
BitKeeper/deleted/.del-os_truncate.c:
  Delete: storage/bdb/os/os_truncate.c
BitKeeper/deleted/.del-os_abs.c~ad5b599d8bf6549f:
  Delete: storage/bdb/os_win32/os_abs.c
BitKeeper/deleted/.del-os_clock.c~2add52eff231a274:
  Delete: storage/bdb/os_win32/os_clock.c
BitKeeper/deleted/.del-os_config.c~53e193a5e5e97cfd:
  Delete: storage/bdb/os_win32/os_config.c
BitKeeper/deleted/.del-os_dir.c~99fbc266717a871a:
  Delete: storage/bdb/os_win32/os_dir.c
BitKeeper/deleted/.del-os_errno.c~44204df07323cffb:
  Delete: storage/bdb/os_win32/os_errno.c
BitKeeper/deleted/.del-os_fid.c~8f922f06a0fa5a0:
  Delete: storage/bdb/os_win32/os_fid.c
BitKeeper/deleted/.del-os_flock.c~cc35099adbda7408:
  Delete: storage/bdb/os_win32/os_flock.c
BitKeeper/deleted/.del-os_fsync.c~eebb7e558dacef1c:
  Delete: storage/bdb/os_win32/os_fsync.c
BitKeeper/deleted/.del-os_handle.c~281e6b79ac5147f1:
  Delete: storage/bdb/os_win32/os_handle.c
BitKeeper/deleted/.del-os_map.c~e8726a67b9abaa30:
  Delete: storage/bdb/os_win32/os_map.c
BitKeeper/deleted/.del-os_open.c~996e9987793f8dbc:
  Delete: storage/bdb/os_win32/os_open.c
BitKeeper/deleted/.del-os_rename.c~1c318d0b60c977bd:
  Delete: storage/bdb/os_win32/os_rename.c
BitKeeper/deleted/.del-os_rw.c~7ec61bd993fe999f:
  Delete: storage/bdb/os_win32/os_rw.c
BitKeeper/deleted/.del-os_seek.c~2b5bef3cccfa60c:
  Delete: storage/bdb/os_win32/os_seek.c
BitKeeper/deleted/.del-os_sleep.c~d0512f5626e7c40b:
  Delete: storage/bdb/os_win32/os_sleep.c
BitKeeper/deleted/.del-os_spin.c~e2abf23edb5bac39:
  Delete: storage/bdb/os_win32/os_spin.c
BitKeeper/deleted/.del-os_stat.c~b7aea1c8fe0bc4c4:
  Delete: storage/bdb/os_win32/os_stat.c
BitKeeper/deleted/.del-os_truncate.c~9761b239f54b2d96:
  Delete: storage/bdb/os_win32/os_truncate.c
BitKeeper/deleted/.del-os_unlink.c:
  Delete: storage/bdb/os/os_unlink.c
BitKeeper/deleted/.del-os_type.c:
  Delete: storage/bdb/os_win32/os_type.c
BitKeeper/deleted/.del-os_unlink.c~6dee667279d01609:
  Delete: storage/bdb/os_win32/os_unlink.c
BitKeeper/deleted/.del-qam.c:
  Delete: storage/bdb/qam/qam.c
BitKeeper/deleted/.del-qam.src:
  Delete: storage/bdb/qam/qam.src
BitKeeper/deleted/.del-qam_conv.c:
  Delete: storage/bdb/qam/qam_conv.c
BitKeeper/deleted/.del-qam_files.c:
  Delete: storage/bdb/qam/qam_files.c
BitKeeper/deleted/.del-qam_method.c:
  Delete: storage/bdb/qam/qam_method.c
BitKeeper/deleted/.del-qam_open.c:
  Delete: storage/bdb/qam/qam_open.c
BitKeeper/deleted/.del-qam_rec.c:
  Delete: storage/bdb/qam/qam_rec.c
BitKeeper/deleted/.del-qam_stat.c:
  Delete: storage/bdb/qam/qam_stat.c
BitKeeper/deleted/.del-qam_stub.c:
  Delete: storage/bdb/qam/qam_stub.c
BitKeeper/deleted/.del-qam_upgrade.c:
  Delete: storage/bdb/qam/qam_upgrade.c
BitKeeper/deleted/.del-qam_verify.c:
  Delete: storage/bdb/qam/qam_verify.c
BitKeeper/deleted/.del-rep.src:
  Delete: storage/bdb/rep/rep.src
BitKeeper/deleted/.del-rep_backup.c:
  Delete: storage/bdb/rep/rep_backup.c
BitKeeper/deleted/.del-rep_elect.c:
  Delete: storage/bdb/rep/rep_elect.c
BitKeeper/deleted/.del-rep_log.c:
  Delete: storage/bdb/rep/rep_log.c
BitKeeper/deleted/.del-rep_method.c:
  Delete: storage/bdb/rep/rep_method.c
BitKeeper/deleted/.del-rep_record.c:
  Delete: storage/bdb/rep/rep_record.c
BitKeeper/deleted/.del-rep_region.c:
  Delete: storage/bdb/rep/rep_region.c
BitKeeper/deleted/.del-rep_stat.c:
  Delete: storage/bdb/rep/rep_stat.c
BitKeeper/deleted/.del-rep_stub.c:
  Delete: storage/bdb/rep/rep_stub.c
BitKeeper/deleted/.del-rep_util.c:
  Delete: storage/bdb/rep/rep_util.c
BitKeeper/deleted/.del-rep_verify.c:
  Delete: storage/bdb/rep/rep_verify.c
BitKeeper/deleted/.del-seq_stat.c:
  Delete: storage/bdb/sequence/seq_stat.c
BitKeeper/deleted/.del-sequence.c:
  Delete: storage/bdb/sequence/sequence.c
BitKeeper/deleted/.del-txn.c:
  Delete: storage/bdb/txn/txn.c
BitKeeper/deleted/.del-txn.src:
  Delete: storage/bdb/txn/txn.src
BitKeeper/deleted/.del-txn_chkpt.c:
  Delete: storage/bdb/txn/txn_chkpt.c
BitKeeper/deleted/.del-txn_failchk.c:
  Delete: storage/bdb/txn/txn_failchk.c
BitKeeper/deleted/.del-txn_method.c:
  Delete: storage/bdb/txn/txn_method.c
BitKeeper/deleted/.del-txn_rec.c:
  Delete: storage/bdb/txn/txn_rec.c
BitKeeper/deleted/.del-txn_recover.c:
  Delete: storage/bdb/txn/txn_recover.c
BitKeeper/deleted/.del-txn_region.c:
  Delete: storage/bdb/txn/txn_region.c
BitKeeper/deleted/.del-txn_stat.c:
  Delete: storage/bdb/txn/txn_stat.c
BitKeeper/deleted/.del-txn_util.c:
  Delete: storage/bdb/txn/txn_util.c
BitKeeper/deleted/.del-xa.c:
  Delete: storage/bdb/xa/xa.c
BitKeeper/deleted/.del-xa_db.c:
  Delete: storage/bdb/xa/xa_db.c
BitKeeper/deleted/.del-xa_map.c:
  Delete: storage/bdb/xa/xa_map.c
sql/field.cc:
  Antony's patch
sql/field.h:
  Antony's patch
 2006-08-15 21:49:26 -07:00
unknown
600f11552a fix windows build 2006-08-15 01:54:14 -07:00
unknown
948a894327 Merge zim.(none):/home/brian/mysql/dep-5.0 
into  zim.(none):/home/brian/mysql/dep-5.1


client/mysql.cc:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/heap_btree.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/repair.test:
  Auto merged
scripts/fill_func_tables.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
storage/heap/hp_delete.c:
  Auto merged
storage/myisam/mi_update.c:
  Auto merged
storage/myisam/sort.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Fixing Result
mysql-test/r/repair.result:
  Fixing result
mysql-test/t/mysqldump.test:
  Merging change
storage/archive/ha_archive.cc:
  Merging in change
 2006-08-14 15:24:29 -07:00
unknown
ba8be73946 Fix for bug#20648 We introduce a new field method for knowing "real size", and we now in archive null unused bits of a row to null before writing. 
sql/field.cc:
  data_length for field needs to be calculated directly.
sql/field.h:
  The new method data_length() returns the "real" length of the field.
sql/ha_archive.cc:
  Before a write_row() archive nulls space beyond the size of the row in varchars to make sure that compression only sees NULL.
 2006-08-14 03:29:17 -07:00
unknown
f68085c4e7 Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921:
  Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged
BitKeeper/deleted/.del-mysys.dsp~32695fee91189326:
  Auto merged
BitKeeper/deleted/.del-im_options_set.imtest~b53d9d60e5684833:
  Auto merged
BitKeeper/deleted/.del-im_options_unset.imtest~768eb186b51d0048:
  Auto merged
BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
dbug/dbug.c:
  Auto merged
extra/perror.c:
  Auto merged
extra/yassl/src/yassl_imp.cpp:
  Auto merged
extra/yassl/src/yassl_int.cpp:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/func_compress.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/im_daemon_life_cycle.result:
  Auto merged
mysql-test/r/im_utils.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/mysqlcheck.result:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/r/rpl_trigger.result:
  Auto merged
mysql-test/r/sp-code.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged
mysql-test/t/im_utils.imtest:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/mysqlcheck.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/rpl_trigger.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/table.h:
  Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
mysql-test/r/im_life_cycle.result:
  e
  use local
mysql-test/r/ps.result:
  use local
client/Makefile.am:
  Manual merge.
client/mysqlimport.c:
  Manual merge.
configure.in:
  Manual merge.
mysql-test/mysql-test-run.pl:
  Manual merge.
mysql-test/r/mysqldump.result:
  Manual merge.
mysql-test/r/mysqltest.result:
  Manual merge.
mysql-test/r/ndb_basic.result:
  Manual merge.
mysql-test/r/rpl_view.result:
  Manual merge.
mysql-test/r/show_check.result:
  Manual merge.
mysql-test/r/sp-error.result:
  Manual merge.
mysql-test/r/sp.result:
  Manual merge.
mysql-test/r/union.result:
  Manual merge.
mysql-test/t/mysqldump.test:
  Manual merge.
mysql-test/t/mysqltest.test:
  Manual merge.
mysql-test/t/ndb_basic.test:
  Manual merge.
mysql-test/t/rpl_sp.test:
  Manual merge.
mysql-test/t/rpl_view.test:
  Manual merge.
mysql-test/t/show_check.test:
  Manual merge.
mysql-test/t/sp-error.test:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.
sql/item_sum.cc:
  Manual merge.
sql/mysql_priv.h:
  Manual merge.
sql/sp_head.cc:
  Manual merge.
sql/sql_db.cc:
  Manual merge.
sql/sql_delete.cc:
  Manual merge.
sql/sql_lex.h:
  Manual merge.
sql/sql_show.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
sql/sql_trigger.cc:
  Manual merge.
sql/sql_yacc.yy:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.
 2006-08-12 21:06:51 +04:00
unknown
22b92457fc Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge


BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822:
  Auto merged
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
mysql-test/t/warnings.test:
  Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/r/sp.result:
  Manual merge.  Place 5.0 test before 5.1 test.
mysql-test/t/sp.test:
  Manual merge.  Place 5.0 test before 5.1 test.
mysys/my_bitmap.c:
  Manual merge.
scripts/make_binary_distribution.sh:
  Manual merge.
sql/Makefile.am:
  Manual merge.
sql/slave.cc:
  Manual merge.
sql/sql_class.h:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
sql/sql_select.cc:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.
 2006-08-09 13:37:20 +04:00
unknown
f1af1a5d7e Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-holyfoot 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-5.0-merge2

Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:

bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge


BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
  Auto merged
configure.in:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
BitKeeper/deleted/.del-libmysqld.vcproj~a75d5b9a5967dea0:
  Auto merged
BitKeeper/deleted/.del-libmysqld_ia64.dsp~578ab58d5f281d2a:
  Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Auto merged
BitKeeper/deleted/.del-mysqld_ia64.dsp~7f8cf84d81ee04e2:
  Auto merged
BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
  Auto merged
BitKeeper/deleted/.del-mysqldemb.vcproj~54c64d55ccc51a7c:
  Auto merged
BitKeeper/deleted/.del-mysqldemb_ia64.dsp~c7f7d75d542393cd:
  Auto merged
BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
  Auto merged
BitKeeper/deleted/.del-mysqldmax_ia64.dsp~25006b7cc0725ad1:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
include/my_base.h:
  Hand merge of conflicts (5.0-5.1 merge), second try 
  
  Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:
  
  bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
mysql-test/r/federated.result:
  Hand merge of conflicts (5.0-5.1 merge), second try 
  
  Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:
  
  bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
mysql-test/t/federated.test:
  Hand merge of conflicts (5.0-5.1 merge), second try 
  
  Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:
  
  bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
sql/field.cc:
  Hand merge of conflicts (5.0-5.1 merge), second try 
  
  Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:
  
  bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
sql/ha_federated.cc:
  Hand merge of conflicts (5.0-5.1 merge), second try 
  
  Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:
  
  bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
sql/handler.cc:
  Hand merge of conflicts (5.0-5.1 merge), second try 
  
  Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:
  
  bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
tests/mysql_client_test.c:
  Hand merge of conflicts (5.0-5.1 merge), second try 
  
  Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:
  
  bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
 2006-08-08 09:01:32 -07:00
unknown
ed44a2ee51 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/func_group.result:
  Merge manually
mysql-test/t/func_group.test:
  Merge manually
 2006-08-03 09:32:58 +02:00
unknown
c102fe94ad Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql


client/mysql.cc:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/time.cc:
  Auto merged
mysql-test/r/sp.result:
  Manual merge
mysql-test/t/sp.test:
  Manual merge
 2006-08-02 16:44:56 +04:00
unknown
1081dd6f0d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


configure.in:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2006-08-01 20:24:30 +02:00
unknown
f75e79e0fc After merge fix 2006-08-01 08:49:43 +04:00
unknown
ddb91478e8 Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 
into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql


client/mysql.cc:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/group_min_max.result:
  Auto merged
BitKeeper/deleted/.del-make_win_src_distribution.sh~f80d8fca44e4e5f1:
  Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged
BitKeeper/deleted/.del-mysqld_ia64.dsp~7f8cf84d81ee04e2:
  Auto merged
BitKeeper/deleted/.del-mysqldump.dsp~a8bd23547d3fc27e:
  Auto merged
BitKeeper/deleted/.del-mysqldump_ia64.dsp~a2aabe898be35b31:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
mysql-test/t/group_min_max.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/time.cc:
  Auto merged
storage/ndb/test/ndbapi/Makefile.am:
  Auto merged
strings/decimal.c:
  Auto merged
mysql-test/r/analyse.result:
  Manual merge
mysql-test/r/bigint.result:
  Manual merge
mysql-test/r/create.result:
  Manual merge
mysql-test/r/information_schema.result:
  Manual merge
mysql-test/r/ps_2myisam.result:
  Manual merge
mysql-test/r/ps_3innodb.result:
  Manual merge
mysql-test/r/ps_4heap.result:
  Manual merge
mysql-test/r/ps_5merge.result:
  Manual merge
mysql-test/r/ps_6bdb.result:
  Manual merge
mysql-test/r/rpl_insert_id.result:
  Manual merge
mysql-test/r/select.result:
  Manual merge
mysql-test/r/sp.result:
  Manual merge
mysql-test/r/subselect.result:
  Manual merge
mysql-test/t/information_schema.test:
  Manual merge
mysql-test/t/rpl_insert_id.test:
  Manual merge
sql/field.h:
  Manual merge
sql/item.cc:
  Manual merge
sql/item.h:
  Manual merge
sql/item_strfunc.h:
  Manual merge
sql/item_sum.cc:
  Manual merge
sql/mysql_priv.h:
  Manual merge
sql/share/errmsg.txt:
  Manual merge
sql/sql_class.h:
  Manual merge
sql/sql_select.cc:
  Manual merge
 2006-07-30 00:33:24 +04:00
unknown
b60272915f Merge siva.hindu.god:/usr/home/tim/m/bk/global-41 
into  siva.hindu.god:/usr/home/tim/m/bk/global-50


mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/field.cc:
  Auto merged
 2006-07-26 13:30:03 -06:00
unknown
75220954bf Merge trift2.:/M41/clone-4.1 
into  trift2.:/M41/push-4.1


sql/field.cc:
  Auto merged
sql/sql_locale.cc:
  Changes were already present (and even better) == Null-merge == "ul".
 2006-07-24 19:18:30 +02:00
unknown
9d5b76eba9 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b16327


sql/field.cc:
  Auto merged
mysql-test/r/func_time.result:
  merging
mysql-test/t/func_time.test:
  merging
 2006-07-23 14:17:01 +05:00
unknown
f171d628c7 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/work/autopush/12185-bug-5.0-opt-mysql


mysql-test/r/create.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
mysql-test/r/union.result:
  SCCS merged
mysql-test/t/union.test:
  SCCS merged
 2006-07-22 02:15:36 +04:00
unknown
35209c68ea Fixed bug#12185: Data type aggregation may produce wrong result 
The Item::tmp_table_field_from_field_type() function creates Field_datetime
object instead of Field_timestamp object for timestamp field thus always
changing data type is a tmp table is used.

The Field_blob object constructor which is used in the 
Item::tmp_table_field_from_field_type() is always setting packlength field of
newly created blob to 4. This leads to changing fields data type for example
from the blob to the longblob if a temporary table is used.

The Item::make_string_field() function always converts Field_string objects 
to Field_varstring objects. This leads to changing data type from the 
char/binary to varchar/varbinary.

Added appropriate Field_timestamp object constructor for using in the 
Item::tmp_table_field_from_field_type() function.

Added Field_blob object constructor which sets pack length according to
max_length argument.

The Item::tmp_table_field_from_field_type() function now creates
Field_timestamp object for a timestamp field.

The Item_type_holder::display_length() now returns correct NULL length NULL
length. 

The Item::make_string_field() function now doesn't change Field_string to
Field_varstring in the case of Item_type_holder. 

The Item::tmp_table_field_from_field_type() function now uses the Field_blob
constructor which sets packlength according to max_length.


mysql-test/t/union.test:
  Added test case for bug#12185: Data type aggregation may produce wrong result
  Corrected test case after fix for bug#12185
mysql-test/t/innodb.test:
  Corrected test case after fix for bug#12185
mysql-test/r/union.result:
  Added test case for bug#12185: Data type aggregation may produce wrong result
   Corrected test case after fix for bug#12185
mysql-test/r/innodb.result:
  Corrected test case after fix for bug#12185
mysql-test/r/create.result:
  Corrected the test case after fixing bug#12185
sql/field.h:
  Fixed bug#12185: Data type aggregation may produce wrong result
  Added Field_blob object constructor which sets packlength according to
  max_length argument.
sql/item.cc:
  Fixed bug#12185: Data type aggregation may produce wrong result
  The Item::make_string_field() function now doesn't change Field_string to
  Field_varstring in the case of Item_type_holder.
  The Item::tmp_table_field_from_field_type() function now creates
  Field_timestamp object for a timestamp field.
  The Item::tmp_table_field_from_field_type() function now uses the Field_blob
  constructor which sets packlength according to max_length.
  The Item_type_holder::display_length() now returns correct NULL length NULL
  length.
sql/field.cc:
  Fixed bug#12185: Data type aggregation may produce wrong result
  Added appropriate Field_timestamp object constructor for using in the 
  Item::tmp_table_field_from_field_type() function.
 2006-07-22 02:08:00 +04:00
unknown
03d411b1d1 Bug#6147: Traditional: Assigning a string to a numeric column has unexpected results 
The problem was that when converting a string to an exact number,
rounding didn't work, because conversion didn't understand
approximate numbers notation.
Fix: a new function for string-to-number conversion was implemented,
which is aware of approxinate number notation (with decimal point
and exponent, e.g. -19.55e-1)


include/m_ctype.h:
  Adding new function into MY_CHARSET_HANDLER
  Adding prototypes for 8bit and ucs2 functions.
mysql-test/r/loaddata.result:
  Fixing results
mysql-test/r/ps_2myisam.result:
  Fixing results
mysql-test/r/ps_3innodb.result:
  Fixing results
mysql-test/r/ps_4heap.result:
  Fixing results
mysql-test/r/ps_5merge.result:
  Fixing results
mysql-test/r/ps_6bdb.result:
  Fixing results
mysql-test/r/rpl_rewrite_db.result:
  Fixing results
mysql-test/r/select.result:
  Fixing results
mysql-test/r/sp-vars.result:
  Fixing results
mysql-test/r/strict.result:
  Fixing results
mysql-test/r/view.result:
  Fixing results
mysql-test/r/warnings.result:
  Fixing results
mysql-test/t/strict.test:
  Fixing results
sql/field.cc:
  Using new function
strings/ctype-big5.c:
  Adding new function into the MY_CHARSET_HANDLER structure
strings/ctype-bin.c:
  Adding new function into the MY_CHARSET_HANDLER structure
strings/ctype-cp932.c:
  Adding new function into the MY_CHARSET_HANDLER structure
strings/ctype-euc_kr.c:
  Adding new function into the MY_CHARSET_HANDLER structure
strings/ctype-eucjpms.c:
  Adding new function into the MY_CHARSET_HANDLER structure
strings/ctype-gb2312.c:
  Adding new function into the MY_CHARSET_HANDLER structure
strings/ctype-gbk.c:
  Adding new function into the MY_CHARSET_HANDLER structure
strings/ctype-latin1.c:
  Adding new function into the MY_CHARSET_HANDLER structure
strings/ctype-simple.c:
  Implementing my_strntoull10_8bit
  Adding new function into MY_CHARSET_HANDLER
strings/ctype-sjis.c:
  Adding new function into the MY_CHARSET_HANDLER structure
strings/ctype-tis620.c:
  Adding new function into the MY_CHARSET_HANDLER structure
strings/ctype-ucs2.c:
  Implementing UCS2 wrapper for 8bit version
  Adding new function into the MY_CHARSET_HANDLER structure
strings/ctype-ujis.c:
  Adding new function into the MY_CHARSET_HANDLER structure
strings/ctype-utf8.c:
  Adding new function into the MY_CHARSET_HANDLER structure
mysql-test/r/round.result:
  New BitKeeper file ``mysql-test/r/round.result''
mysql-test/t/round.test:
  New BitKeeper file ``mysql-test/t/round.test''
 2006-07-20 13:41:12 +05:00
unknown
d7c0c66706 Bug #21135 Crash in test "func_time" 
- backport patch from 5.0
 - "table" can be NULL in temporary fields used for type conversion


sql/field.cc:
  table can be NULL in temporary fields used for type conversion.
  Store value in field as if db_low_byte_first was set.
sql/field.h:
  table can be NULL in temporary fields used for type conversion.
  Store value in field as if db_low_byte_first was set.
 2006-07-19 15:55:04 +02:00
unknown
20c2ddaf0c Bug #19498: Inconsistent support for DEFAULT in TEXT columns 
When a default of '' was specified for TEXT/BLOB columns, the specification
  was silently ignored. This is presumably to be nice to applications (or
  people) who generate their column definitions in a not-very-clever fashion.

  For clarity, doing this now results in a warning, or an error in strict
  mode.


mysql-test/r/federated.result:
  Update results
mysql-test/r/fulltext_distinct.result:
  Update results
mysql-test/r/fulltext_update.result:
  Update results
mysql-test/r/gis-rtree.result:
  Update results
mysql-test/r/gis.result:
  Update results
mysql-test/r/join_outer.result:
  Update results
mysql-test/r/order_by.result:
  Update results
mysql-test/r/type_blob.result:
  Add new results
mysql-test/r/type_ranges.result:
  Update results
mysql-test/t/type_blob.test:
  Add new test
sql/field.cc:
  Issue a warning when setting '' as the default on a BLOB/TEXT column,
  and make it an error in strict mode. Also, clarify comments about when
  NO_DEFAULT_VALUE_FLAG is set.
 2006-07-18 16:04:18 -07:00
unknown
abbf7ad014 Bug #17608: String literals lost during INSERT query on FEDERATED table 
The Federated storage engine used Field methods that had arbitrary limits on
  the amount of data they could process, which caused problems with data
  over that limit (4K). By removing those Field methods and just using
  features of the String class, we can avoid this problem.


mysql-test/r/federated.result:
  Add new results
mysql-test/t/federated.test:
  Add new regression test
sql/field.cc:
  Remove unnecessary methods
sql/field.h:
  Remove unnecessary methods
sql/ha_federated.cc:
  Remove use of quote_data, use String::print() to get escaping of strings,
  and don't bother with needs_quotes, just always quote values.
 2006-07-12 16:33:29 -07:00
unknown
d6e3a9ddcb Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/ndb_autodiscover3.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/wait_timeout.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
 2006-07-10 13:38:22 -04:00
unknown
013cbc3964 Merge chilla.local:/home/mydev/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-bug16218


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/table.cc:
  Auto merged
 2006-07-06 19:36:07 +02:00
unknown
a085d0988e Merge chilla.local:/home/mydev/mysql-5.0-bug16218 
into  chilla.local:/home/mydev/mysql-5.1-ateam


sql/field.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/field.cc:
  Manual merge
sql/sql_insert.cc:
  Manual merge
sql/table.cc:
  Manual merge
 2006-07-06 16:09:50 +02:00
unknown
30de4903ae Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint


BUILD/compile-dist:
  Auto merged
BitKeeper/deleted/.del-partition_innodb.result:
  Auto merged
BitKeeper/deleted/.del-partition_innodb.test:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/create_not_windows.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/wait_timeout.test:
  Auto merged
mysys/my_lib.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/unireg.cc:
  Auto merged
mysql-test/extra/rpl_tests/rpl_log.test:
  manuakl merge
mysql-test/lib/mtr_process.pl:
  manuakl merge
mysql-test/mysql-test-run.pl:
  manuakl merge
mysql-test/r/type_newdecimal.result:
  manuakl merge
mysql-test/t/create.test:
  manuakl merge
mysql-test/t/func_group.test:
  manuakl merge
mysql-test/t/type_newdecimal.test:
  manuakl merge
 2006-07-05 16:16:09 -04:00
unknown
f92fd7c98a Fix for bug #18014: data loss caused by altering decimal fields. 
mysql-test/r/type_newdecimal.result:
  Fix for bug #18014: data loss caused by altering decimal fields.
    - test result
mysql-test/t/type_newdecimal.test:
  Fix for bug #18014: data loss caused by altering decimal fields.
    - test case
sql/field.cc:
  Fix for bug #18014: data loss caused by altering decimal fields.
    - Field_new_decimal::is_equal() introduced for proper comparisons of the decimal field definitions.
sql/field.h:
  Fix for bug #18014: data loss caused by altering decimal fields.
    - Field_new_decimal::is_equal() introduced for proper comparisons of the decimal field definitions.
 2006-06-27 13:02:02 +05:00
unknown
ab5ebc0fb7 Bug#16218 - Crash on insert delayed 
Bug#17294 - INSERT DELAYED puting an \n before data
Bug#16611 - INSERT DELAYED corrupts data
Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
Combined as Bug#16218.

INSERT DELAYED crashed in 5.0 on a table with a varchar that 
could be NULL and was created pre-5.0 (Bugs 16218 and 13707).
INSERT DELAYED corrupted data in 5.0 on a table with varchar 
fields that was created pre-5.0 (Bugs 17294 and 16611).

In case of INSERT DELAYED the open table is copied from the
delayed insert thread to be able to create a record for the 
queue. When copying the fields, a method was used that did 
convert old varchar to new varchar fields and did not set up 
some pointers into the record buffer of the table.

The field conversion was guilty for the misinterpretation of 
the record contents by the delayed insert thread. The wrong
pointer setup was guilty for the crashes.

For Bug 13707 (Server crash with INSERT DELAYED on MyISAM table)
I fixed the above mentioned method to set up one of the pointers.
For Bug 16218 I set up the other pointers too.

But when looking at the corruptions I got aware that converting
the field type was totally wrong for INSERT DELAYED. The copied
table is used to create a record that is to be sent to the
delayed insert thread. Of course it can interpret the record
correctly only if all field types are the same in both table
objects.

So I revoked the fix for Bug 13707 and changed the new_field() 
method so that it can suppress conversions.

No test case as this is a migration problem. One needs to
create a table with 4.x and use it with 5.x. I added two
test scripts to the bug report.


sql/field.cc:
  Bug#16218 - Crash on insert delayed
  Bug#17294 - INSERT DELAYED puting an \n before data
  Bug#16611 - INSERT DELAYED corrupts data
  Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
  Combined as Bug#16218.
  
  Added parameter 'keep_type' to Field::new_field().
  
  Undid the change from Bug 13707 (Server crash with INSERT 
  DELAYED on MyISAM table).
  I solved all four bugs in sql/sql_insert.cc by making exact
  duplicates of the fields. The new_field() method converts
  certain field types, which is wrong for INSERT DELAYED.
sql/field.h:
  Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
  Combined as Bug#16218.
  
  Added parameter 'keep_type' to Field::new_field().
sql/sql_insert.cc:
  Bug#16218 - Crash on insert delayed
  Bug#17294 - INSERT DELAYED puting an \n before data
  Bug#16611 - INSERT DELAYED corrupts data
  Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
  Combined as Bug#16218.
  
  Added comments. Made small style fixes.
  Used the new parameter 'keep_type' of Field::new_field()
  to avoid field type conversion. The table copy must have
  exactly the same types of fields as the original table.
  Otherwise the record contents created by the foreground 
  thread could be misinterpreted by the delayed insert thread.
sql/sql_select.cc:
  Bug#16218 - Crash on insert delayed
  Bug#17294 - INSERT DELAYED puting an \n before data
  Bug#16611 - INSERT DELAYED corrupts data
  Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
  Combined as Bug#16218.
  
  Added parameter 'keep_type' to Field::new_field().
  
  Undid the change from Bug 13707 (Server crash with INSERT 
  DELAYED on MyISAM table).
  I solved all four bugs in sql/sql_insert.cc by making exact
  duplicates of the fields. The new_field() method converts
  certain field types, which is wrong for INSERT DELAYED.
sql/sql_trigger.cc:
  Bug#16218 - Crash on insert delayed
  Bug#17294 - INSERT DELAYED puting an \n before data
  Bug#16611 - INSERT DELAYED corrupts data
  Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
  Combined as Bug#16218.
  
  Added parameter 'keep_type' to Field::new_field().
  
  Undid the change from Bug 13707 (Server crash with INSERT 
  DELAYED on MyISAM table).
  I solved all four bugs in sql/sql_insert.cc by making exact
  duplicates of the fields. The new_field() method converts
  certain field types, which is wrong for INSERT DELAYED.
sql/table.cc:
  Bug#16218 - Crash on insert delayed
  Bug#17294 - INSERT DELAYED puting an \n before data
  Bug#16611 - INSERT DELAYED corrupts data
  Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
  Combined as Bug#16218.
  
  Added parameter 'keep_type' to Field::new_field().
  
  Undid the change from Bug 13707 (Server crash with INSERT 
  DELAYED on MyISAM table).
  I solved all four bugs in sql/sql_insert.cc by making exact
  duplicates of the fields. The new_field() method converts
  certain field types, which is wrong for INSERT DELAYED.
 2006-06-26 20:57:18 +02:00