mirror of
https://github.com/MariaDB/server.git
synced 2025-02-22 21:33:08 +01:00
490 commits
Author | SHA1 | Message | Date | |
---|---|---|---|---|
![]() |
8e1f54501a |
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
into siva.hindu.god:/usr/home/tim/m/bk/51 mysql-test/Makefile.am: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/rpl_rotate_logs.test: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/mysqld_multi.sh: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/sql_class.h: Auto merged |
||
![]() |
ca589a4fc5 |
Merge siva.hindu.god:/usr/home/tim/m/bk/g50
into siva.hindu.god:/usr/home/tim/m/bk/50 mysql-test/Makefile.am: Auto merged mysql-test/mysql-test-run.pl: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/mysqld_multi.sh: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/sql_class.h: Auto merged |
||
![]() |
2b0189b812 |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch sql/field.cc: Auto merged sql/field.h: Auto merged sql/sql_load.cc: Auto merged |
||
![]() |
36c0cc54b3 |
Merge polly.local:/tmp/maint/bug24117/my51-bug24117
into polly.local:/home/kaa/src/maint/mysql-5.1-maint mysql-test/r/sp.result: Auto merged mysql-test/t/sp.test: Auto merged mysys/typelib.c: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged |
||
![]() |
3863e8d643 |
Merge polly.local:/tmp/maint/bug24117/my50-bug24117
into polly.local:/tmp/maint/bug24117/my51-bug24117 mysql-test/t/sp.test: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged mysql-test/r/sp.result: Manual merge |
||
![]() |
2bcbffa0c5 |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0 client/mysql.cc: Auto merged client/mysql_upgrade.c: Auto merged client/mysqltest.c: Auto merged extra/yassl/include/yassl_imp.hpp: Auto merged extra/yassl/include/yassl_int.hpp: Auto merged extra/yassl/taocrypt/include/algebra.hpp: Auto merged extra/yassl/taocrypt/include/des.hpp: Auto merged extra/yassl/taocrypt/include/modes.hpp: Auto merged extra/yassl/taocrypt/src/aes.cpp: Auto merged extra/yassl/taocrypt/src/algebra.cpp: Auto merged extra/yassl/taocrypt/test/test.cpp: Auto merged include/my_sys.h: Auto merged libmysql/libmysql.c: Auto merged libmysqld/lib_sql.cc: Auto merged myisam/mi_open.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/r/mysqltest.result: Auto merged mysql-test/t/mysqltest.test: Auto merged ndb/src/common/util/File.cpp: Auto merged ndb/src/common/util/socket_io.cpp: Auto merged ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Auto merged ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Auto merged ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Auto merged ndb/src/mgmsrv/Services.cpp: Auto merged ndb/tools/ndb_config.cpp: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.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_subselect.h: Auto merged sql/item_sum.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_load.cc: Auto merged sql-common/my_time.c: Auto merged sql/sql_string.h: Auto merged sql/sql_table.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged strings/strtod.c: Auto merged tests/mysql_client_test.c: Auto merged extra/yassl/taocrypt/include/rsa.hpp: manual merge mysql-test/t/mysql.test: manual merge sql/sql_parse.cc: manual merge |
||
![]() |
f00257ddd0 |
Fixed compiler warnings detected by option -Wshadow and -Wunused:
- Removed not used variables and functions - Added #ifdef around code that is not used - Renamed variables and functions to avoid conflicts - Removed some not used arguments Fixed some class/struct warnings in ndb Added define IS_LONGDATA() to simplify code in libmysql.c I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes BUILD/SETUP.sh: Added printing of unused functions and variables. Made it easy to test compiling with -Wshadow BUILD/compile-pentium-gcov: Added warnings Mark binary with -gcov client/mysql.cc: Fixed warnings found with gcc -Wshadow client/mysql_upgrade.c: Fixed warnings found with gcc -Wshadow client/mysqlbinlog.cc: Fixed warnings found with gcc -Wshadow client/mysqldump.c: Fixed warnings found with gcc -Wshadow client/mysqltest.c: Fixed warnings found with gcc -Wshadow client/sql_string.cc: Fixed warnings found with gcc -Wshadow Merged with sql/sql_string.cc client/sql_string.h: Fixed warnings found with gcc -Wshadow Merged with sql/sql_string.h cmd-line-utils/readline/display.c: Fixed compiler warning cmd-line-utils/readline/histexpand.c: Fixed warnings found with gcc -Wshadow cmd-line-utils/readline/input.c: Fixed warnings found with gcc -Wshadow cmd-line-utils/readline/text.c: Fixed warnings found with gcc -Wshadow cmd-line-utils/readline/vi_mode.c: Fixed warnings found with gcc -Wshadow dbug/dbug_analyze.c: Fixed warnings found with gcc -Wshadow extra/my_print_defaults.c: Prefixed defaults_extra_file and defaults_group_suffix with 'my' to avoid conflicts with similar named local variables extra/yassl/include/buffer.hpp: Fixed compiler warnings extra/yassl/include/crypto_wrapper.hpp: Fixed compiler warnings extra/yassl/include/yassl_imp.hpp: Fixed compiler warnings extra/yassl/include/yassl_int.hpp: Fixed compiler warnings extra/yassl/src/crypto_wrapper.cpp: Fixed compiler warnings extra/yassl/taocrypt/benchmark/benchmark.cpp: Fixed warnings found with gcc -Wshadow extra/yassl/taocrypt/include/algebra.hpp: Fixed compiler warnings extra/yassl/taocrypt/include/des.hpp: Fixed compiler warnings extra/yassl/taocrypt/include/hash.hpp: Fixed compiler warnings extra/yassl/taocrypt/include/hmac.hpp: Fixed compiler warnings extra/yassl/taocrypt/include/modarith.hpp: Fixed compiler warnings extra/yassl/taocrypt/include/modes.hpp: Fixed compiler warnings extra/yassl/taocrypt/include/rsa.hpp: Fixed compiler warnings extra/yassl/taocrypt/mySTL/list.hpp: Fixed compiler warnings extra/yassl/taocrypt/src/aes.cpp: Fixed compiler warnings extra/yassl/taocrypt/src/algebra.cpp: Fixed compiler warnings extra/yassl/taocrypt/src/asn.cpp: Fixed compiler warnings extra/yassl/taocrypt/test/test.cpp: Fixed compiler warnings extra/yassl/testsuite/testsuite.cpp: Fixed compiler warnings include/m_ctype.h: Fixed warnings found with gcc -Wshadow include/my_pthread.h: Fixed warnings found with gcc -Wshadow include/my_sys.h: Fixed warnings found with gcc -Wshadow include/my_time.h: Fixed warnings found with gcc -Wshadow include/mysql.h: Fixed warnings found with gcc -Wshadow Added define IS_LONGDATA() to simplify code in libmysql.c libmysql/libmysql.c: Fixed warnings found with gcc -Wshadow (Mostly replaced bind -> my_bind and time -> my_time) libmysqld/lib_sql.cc: Removed not used variables and labels myisam/ft_boolean_search.c: Fixed warnings found with gcc -Wshadow myisam/mi_open.c: Fixed warnings found with gcc -Wshadow myisam/mi_search.c: Fixed warnings found with gcc -Wshadow myisam/mi_unique.c: Fixed compiler warning myisam/myisampack.c: Fixed warnings found with gcc -Wshadow myisam/rt_index.c: Remove not used variables myisam/sort.c: Fixed warnings found with gcc -Wshadow mysql-test/r/mysqlcheck.result: Remove databases and tables possible left by previous test mysql-test/r/mysqltest.result: New test results mysql-test/t/mysql.test: Coverage tests mysql-test/t/mysqlbinlog.test: Coverage tests mysql-test/t/mysqlcheck.test: Remove databases and tables possible left by previous test mysql-test/t/mysqltest.test: Coverage tests mysys/default.c: Prefixed defaults_file, defaults_group_suffix and defaults_extra_file with 'my' to avoid conflicts with local variables in some functions mysys/mf_iocache2.c: Fixed warnings found with gcc -Wshadow mysys/mf_keycache.c: Fixed warnings found with gcc -Wshadow mysys/my_bitmap.c: Fixed warnings found with gcc -Wshadow mysys/sha1.c: Fixed warnings found with gcc -Wshadow ndb/include/kernel/signaldata/ArbitSignalData.hpp: Fixed compiler warning ndb/include/kernel/signaldata/DictTabInfo.hpp: Fixed compiler warnings ndb/include/ndbapi/NdbReceiver.hpp: Fixed warnings found with gcc -Wshadow ndb/include/transporter/TransporterDefinitions.hpp: Fixed compiler warning ndb/include/util/InputStream.hpp: Fixed compiler warning ndb/include/util/OutputStream.hpp: Fixed compiler warning ndb/include/util/SimpleProperties.hpp: Fixed compiler warning ndb/include/util/SocketAuthenticator.hpp: Fixed compiler warning ndb/include/util/SocketServer.hpp: Fixed compiler warning ndb/src/common/mgmcommon/ConfigRetriever.cpp: Fixed warnings found with gcc -Wshadow ndb/src/common/portlib/NdbTick.c: Fixed warnings found with gcc -Wshadow ndb/src/common/transporter/SHM_Transporter.cpp: Fixed warnings found with gcc -Wshadow ndb/src/common/transporter/TCP_Transporter.cpp: Fixed warnings found with gcc -Wshadow ndb/src/common/transporter/TCP_Transporter.hpp: Fixed compiler warning ndb/src/common/transporter/Transporter.cpp: Removed not used variable ndb/src/common/transporter/TransporterRegistry.cpp: Removed not used variable ndb/src/common/util/Bitmask.cpp: Moved function to avoid warnings of not used function ndb/src/common/util/ConfigValues.cpp: Fixed warnings found with gcc -Wshadow ndb/src/common/util/File.cpp: Fixed warnings found with gcc -Wshadow ndb/src/common/util/Properties.cpp: Fixed warnings found with gcc -Wshadow ndb/src/common/util/SocketClient.cpp: Fixed wrong return value ndb/src/common/util/random.c: Fixed warnings found with gcc -Wshadow ndb/src/common/util/socket_io.cpp: Fixed warnings found with gcc -Wshadow ndb/src/cw/cpcd/APIService.cpp: Removed not used variable ndb/src/cw/cpcd/main.cpp: Removed not used variables ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Fixed compiler warnings ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Removed not used variables ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Fixed compiler warnings ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Fixed compiler warnings ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Fixed compiler warnings ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Removed not used variables ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Fixed compiler warnings ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Fixed compiler warnings ndb/src/kernel/blocks/dbtup/DbtupScan.cpp: Removed not used variable ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp: Removed not used variables ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp: Removed not used variables ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp: Removed not used variables ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp: Fixed compiler warnings ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Removed not used variables ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp: Fixed compiler warnings ndb/src/kernel/blocks/qmgr/Qmgr.hpp: Fixed compiler warnings ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Removed not used variables ndb/src/kernel/blocks/suma/Suma.cpp: Removed not used variables ndb/src/kernel/blocks/suma/Suma.hpp: Fixed compiler warnings ndb/src/kernel/vm/MetaData.hpp: Fixed compiler warnings ndb/src/mgmapi/LocalConfig.cpp: Fixed warnings found with gcc -Wshadow ndb/src/mgmapi/mgmapi.cpp: Fixed warnings found with gcc -Wshadow ndb/src/mgmclient/CommandInterpreter.cpp: Removed not used variables ndb/src/mgmsrv/ConfigInfo.cpp: Fixed warnings found with gcc -Wshadow Removed not used variables ndb/src/mgmsrv/ConfigInfo.hpp: Fixed warnings found with gcc -Wshadow ndb/src/mgmsrv/InitConfigFileParser.cpp: Prefixed defaults_file, defaults_group_suffix and defaults_extra_file with 'my' to avoid conflicts with local variables in some functions ndb/src/mgmsrv/MgmtSrvr.cpp: Removed not used variables and functions ndb/src/mgmsrv/MgmtSrvr.hpp: Fixed compiler warnings ndb/src/mgmsrv/Services.cpp: Removed not used variables and functions ndb/src/mgmsrv/main.cpp: Removed not used variable ndb/src/ndbapi/ClusterMgr.hpp: Fixed compiler warnings ndb/src/ndbapi/Ndb.cpp: Removed not used variables ndb/src/ndbapi/NdbBlob.cpp: Removed not used variables ndb/src/ndbapi/NdbDictionaryImpl.cpp: Removed not used variables ndb/src/ndbapi/NdbIndexOperation.cpp: Removed not used variables ndb/src/ndbapi/NdbOperationDefine.cpp: Removed not used variables ndb/src/ndbapi/NdbOperationExec.cpp: Removed not used variables ndb/src/ndbapi/NdbOperationSearch.cpp: Removed not used variables ndb/src/ndbapi/NdbScanFilter.cpp: Fixed compiler warning ndb/src/ndbapi/NdbScanOperation.cpp: Removed not used variables ndb/src/ndbapi/SignalSender.cpp: Removed not used variables ndb/src/ndbapi/ndb_cluster_connection.cpp: Removed not used variable ndb/tools/delete_all.cpp: Removed not used variable ndb/tools/desc.cpp: Removed not used variable ndb/tools/drop_index.cpp: Removed not used variable ndb/tools/drop_tab.cpp: Removed not used variable ndb/tools/listTables.cpp: Removed not used variable ndb/tools/ndb_config.cpp: Fixed warnings found with gcc -Wshadow Added missing puts(desc) ndb/tools/restore/Restore.hpp: Changed delimiter to define instead of static variable, as the static variable caused a LOT of compiler warnings Fixed compiler warning ndb/tools/restore/consumer.hpp: Fixed compiler warning ndb/tools/restore/restore_main.cpp: Fixed compiler warnings ndb/tools/select_all.cpp: Removed not used variables ndb/tools/select_count.cpp: Removed not used variable server-tools/instance-manager/commands.h: Fixed compiler warnings server-tools/instance-manager/guardian.cc: Fixed compiler warnings server-tools/instance-manager/instance_options.cc: Removed not used variables server-tools/instance-manager/mysql_connection.cc: Fixed compiler warnings server-tools/instance-manager/options.cc: Fixed compiler warnings server-tools/instance-manager/options.h: Fixed compiler warnings server-tools/instance-manager/parse.cc: Removed not used variable server-tools/instance-manager/user_map.cc: Fixed compiler warnings server-tools/instance-manager/user_map.h: Fixed compiler warnings sql/field.cc: Fixed compiler warnings sql/field.h: Fixed compiler warnings sql/filesort.cc: Fixed compiler warnings sql/ha_archive.cc: Removed table and share arguments from get_share() / free_share() to get rid of compiler warnings sql/ha_archive.h: Removed table and share arguments from get_share() / free_share() to get rid of compiler warnings sql/ha_federated.cc: Fixed compiler warnings sql/ha_heap.cc: Fixed compiler warnings sql/ha_myisam.cc: Fixed compiler warnings sql/ha_myisammrg.cc: Fixed compiler warnings sql/ha_ndbcluster.cc: Fixed compiler warnings sql/handler.cc: Fixed compiler warnings sql/item.cc: Fixed compiler warnings sql/item.h: Fixed compiler warnings new_item() -> clone_item(), to avoid a lot of warnings with variable 'new_item' el() -> element_index() sql/item_cmpfunc.cc: Fixed compiler warnings sql/item_cmpfunc.h: Fixed compiler warnings sql/item_func.cc: Fixed compiler warnings sql/item_geofunc.cc: Fixed compiler warnings sql/item_row.h: Fixed compiler warnings sql/item_strfunc.cc: Fixed compiler warnings sql/item_subselect.cc: Fixed compiler warnings sql/item_subselect.h: Fixed compiler warnings sql/item_sum.cc: Fixed compiler warnings sql/item_timefunc.cc: Fixed compiler warnings sql/log.cc: Fixed compiler warnings More comments Added #ifdef HAVE_REPLICATION sql/log_event.cc: Fixed compiler warnings sql/log_event.h: Fixed compiler warnings sql/mysql_priv.h: query_id -> global_query_id, to avoid a lot of clashes with function and class variables start_time -> server_start_time sql/mysqld.cc: Fixed compiler warnings: - Removed not used variables - Added #ifndef EMBEDDED_LIBRARY - Fixed shadow warnings sql/net_serv.cc: Fixed compiler warnings sql/opt_range.cc: range -> last_range to avoid shadow warnings Removed not used function print_rowid() sql/opt_range.h: range -> last_range to avoid shadow warnings sql/password.c: Fixed compiler warnings sql/protocol.cc: Fixed compiler warnings sql/repl_failsafe.cc: Fixed compiler warnings sql/set_var.cc: Fixed compiler warnings sql/set_var.h: type() -> show_type() Fixed compiler warnings sql/slave.cc: Fixed compiler warnings sql/sp_head.cc: Fixed compiler warnings sql/sp_head.h: Fixed compiler warnings sql/spatial.cc: Fixed compiler warnings sql/spatial.h: length() -> geom_length() to avoid compiler warnings wkb_end -> wkb_last to avoid compiler warnings with local variables named 'wkb_end' sql/sql_cache.h: Fixed compiler warnings sql/sql_class.cc: Fixed compiler warnings sql/sql_class.h: log -> log_xid() to avoid compiler warnings Fixed shadow compiler warnings sql/sql_derived.cc: Removed not used variable sql/sql_insert.cc: Fixed compiler warnings sql/sql_lex.cc: Fixed compiler warnings sql/sql_lex.h: res -> saved_error to make the meaning of the variable clear and avoid shadow warnings sql/sql_load.cc: Fixed compiler warnings sql/sql_parse.cc: Fixed compiler warnings sql/sql_prepare.cc: Fixed compiler warnings sql/sql_select.cc: Fixed compiler warnings sql/sql_show.cc: Fixed compiler warnings sql/sql_string.cc: Fixed compiler warnings sql/sql_string.h: Fixed compiler warnings sql/sql_table.cc: Fixed compiler warnings sql/sql_trigger.cc: Fixed compiler warnings sql/sql_trigger.h: table -> trigger_table to avoid warnings from local variables sql/sql_union.cc: Fixed compiler warnings (mainly res -> saved_error) sql-common/client.c: Removed not used variable sql-common/my_time.c: Removed not used variable time -> my_time sql/sql_update.cc: Removed not used variable sql/sql_view.cc: Removed not used variable sql/sql_yacc.yy: Removed not used variable sql/table.cc: Removed not used variable sql/tztime.cc: Removed not used variable sql/unireg.cc: Removed not used variable strings/ctype-bin.c: mblen -> mb_len to avoid compiler warnings with local variable mblen strings/ctype-cp932.c: Fixed compiler warnings strings/ctype-eucjpms.c: Fixed compiler warnings strings/ctype-mb.c: mblen -> mb_len to avoid compiler warnings with local variable mblen strings/ctype-simple.c: mblen -> mb_len to avoid compiler warnings with local variable mblen exp -> exponent strings/ctype-sjis.c: Fixed compiler warnings strings/ctype-uca.c: mblen -> mb_len to avoid compiler warnings with local variable mblen strings/ctype-ujis.c: Fixed compiler warnings strings/ctype-utf8.c: Fixed compiler warnings strings/decimal.c: Fixed compiler warnings strings/my_vsnprintf.c: Added comment strings/strtod.c: Fixed compiler warnings tests/mysql_client_test.c: Fixed compiler warnings (Biggest part of patch is to not get a conflict with global function 'bind') |
||
![]() |
db1a2d2d80 |
Merge polly.local:/tmp/maint/bug24117/my50-bug24117
into polly.local:/home/kaa/src/maint/mysql-5.0-maint mysys/typelib.c: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged |
||
![]() |
5b71281467 |
Fix for bug #24117 "server crash on a FETCH with a cursor on a table which is not in the table cache"
Problem: When creating a temporary field for a temporary table in create_tmp_field_from_field(), a resulting field is created as an exact copy of an original one (in Field::new_field()). However, Field_enum and Field_set contain a pointer (typelib) to memory allocated in the parent table's MEM_ROOT, which under some circumstances may be deallocated later by the time a temporary table is used. Solution: Override the new_field() method for Field_enum and Field_set and create a separate copy of the typelib structure in there. include/typelib.h: Added copy_typelib() declaration mysql-test/r/sp.result: Added a testcase for bug #24117 "server crash on a FETCH with a cursor on a table which is not in the table cache" mysql-test/t/sp.test: Added a testcase for bug #24117 "server crash on a FETCH with a cursor on a table which is not in the table cache" mysys/typelib.c: Added copy_typelib() definition sql/field.cc: Create a copy of the internal 'typelib' structure when copying Field_enum of Field_set objects. sql/field.h: Override new_field method in Field_enum (and Field_set) to copy the typelib structure. |
||
![]() |
6a39c9e6b8 | Merging with mysql-5.1-new-rpl | ||
![]() |
07de4b3aff |
Merge mysql.com:/home/hf/work/22372/my50-22372
into mysql.com:/home/hf/work/22372/my51-22372 mysql-test/t/gis.test: Auto merged sql/field.cc: Auto merged sql/sql_load.cc: Auto merged mysql-test/r/gis.result: SCCS merged sql/field.h: merging |
||
![]() |
8f3c395c26 |
Merge mysql.com:/home/hf/work/22372/my41-22372
into mysql.com:/home/hf/work/22372/my50-22372 mysql-test/r/gis.result: merging mysql-test/t/gis.test: merging sql/field.cc: merging sql/field.h: merging sql/sql_load.cc: merging |
||
![]() |
fa115a0f2c |
bug #22372 (LOAD DATA crashes the table with the geometry field)
The problem is that the GEOMETRY NOT NULL can't automatically set any value as a default one. We always tried to complete LOAD DATA command even if there's not enough data in file. That doesn't work for GEOMETRY NOT NULL. Now Field_*::reset() returns an error sign and it's checked in mysql_load() mysql-test/r/gis.result: test result mysql-test/t/gis.test: testcase sql/field.cc: reset() now returns error sign sql/field.h: Field_*::reset() now returns error sign if the field can't be reset sql/sql_load.cc: check if field can't be reset and return error if it's so |
||
![]() |
4924c61999 |
BUG#24490 (segfault inside unpack_row at Field_bit_as_char::set_default()):
Field_bit::set_default() did not check the bit_len, hence used the undefined bit_ptr, causing a crash. The patch adds a check that bit_len > 0 before following the bit_ptr. mysql-test/extra/rpl_tests/rpl_row_tabledefs.test: Doing select using ORDER BY to prevent table-internal order from affecting the result. mysql-test/r/rpl_row_tabledefs_2myisam.result: Result change mysql-test/r/rpl_row_tabledefs_3innodb.result: Result change sql/field.cc: Checking bit_len before following the bit_ptr, since bit_ptr has no sensible value in the case that bit_len == 0. sql/field.h: Field_bit::set_default() used the bit_ptr, but it is undefined, hence causing a crash. In reality, the hierarchy order is not correct so added a TODO comment about refactoring. sql/log_event.cc: Code was manipulating bits for a FIELD_TYPE_BIT field without checking if the bit_len was > 0, hence using an undefined bit_ptr when the class was actually a Field_bit_as_char. mysql-test/t/rpl_row_tabledefs_3innodb-slave.opt: New BitKeeper file ``mysql-test/t/rpl_row_tabledefs_3innodb-slave.opt'' |
||
![]() |
cac6be1949 |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch client/mysql.cc: Auto merged client/mysqldump.c: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/handler.cc: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/item_subselect.h: Auto merged sql/item_sum.h: Auto merged sql/item_timefunc.cc: Auto merged sql/log_event.cc: Auto merged sql/opt_range.cc: Auto merged sql/sp.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged |
||
![]() |
d6541d099b |
This finishes the work (someone) started to remove FIELD_ types and use the Enum MYSQL types. The second part to this is to actually deprecate the FIELD defines in mysql_com.h
client/mysql.cc: Field update to MYSQL client/mysqldump.c: Field -> MySQL include/mysql.h: Field -> MySQL server-tools/instance-manager/protocol.cc: Field -> MySQL sql/field.cc: Field -> MySQL sql/field.h: Field -> MySQL sql/field_conv.cc: Field -> MySQL sql/handler.cc: Field -> MySQL sql/item.cc: Field -> MYSQL sql/item_func.cc: Field -> MySQL sql/item_subselect.cc: Field -> MySQL sql/item_subselect.h: Field -> MySQL sql/item_sum.h: Field -> MySQL sql/item_timefunc.cc: Field -> MySQL sql/log_event.cc: Field -> MySQL sql/opt_range.cc: Field -> MySQL sql/sp.cc: Field -> MySQL sql/sql_acl.cc: Field -> MYSQL sql/sql_analyse.cc: Field -> MYSQL sql/sql_insert.cc: Field -> MySQL sql/sql_load.cc: Field -> MySQL sql/sql_parse.cc: Field -> MySQL sql/sql_select.cc: Field -> MySQL sql/sql_select.h: Field -> MySQL sql/sql_show.cc: Field -> MySQL sql/sql_table.cc: Field -> MySQL sql/sql_yacc.yy: Field -> MySQL sql/table.cc: Field -> MySQL sql/unireg.cc: Field -> MySQL storage/innobase/handler/ha_innodb.cc: Field -> MySQL storage/myisam/ha_myisam.cc: Field -> MySQL tests/mysql_client_test.c: Field -> MySQL |
||
![]() |
9b1336fec9 |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1 configure.in: Auto merged include/my_pthread.h: Auto merged libmysql/libmysql.c: Auto merged server-tools/instance-manager/guardian.cc: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_sum.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_plugin.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged storage/archive/ha_archive.cc: Auto merged storage/csv/ha_tina.cc: Auto merged storage/federated/ha_federated.cc: Auto merged sql/item_create.cc: manual merge |
||
![]() |
6bcbd7df1e |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1 Makefile.am: Auto merged configure.in: Auto merged sql/field.h: Auto merged sql-common/client.c: Auto merged sql/sql_parse.cc: Auto merged sql/table.h: Auto merged |
||
![]() |
ee1c5226b9 |
Added back sql-bench directory, so that one can more easily run benchmarks on a server and add new benchmarks for new optimizations
Fixed memory leak in _db_set() (Bug#24497 Valgrind warning: get_one_option) Don't call net_clear() on COM_QUIT. This avoids a warning from net_clear() after shutdown: "skipped ## bytes from file" BUG#21428: skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown" sql-bench/test-wisconsin.sh: Rename: BitKeeper/deleted/.del-test-wisconsin.sh~c0b86821b5f95f26 -> sql-bench/test-wisconsin.sh sql-bench/test-transactions.sh: Rename: BitKeeper/deleted/.del-test-transactions.sh~c1c892f10c40caf -> sql-bench/test-transactions.sh sql-bench/test-insert.sh: Rename: BitKeeper/deleted/.del-test-insert.sh~893bfac9dedb79a7 -> sql-bench/test-insert.sh sql-bench/test-select.sh: Rename: BitKeeper/deleted/.del-test-select.sh~6d5cc770acf11be6 -> sql-bench/test-select.sh sql-bench/test-create.sh: Rename: BitKeeper/deleted/.del-test-create.sh~f9a1ea38c191b17a -> sql-bench/test-create.sh sql-bench/test-big-tables.sh: Rename: BitKeeper/deleted/.del-test-big-tables.sh~5b1b0c5fb623565a -> sql-bench/test-big-tables.sh sql-bench/test-connect.sh: Rename: BitKeeper/deleted/.del-test-connect.sh~382a728c949ee075 -> sql-bench/test-connect.sh sql-bench/test-ATIS.sh: Rename: BitKeeper/deleted/.del-test-ATIS.sh~e8ebff7086c95773 -> sql-bench/test-ATIS.sh sql-bench/test-alter-table.sh: Rename: BitKeeper/deleted/.del-test-alter-table.sh~eba6cfa9972fcced -> sql-bench/test-alter-table.sh sql-bench/innotest2b.sh: Rename: BitKeeper/deleted/.del-innotest2b.sh~7b99ece835e8dff3 -> sql-bench/innotest2b.sh sql-bench/run-all-tests.sh: Rename: BitKeeper/deleted/.del-run-all-tests.sh~41d6da1cf211ee95 -> sql-bench/run-all-tests.sh sql-bench/innotest2.sh: Rename: BitKeeper/deleted/.del-innotest2.sh~9c14df528285603 -> sql-bench/innotest2.sh sql-bench/innotest2a.sh: Rename: BitKeeper/deleted/.del-innotest2a.sh~e01d016a7cafdc0b -> sql-bench/innotest2a.sh sql-bench/innotest1a.sh: Rename: BitKeeper/deleted/.del-innotest1a.sh~c64f4610ae1e26fe -> sql-bench/innotest1a.sh sql-bench/innotest1b.sh: Rename: BitKeeper/deleted/.del-innotest1b.sh~aafd0819ae84da7b -> sql-bench/innotest1b.sh sql-bench/innotest1.sh: Rename: BitKeeper/deleted/.del-innotest1.sh~aa36bce09ca783c7 -> sql-bench/innotest1.sh sql-bench/crash-me.sh: Rename: BitKeeper/deleted/.del-crash-me.sh~2fa881d0b40339c8 -> sql-bench/crash-me.sh sql-bench/graph-compare-results.sh: Rename: BitKeeper/deleted/.del-graph-compare-results.sh~7e4e28b3591b4542 -> sql-bench/graph-compare-results.sh sql-bench/copy-db.sh: Rename: BitKeeper/deleted/.del-copy-db.sh~e8116afb93144ccd -> sql-bench/copy-db.sh sql-bench/compare-results.sh: Rename: BitKeeper/deleted/.del-compare-results.sh~a9e26e2644c694b3 -> sql-bench/compare-results.sh sql-bench/bench-count-distinct.sh: Rename: BitKeeper/deleted/.del-bench-count-distinct.sh~a92f174271a831d7 -> sql-bench/bench-count-distinct.sh sql-bench/as3ap.sh: Rename: BitKeeper/deleted/.del-as3ap.sh~f54eebbd8d34c9b6 -> sql-bench/as3ap.sh sql-bench/Comments/Informix.crash-me: Rename: BitKeeper/deleted/.del-Informix.crash-me~51ab5b717cefe74 -> sql-bench/Comments/Informix.crash-me sql-bench/Comments/postgres.crash-me: Rename: BitKeeper/deleted/.del-postgres.crash-me~eacac145c3e30f17 -> sql-bench/Comments/postgres.crash-me sql-bench/Comments/Empress.crash-me: Rename: BitKeeper/deleted/.del-Empress.crash-me~bdaff0c68ce10f02 -> sql-bench/Comments/Empress.crash-me sql-bench/Comments/Adabas.crash-me: Rename: BitKeeper/deleted/.del-Adabas.crash-me~ce88ba1a540971ac -> sql-bench/Comments/Adabas.crash-me sql-bench/Comments/Access.crash-me: Rename: BitKeeper/deleted/.del-Access.crash-me~bb457ec282d939b6 -> sql-bench/Comments/Access.crash-me sql-bench/Comments/postgres.benchmark: Rename: BitKeeper/deleted/.del-postgres.benchmark~4d30890732b784a -> sql-bench/Comments/postgres.benchmark sql-bench/Comments/mysql.benchmark: Rename: BitKeeper/deleted/.del-mysql.benchmark~4d8729c0937456fc -> sql-bench/Comments/mysql.benchmark sql-bench/Comments/FrontBase.benchmark: Rename: BitKeeper/deleted/.del-FrontBase.benchmark~217041ef18274c2e -> sql-bench/Comments/FrontBase.benchmark sql-bench/Comments/interbase: Rename: BitKeeper/deleted/.del-interbase~cdad59622b4d6f3 -> sql-bench/Comments/interbase sql-bench/uname.bat: Rename: BitKeeper/deleted/.del-uname.bat~a6d933d2ee9314c -> sql-bench/uname.bat sql-bench/pwd.bat: Rename: BitKeeper/deleted/.del-pwd.bat~9b64050849abf51 -> sql-bench/pwd.bat sql-bench/example.bat: Rename: BitKeeper/deleted/.del-example.bat~22d0170bccf0f030 -> sql-bench/example.bat sql-bench/Makefile.am: Rename: BitKeeper/deleted/.del-Makefile.am~7b07da85b2e9375 -> sql-bench/Makefile.am sql-bench/Data/ATIS/transport.txt: Rename: BitKeeper/deleted/.del-transport.txt~fa4ca40735f8354c -> sql-bench/Data/ATIS/transport.txt sql-bench/Data/ATIS/time_zone.txt: Rename: BitKeeper/deleted/.del-time_zone.txt~4171f9ca732f65c0 -> sql-bench/Data/ATIS/time_zone.txt sql-bench/Data/Wisconsin/tenk.data: Rename: BitKeeper/deleted/.del-tenk.data~6aeaebdd534e458e -> sql-bench/Data/Wisconsin/tenk.data sql-bench/Data/Wisconsin/onek.data: Rename: BitKeeper/deleted/.del-onek.data~6cd1edaf596a7f7 -> sql-bench/Data/Wisconsin/onek.data sql-bench/Data/ATIS/stop1.txt: Rename: BitKeeper/deleted/.del-stop1.txt~f09ba164ad44a288 -> sql-bench/Data/ATIS/stop1.txt sql-bench/Data/ATIS/time_interval.txt: Rename: BitKeeper/deleted/.del-time_interval.txt~a1def62e267a59b2 -> sql-bench/Data/ATIS/time_interval.txt sql-bench/Data/ATIS/stop.txt: Rename: BitKeeper/deleted/.del-stop.txt~31fb564e1f415e34 -> sql-bench/Data/ATIS/stop.txt sql-bench/Data/ATIS/restriction.txt: Rename: BitKeeper/deleted/.del-restriction.txt~6ae208924617784a -> sql-bench/Data/ATIS/restriction.txt sql-bench/Data/ATIS/state.txt: Rename: BitKeeper/deleted/.del-state.txt~9dd470ce14075b90 -> sql-bench/Data/ATIS/state.txt sql-bench/Data/ATIS/restrict_class.txt: Rename: BitKeeper/deleted/.del-restrict_class.txt~2f741bf0ea498f84 -> sql-bench/Data/ATIS/restrict_class.txt sql-bench/Data/ATIS/month_name.txt: Rename: BitKeeper/deleted/.del-month_name.txt~4c44f7a323d57d92 -> sql-bench/Data/ATIS/month_name.txt sql-bench/Data/ATIS/restrict_carrier.txt: Rename: BitKeeper/deleted/.del-restrict_carrier.txt~925b5492f3f9cba3 -> sql-bench/Data/ATIS/restrict_carrier.txt sql-bench/Data/ATIS/ground_service.txt: Rename: BitKeeper/deleted/.del-ground_service.txt~1087e477e86e84c -> sql-bench/Data/ATIS/ground_service.txt sql-bench/Data/ATIS/food_service.txt: Rename: BitKeeper/deleted/.del-food_service.txt~66d95a150c28458 -> sql-bench/Data/ATIS/food_service.txt sql-bench/Data/ATIS/flight_day.txt: Rename: BitKeeper/deleted/.del-flight_day.txt~76868d6d265d441e -> sql-bench/Data/ATIS/flight_day.txt sql-bench/Data/ATIS/flight_fare.txt: Rename: BitKeeper/deleted/.del-flight_fare.txt~d7322593c8530487 -> sql-bench/Data/ATIS/flight_fare.txt sql-bench/Data/ATIS/flight_class.txt: Rename: BitKeeper/deleted/.del-flight_class.txt~1801101474c29098 -> sql-bench/Data/ATIS/flight_class.txt sql-bench/Data/ATIS/fconnection.txt: Rename: BitKeeper/deleted/.del-fconnection.txt~e0ef6a8b5560a713 -> sql-bench/Data/ATIS/fconnection.txt sql-bench/Data/ATIS/flight.txt: Rename: BitKeeper/deleted/.del-flight.txt~e5065423760e99eb -> sql-bench/Data/ATIS/flight.txt sql-bench/Data/ATIS/fare.txt: Rename: BitKeeper/deleted/.del-fare.txt~ea0652f490bc24a6 -> sql-bench/Data/ATIS/fare.txt sql-bench/Data/ATIS/day_name.txt: Rename: BitKeeper/deleted/.del-day_name.txt~f813b215955d894c -> sql-bench/Data/ATIS/day_name.txt sql-bench/Data/ATIS/dual_carrier.txt: Rename: BitKeeper/deleted/.del-dual_carrier.txt~a7dd776224fbd92b -> sql-bench/Data/ATIS/dual_carrier.txt sql-bench/Data/ATIS/date_day.txt: Rename: BitKeeper/deleted/.del-date_day.txt~4e9a282fcf54cfd8 -> sql-bench/Data/ATIS/date_day.txt sql-bench/Data/ATIS/compound_class.txt: Rename: BitKeeper/deleted/.del-compound_class.txt~d4a2f1b7f96340b9 -> sql-bench/Data/ATIS/compound_class.txt sql-bench/Data/ATIS/connect_leg.txt: Rename: BitKeeper/deleted/.del-connect_leg.txt~f97b6e94e108bb36 -> sql-bench/Data/ATIS/connect_leg.txt sql-bench/Data/ATIS/code_description.txt: Rename: BitKeeper/deleted/.del-code_description.txt~f9117373e438b0e2 -> sql-bench/Data/ATIS/code_description.txt sql-bench/Data/ATIS/city.txt: Rename: BitKeeper/deleted/.del-city.txt~d96dd6d073344d2e -> sql-bench/Data/ATIS/city.txt sql-bench/Data/ATIS/class_of_service.txt: Rename: BitKeeper/deleted/.del-class_of_service.txt~21f6b9848b8c76d -> sql-bench/Data/ATIS/class_of_service.txt sql-bench/Data/ATIS/airport_service.txt: Rename: BitKeeper/deleted/.del-airport_service.txt~6ee6d5b852b3e38 -> sql-bench/Data/ATIS/airport_service.txt sql-bench/Data/ATIS/airline.txt: Rename: BitKeeper/deleted/.del-airline.txt~a79f8eadf853f2c8 -> sql-bench/Data/ATIS/airline.txt sql-bench/Data/ATIS/airport.txt: Rename: BitKeeper/deleted/.del-airport.txt~59c78514130e1f45 -> sql-bench/Data/ATIS/airport.txt sql-bench/Data/ATIS/aircraft.txt: Rename: BitKeeper/deleted/.del-aircraft.txt~15e4de7ab37c92d3 -> sql-bench/Data/ATIS/aircraft.txt sql-bench/TODO: Rename: BitKeeper/deleted/.del-TODO~cac6d7a63c426ae5 -> sql-bench/TODO sql-bench/limits/sybase.cfg: Rename: BitKeeper/deleted/.del-sybase.cfg~c4636b12767b3f14 -> sql-bench/limits/sybase.cfg sql-bench/limits/solid-nt4.cfg: Rename: BitKeeper/deleted/.del-solid-nt4.cfg~cca779f0c9e29d31 -> sql-bench/limits/solid-nt4.cfg sql-bench/limits/solid.cfg: Rename: BitKeeper/deleted/.del-solid.cfg~5ae0e4342eadb0fb -> sql-bench/limits/solid.cfg sql-bench/limits/pg.cfg: Rename: BitKeeper/deleted/.del-pg.cfg~db59cf39a5d417be -> sql-bench/limits/pg.cfg sql-bench/limits/mysql.cfg: Rename: BitKeeper/deleted/.del-mysql.cfg~9cab20a8771b93cf -> sql-bench/limits/mysql.cfg sql-bench/limits/oracle.cfg: Rename: BitKeeper/deleted/.del-oracle.cfg~affab21af8f438fd -> sql-bench/limits/oracle.cfg sql-bench/limits/mysql-4.1.cfg: Rename: BitKeeper/deleted/.del-mysql-4.1.cfg~b6c5e74aefc99e3c -> sql-bench/limits/mysql-4.1.cfg sql-bench/limits/mysql-3.23.cfg: Rename: BitKeeper/deleted/.del-mysql-3.23.cfg~3cf9d6be54b77a3c -> sql-bench/limits/mysql-3.23.cfg sql-bench/limits/mysql-4.0.cfg: Rename: BitKeeper/deleted/.del-mysql-4.0.cfg~6c9d63c85b5ef574 -> sql-bench/limits/mysql-4.0.cfg sql-bench/limits/mysql-3.22.cfg: Rename: BitKeeper/deleted/.del-mysql-3.22.cfg~e706f26a161175cd -> sql-bench/limits/mysql-3.22.cfg sql-bench/limits/msql.cfg: Rename: BitKeeper/deleted/.del-msql.cfg~52710b12932cceb9 -> sql-bench/limits/msql.cfg sql-bench/limits/ms-sql65.cfg: Rename: BitKeeper/deleted/.del-ms-sql65.cfg~6b9bc3c460dbee05 -> sql-bench/limits/ms-sql65.cfg sql-bench/limits/mimer.cfg: Rename: BitKeeper/deleted/.del-mimer.cfg~234e6c1c3c47b612 -> sql-bench/limits/mimer.cfg sql-bench/limits/ms-sql.cfg: Rename: BitKeeper/deleted/.del-ms-sql.cfg~1907964264d2786a -> sql-bench/limits/ms-sql.cfg sql-bench/limits/interbase.cfg: Rename: BitKeeper/deleted/.del-interbase.cfg~c6951a0376cc6ff3 -> sql-bench/limits/interbase.cfg sql-bench/limits/interbase-dialect3.cfg: Rename: BitKeeper/deleted/.del-interbase-dialect3.cfg~46277bdfc74c667a -> sql-bench/limits/interbase-dialect3.cfg sql-bench/limits/interbase-superserver.cfg: Rename: BitKeeper/deleted/.del-interbase-superserver.cfg~22501198689243b0 -> sql-bench/limits/interbase-superserver.cfg sql-bench/limits/interbase-dialect1.cfg: Rename: BitKeeper/deleted/.del-interbase-dialect1.cfg~659206b5b9a11036 -> sql-bench/limits/interbase-dialect1.cfg sql-bench/limits/empress.cfg: Rename: BitKeeper/deleted/.del-empress.cfg~1f97f34d6560a499 -> sql-bench/limits/empress.cfg sql-bench/limits/frontbase.cfg: Rename: BitKeeper/deleted/.del-frontbase.cfg~71369e9c002696e -> sql-bench/limits/frontbase.cfg sql-bench/limits/db2.cfg: Rename: BitKeeper/deleted/.del-db2.cfg~711099b4d7906959 -> sql-bench/limits/db2.cfg sql-bench/limits/access.cfg: Rename: BitKeeper/deleted/.del-access.cfg~5239ea3655b7bba0 -> sql-bench/limits/access.cfg sql-bench/limits/access_odbc.cfg: Rename: BitKeeper/deleted/.del-access_odbc.cfg~34b4cf0eda56c4b1 -> sql-bench/limits/access_odbc.cfg sql-bench/limits/Informix.cfg: Rename: BitKeeper/deleted/.del-Informix.cfg~b94188e1ececb51b -> sql-bench/limits/Informix.cfg sql-bench/limits/Adabas.cfg: Rename: BitKeeper/deleted/.del-Adabas.cfg~343ed4e7f8b02111 -> sql-bench/limits/Adabas.cfg sql-bench/README: Rename: BitKeeper/deleted/.del-README~b1aa0c1bf9f5eb5e -> sql-bench/README BitKeeper/deleted/.del-create-pg_fast-Linux_2.2.14_my_SMP_i686-crashed: Delete: sql-bench/Results/create-pg_fast-Linux_2.2.14_my_SMP_i686-crashed Makefile.am: Added back sql-bench configure.in: Added back sql-bench dbug/dbug.c: Fixed memory leak in _db_set() This is not a complete fix as we can still get memory leaks if we do any of the following: mysqld --debug --debug CAll DBUG_SET or DBUG_SET_INITIAL more than once in a program Use SET @@global.debug=xxxx At some point we should fix the above, but this is not critical for normal operation (only for debugging) Bug #24497 Valgrind warning: get_one_option Note that all changes to _db_set_ is only a variable access change, and can be ignored while reviewing the bug fix. mysql-test/t/flush_read_lock_kill-master.opt: Added '+' to option, to be able to use this together with --debug mysql-test/valgrind.supp: Removed warning that is now fixed mysys/ptr_cmp.c: Fixed wrong pointer read (probably never used) scripts/make_binary_distribution.sh: Added back sql_bench sql/field.h: Removed class function that was identical in parent class sql/mysqld.cc: Removed some calls to my_thread_init() / my_thread_end() that was not needed. Only call DBUG_SET_INITAL, not DBUG_SET (Fixes memory leak in dbug) Mark some code as deadcode sql/net_serv.cc: Add information about from where error comes sql-bench/bench-init.pl.sh: Cleaned up help text sql-bench/server-cfg.sh: Don't write '/' after server name of no ssl version sql-common/client.c: Don't call net_clear() on COM_QUIT. This avoids a warning from net_clear() after shutdown: "skipped ## bytes from file" BUG#21428: skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown" sql/sql_parse.cc: Added comment sql/table.h: Removed compiler warning |
||
![]() |
2477bd5a03 |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch configure.in: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/mysql_priv.h: Auto merged |
||
![]() |
19daf5d970 |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch sql/field.cc: Auto merged sql/mysql_priv.h: Auto merged sql/set_var.cc: Auto merged storage/federated/ha_federated.cc: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged plugin/fulltext/plugin_example.c: e C sql/field.h: e |
||
![]() |
95b7215869 |
Merge bk-internal:/home/bk/mysql-5.1
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt client/mysqltest.c: Auto merged libmysql/libmysql.c: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/information_schema.test: Auto merged mysql-test/t/subselect.test: Auto merged mysql-test/t/type_newdecimal.test: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/filesort.cc: Auto merged sql/handler.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_subselect.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged sql-common/client.c: Auto merged sql-common/my_time.c: Auto merged sql/table.cc: Auto merged strings/decimal.c: Auto merged |
||
![]() |
c1477a3f20 |
Removed compiler warnings
Ensure that my_size_t is always unsigned (to get predictiable results from system to system) Removed some %lld, as these are not portable BUILD/FINISH.sh: Remove configure files from storage engines (as some of them may be old versions and may cause conflicts) client/mysqldump.c: Removed compiler warning client/mysqlslap.c: Removed compiler warning client/mysqltest.c: Removed compiler warning cmd-line-utils/readline/bind.c: Removed compiler warning cmd-line-utils/readline/histfile.c: Removed compiler warning include/my_global.h: Ensure that my_size_t is always unsigned (to get predictiable results from system to system) Moved my_offset_t here from parse_file.h sql/event_data_objects.cc: Removed compiler warning sql/event_scheduler.cc: Removed compiler warning sql/field.h: Removed compiler warning sql/ha_ndbcluster_binlog.cc: Removed compiler warning sql/ha_partition.cc: Removed compiler warning sql/item_strfunc.cc: Removed compiler warning sql/log_event.cc: Removed compiler warning sql/mysqld.cc: Removed compiler warning sql/parse_file.h: Moved my_offset_t to my_global.h sql/rpl_utility.cc: Removed compiler warning sql/sql_binlog.cc: Removed compiler warning sql/sql_cache.cc: Removed compiler warning sql/tztime.cc: Removed compiler warning storage/archive/ha_archive.cc: Removed compiler warning Removed %lld as it's not portable storage/heap/hp_write.c: Removed compiler warning storage/innobase/os/os0file.c: Removed compiler warning storage/myisam/myisampack.c: Removed compiler warning storage/myisammrg/myrg_rkey.c: Removed compiler warning storage/ndb/include/kernel/signaldata/DictTabInfo.hpp: Use my_offsetof instead of offsetof to get rid of compiler warnings storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp: Removed compiler warning storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp: Removed compiler warning Note: Someone from NDB team should check this fix! storage/ndb/src/kernel/vm/Rope.cpp: Removed compiler warning storage/ndb/src/mgmapi/mgmapi.cpp: Removed compiler warning storage/ndb/src/ndbapi/Ndb.cpp: Removed compiler warning storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: Removed compiler warning storage/ndb/src/ndbapi/NdbScanOperation.cpp: Removed compiler warning storage/ndb/src/ndbapi/NdbTransaction.cpp: Removed compiler warning storage/ndb/src/ndbapi/Ndblist.cpp: Removed compiler warning |
||
![]() |
cd784a51df |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch configure.in: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged storage/federated/ha_federated.cc: Auto merged |
||
![]() |
7463704e1c |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1 client/mysql.cc: Auto merged client/mysqlbinlog.cc: Auto merged mysql-test/mysql-test-run-shell.sh: Auto merged mysql-test/lib/mtr_report.pl: Auto merged mysql-test/r/connect.result: Auto merged mysql-test/r/drop.result: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/r/rpl_ndb_dd_advance.result: Auto merged mysql-test/r/show_check.result: Auto merged mysql-test/t/information_schema.test: Auto merged mysql-test/t/mysqldump.test: Auto merged mysql-test/t/rpl_ndb_dd_advance.test: Auto merged mysql-test/t/system_mysql_db_fix.test: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item_sum.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_select.cc: Auto merged sql/table.cc: Auto merged storage/federated/ha_federated.cc: Auto merged storage/myisam/ha_myisam.cc: Auto merged client/mysql_upgrade.c: Manual merge client/mysqltest.c: Manual merge mysql-test/mysql-test-run.pl: Manual merge storage/innobase/handler/ha_innodb.cc: Manual merge |
||
![]() |
85a590a26c |
Added --debug-info to most clients to detect memory leaks in mysql-test-run
Moved .progress files into the log directory Moved 'cluster' database tables into the MySQL database, to not have 'cluster' beeing a reserved database name Fixed bug where mysqld got a core dump when trying to use a table created by MySQL 3.23 Fixed some compiler warnings Fixed small memory leak in libmysql Note that this doesn't changeset doesn't include the new mysqldump.c code required to run some tests. This will be added when I merge 5.0 to 5.1 client/client_priv.h: Added OPT_DEBUG_INFO and OPT_COLUMN_TYPES client/mysql.cc: Split --debug-info into --debug-info and --column-type-info client/mysql_upgrade.c: Give only error info at end if using --debug-info client/mysqladmin.cc: Added --debug-info to detect memory leaks in mysqltest client/mysqlbinlog.cc: Added --debug-info to detect memory leaks in mysqltest client/mysqlcheck.c: Added --debug-info to detect memory leaks in mysqltest client/mysqlimport.c: Added --debug-info to detect memory leaks in mysqltest client/mysqlshow.c: Added --debug-info to detect memory leaks in mysqltest client/mysqltest.c: Added --debug-info to detect memory leaks in mysqltest Added option --logdir to force .progress files in a specific directory libmysql/libmysql.c: Fixed memory leak mysql-test/include/ndb_setup_slave.inc: Moved cluster tables under 'mysql' mysql-test/include/query_cache.inc: Added more tests for query cache mysql-test/lib/init_db.sql: Move cluster.binlog_index -> mysql.binlog_index mysql-test/lib/mtr_report.pl: Find memory leaks mysql-test/mysql-test-run-shell.sh: Added --debug-info to programs to detect memory leaks mysql-test/mysql-test-run.pl: Added --debug-info to programs to detect memory leaks Force log files to var/log cluster tables moved under 'mysql' mysql-test/r/cache_innodb.result: New query cache test with innodb mysql-test/r/connect.result: binlog_index is now in mysql mysql-test/r/drop.result: Removed 'cluster' database mysql-test/r/information_schema.result: Removed 'cluster' database mysql-test/r/mysqlcheck.result: cluster.binlog_index -> mysql.binlog_index mysql-test/r/ndb_binlog_basic.result: cluster.binlog_index -> mysql.binlog_index mysql-test/r/ndb_binlog_ddl_multi.result: cluster -> mysql mysql-test/r/ndb_binlog_discover.result: cluster -> mysql mysql-test/r/ndb_binlog_multi.result: cluster -> mysql mysql-test/r/ndb_restore_compat.result: cluster -> mysql mysql-test/r/ps_1general.result: Removed cluster database mysql-test/r/rpl_create_database.result: Removed cluster database mysql-test/r/rpl_load_from_master.result: Removed cluster database mysql-test/r/rpl_loaddata_m.result: Removed cluster database mysql-test/r/rpl_ndb_bank.result: cluster -> mysql mysql-test/r/rpl_ndb_dd_advance.result: cluster -> mysql mysql-test/r/rpl_ndb_dd_basic.result: cluster -> mysql mysql-test/r/rpl_ndb_idempotent.result: cluster -> mysql mysql-test/r/rpl_ndb_log.result: cluster -> mysql mysql-test/r/rpl_ndb_multi.result: cluster -> mysql mysql-test/r/rpl_ndb_sync.result: cluster -> mysql mysql-test/r/rpl_row_basic_11bugs.result: Removed cluster database mysql-test/r/rpl_truncate_7ndb.result: Position have changed mysql-test/r/rpl_truncate_7ndb_2.result: cluster -> mysql mysql-test/r/schema.result: Removed cluster database mysql-test/r/show_check.result: Removed cluster database mysql-test/r/system_mysql_db.result: binlog_index moved under mysql mysql-test/r/upgrade.result: More tests mysql-test/t/information_schema.test: cluster -> mysql mysql-test/t/mysqldump.test: More test to detect memory leaks mysql-test/t/ndb_binlog_basic.test: cluster -> mysql mysql-test/t/ndb_binlog_multi.test: cluster -> mysql mysql-test/t/ndb_restore_compat.test: cluster -> mysql mysql-test/t/rpl_ndb_bank.test: cluster -> mysql mysql-test/t/rpl_ndb_dd_advance.test: cluster -> mysql mysql-test/t/rpl_ndb_idempotent.test: cluster -> mysql mysql-test/t/rpl_ndb_multi.test: cluster -> mysql mysql-test/t/rpl_ndb_sync.test: cluster -> mysql mysql-test/t/system_mysql_db_fix.test: Drop also binlog_index mysql-test/t/upgrade.test: Check that tables created with 3.23 works mysys/my_error.c: Remove all registered errors (to avoid memory leaks) mysys/my_init.c: call my_error_unregister_all() to avoid some possible memory leaks mysys/mysys_priv.h: Added prototype scripts/mysql_create_system_tables.sh: cluster -> mysql scripts/mysql_fix_privilege_tables.sql: Changed -- to # Create binlog_index table if it dosesn't exist sql/field.cc: Made offset() inline sql/field.h: Changed prototype of offset() to not make it depending on TABLE structure sql/field_conv.cc: Removed some usage of current_thd sql/ha_ndbcluster_tables.h: cluster -> mysql sql/item_sum.cc: Usage of new 'offset' parameters sql/key.cc: Changed 'find_ref_key' to not be dependent on field->table (This fixed a crash when using a table created in MySQL 3.23) sql/mysql_priv.h: Changed find_ref_key() to not use field->table sql/mysqld.cc: Fix that plugin_init() works properly on bootstrap (Previously we got warnings from plugin_init) sql/sql_class.cc: new 'field->offset()' sql/sql_select.cc: New field->offset() sql/table.cc: We don't need field->table to be set in find_ref_key() or find_field() anymore. storage/archive/ha_archive.cc: New field->offset() storage/federated/ha_federated.cc: New field->offset() storage/innobase/handler/ha_innodb.cc: Fixed compiler warnings storage/myisam/ha_myisam.cc: Fixed compiler warnings (Wrong paramter to sprintf()) New field->offset() storage/myisam/ha_myisam.h: Fixed wrong type of table_flags storage/ndb/tools/restore/Restore.cpp: Fixed compiler warning mysql-test/r/1st.result: New BitKeeper file ``mysql-test/r/1st.result'' mysql-test/std_data/old_table-323.frm: New BitKeeper file ``mysql-test/std_data/old_table-323.frm'' mysql-test/t/1st.test: New BitKeeper file ``mysql-test/t/1st.test'' |
||
![]() |
092b8f9e9e |
Merge bk@192.168.21.1:mysql-5.1-opt
into mysql.com:/home/hf/work/mysql-5.1-mrg BitKeeper/deleted/.del-bdb-deadlock.test: Auto merged Makefile.am: Auto merged include/mysql.h: Auto merged libmysqld/lib_sql.cc: Auto merged mysql-test/include/deadlock.inc: Auto merged mysql-test/r/order_by.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/r/type_newdecimal.result: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/flush.test: Auto merged mysql-test/t/flush_block_commit.test: Auto merged mysql-test/t/innodb-lock.test: Auto merged mysql-test/t/lock_multi.test: Auto merged mysql-test/t/rename.test: Auto merged mysql-test/t/show_check.test: Auto merged mysql-test/t/status.test: Auto merged mysql-test/t/subselect.test: Auto merged mysql-test/t/type_newdecimal.test: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/filesort.cc: Auto merged sql/handler.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_func.h: Auto merged sql/item_subselect.cc: Auto merged sql/item_subselect.h: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql-common/my_time.c: Auto merged sql/table.cc: Auto merged client/mysqltest.c: merging include/my_time.h: merging libmysql/libmysql.c: merging mysql-test/t/order_by.test: merging sql/sql_yacc.yy: merging |
||
![]() |
96ad04dec0 |
Merge bk@192.168.21.1:mysql-5.0-opt
into mysql.com:/home/hf/work/mysql-5.0-0mrg BitKeeper/deleted/.del-mysql_client.test: Auto merged include/mysql.h: Auto merged libmysqld/lib_sql.cc: Auto merged mysql-test/r/order_by.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/r/type_newdecimal.result: Auto merged mysql-test/t/flush.test: Auto merged mysql-test/t/flush_block_commit.test: Auto merged mysql-test/t/innodb-deadlock.test: Auto merged mysql-test/t/innodb-lock.test: Auto merged mysql-test/t/lock_multi.test: Auto merged mysql-test/t/mysql.test: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/rename.test: Auto merged mysql-test/t/show_check.test: Auto merged mysql-test/t/status.test: Auto merged mysql-test/t/subselect.test: Auto merged mysql-test/t/type_newdecimal.test: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/handler.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_subselect.cc: Auto merged sql/item_subselect.h: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/protocol.cc: Auto merged sql/protocol.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged sql-common/client.c: Auto merged sql-common/my_time.c: Auto merged Makefile.am: merging client/mysqltest.c: merging include/my_time.h: merging libmysql/libmysql.c: merging mysql-test/t/order_by.test: merging |
||
![]() |
97ec4aa687 |
This finished the bzero() on varchar patch I wrote a few months ago. It also completes the data_length() method I added to Fields to determine the length of data for a particular data type. I have many uses for this :)
mysql-test/r/archive.result: Added test case results. mysql-test/t/archive.test: Added varchar specifc test case. sql/field.cc: Just corrected interface. sql/field.h: Completed data_length() call. storage/archive/ha_archive.cc: Corrected warnings, and finished bzero() patch |
||
![]() |
d4f4301126 |
Merge mysql.com:/usr/home/bar/mysql-5.0.b21505
into mysql.com:/usr/home/bar/mysql-5.1.b21505 mysql-test/r/ctype_utf8.result: Auto merged mysql-test/t/ctype_utf8.test: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/mysql_priv.h: Auto merged sql/sql_select.cc: Auto merged |
||
![]() |
7614eb0d1d |
Bug#21505 Create view - illegal mix of collation for operation 'UNION'
The problem was that any VIEW columns had always implicit derivation. Fix: derivation is now copied from the original expression given in VIEW definition. For example: - a VIEW column which comes from a string constant in CREATE VIEW definition have now coercible derivation. - a VIEW column having COLLATE clause in CREATE VIEW definition have now explicit derivation. mysql-test/r/ctype_utf8.result: Adding test case mysql-test/t/ctype_utf8.test: Adding test case sql/field.cc: Copying derivation from item to field. sql/field.h: Adding derivation and methods to get/set it into Field. sql/item.cc: Copying derivation from field to item. sql/item.h: Moving "enum Derivation" declaration from item.h to mysql_priv.h sql/mysql_priv.h: Moving "enum Derivation" declaration from item.h to mysql_priv.h sql/sql_select.cc: Copying derivation from item to field in create_tmp_field_from_item() and create_tmp_field(). |
||
![]() |
90d14d50a9 |
Merge mysql.com:/home/hf/work/mysql-5.0.clean
into mysql.com:/home/hf/work/mysql-5.1.clean include/my_time.h: Auto merged mysql-test/r/func_group.result: Auto merged mysql-test/r/gis-rtree.result: Auto merged mysql-test/r/order_by.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/r/type_datetime.result: Auto merged mysql-test/r/udf.result: Auto merged mysql-test/t/func_group.test: Auto merged mysql-test/t/gis-rtree.test: Auto merged mysql-test/t/type_datetime.test: Auto merged mysql-test/t/udf.test: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/filesort.cc: Auto merged sql/item.h: 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_subselect.h: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/item_timefunc.cc: Auto merged sql/my_decimal.cc: Auto merged sql/my_decimal.h: Auto merged sql/mysql_priv.h: Auto merged sql/records.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged sql-common/my_time.c: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged mysql-test/r/type_newdecimal.result: SCCS merged mysql-test/t/type_newdecimal.test: merging sql/item.cc: merging sql/item_subselect.cc: SCCS merged sql/item_timefunc.h: merging sql/sql_lex.cc: SCCS merged sql/sql_select.h: merging |
||
![]() |
bec1973eee |
Merge mysql.com:/home/hf/work/19491/my50-19491
into mysql.com:/home/hf/work/mysql-5.0.19491 sql/field.cc: Auto merged sql/field.h: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_timefunc.cc: Auto merged |
||
![]() |
01a0be193d |
bug #19491 (CAST do DATETIME wrong result)
mysql-test/r/type_datetime.result: result fixed mysql-test/r/type_newdecimal.result: result fixed mysql-test/t/type_datetime.test: testcase mysql-test/t/type_newdecimal.test: testcase sql/field.cc: Field_new_decimal::store_time implemented sql/field.h: Field_new_decimal::store_time added sql/item.cc: auxiliary methods implemented to operate with datatimes sql/item.h: auxiliary methods declared in Item to operate with datatimes sql/item_timefunc.cc: Item_date::save_in_field old implementation removed sql/item_timefunc.h: my_decimal and save_in_field methods implemented for datetime items sql/my_decimal.cc: date2my_decimal implemented sql/my_decimal.h: date2my_decimal declared |
||
![]() |
802800b6a0 |
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.1
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt sql/field.h: Auto merged sql/filesort.cc: Auto merged sql/item.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_yacc.yy: Auto merged |
||
![]() |
c689d424fd |
Merge macbook.gmz:/Users/kgeorge/mysql/work/B21174-5.0-opt
into macbook.gmz:/Users/kgeorge/mysql/work/B21174-5.1-opt mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/func_gconcat.result: Auto merged mysql-test/r/func_group.result: Auto merged mysql-test/r/group_by.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/func_gconcat.test: Auto merged mysql-test/t/ps.test: Auto merged mysql-test/t/view.test: Auto merged sql/field.h: Auto merged sql/filesort.cc: Auto merged sql/item.cc: Auto merged sql/item_sum.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_yacc.yy: Auto merged storage/myisam/mi_check.c: Auto merged mysql-test/r/ps.result: merge 5.0-opt -> 5.1-opt sql/unireg.cc: merge 5.0-opt -> 5.1-opt |
||
![]() |
54bb1045ca |
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
into rurik.mysql.com:/home/igor/mysql-5.0-opt mysql-test/r/ctype_ucs.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged sql/field.h: Auto merged sql/unireg.cc: Auto merged |
||
![]() |
0f50a8a7fe |
Fixed bug #20108.
Any default value for a enum fields over UCS2 charsets was corrupted when we put it into the frm file, as it had been overwritten by its HEX representation. To fix it now we save a copy of structure that represents the enum type and when putting the default values we use this copy. mysql-test/r/ctype_ucs.result: Added a test case for bug #20108. mysql-test/t/ctype_ucs.test: Added a test case for bug #20108. |
||
![]() |
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 |
||
![]() |
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. |
||
![]() |
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) |
||
![]() |
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 |
||
![]() |
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 |
||
![]() |
600f11552a | fix windows build | ||
![]() |
882b770734 |
Merge zim.(none):/home/brian/mysql/dep-5.1
into zim.(none):/home/brian/mysql/remove-bdb-5.1 configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/backup.result: Auto merged mysql-test/r/im_utils.result: Auto merged mysql-test/r/show_check.result: Auto merged mysql-test/t/disabled.def: Auto merged scripts/mysql_install_db.sh: Auto merged sql/field.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql-common/my_time.c: Auto merged sql/set_var.cc: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/t/federated_transactions.test: Merge |
||
![]() |
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 |
||
![]() |
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. |
||
![]() |
3662bc591f |
Merge rama.(none):/home/jimw/my/mysql-5.0-21284
into rama.(none):/home/jimw/my/mysql-5.1-clean sql/field.h: Resolve conflict sql/ha_federated.cc: Resolve conflict |
||
![]() |
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 |
||
![]() |
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 |