mariadb/BUILD
unknown 36b058929f Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-MetaData.hpp~538342afcd8ac53c:
  Auto merged
configure.in:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
extra/yassl/include/yassl_int.hpp:
  Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
  Auto merged
include/m_ctype.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/my_time.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/mysqlcheck.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/wait_timeout.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/mf_iocache2.c:
  Auto merged
mysys/mf_keycache.c:
  Auto merged
server-tools/instance-manager/instance_options.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/item_row.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/password.c:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/spatial.h:
  Auto merged
sql/sql_cache.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
sql/sql_trigger.h:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
storage/archive/ha_archive.h:
  Auto merged
storage/heap/hp_write.c:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/mi_unique.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisam/rt_index.c:
  Auto merged
storage/myisam/sort.c:
  Auto merged
storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbReceiver.hpp:
  Auto merged
storage/ndb/include/transporter/TransporterDefinitions.hpp:
  Auto merged
storage/ndb/include/util/OutputStream.hpp:
  Auto merged
storage/ndb/include/util/SimpleProperties.hpp:
  Auto merged
storage/ndb/include/util/SocketAuthenticator.hpp:
  Auto merged
storage/ndb/include/util/SocketServer.hpp:
  Auto merged
storage/ndb/src/common/portlib/NdbTick.c:
  Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.cpp:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.cpp:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/Transporter.cpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/common/util/File.cpp:
  Auto merged
storage/ndb/src/common/util/Properties.cpp:
  Auto merged
storage/ndb/src/common/util/SocketClient.cpp:
  Auto merged
storage/ndb/src/common/util/random.c:
  Auto merged
storage/ndb/src/common/util/socket_io.cpp:
  Auto merged
storage/ndb/src/cw/cpcd/APIService.cpp:
  Auto merged
storage/ndb/src/cw/cpcd/main.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/mgmapi/LocalConfig.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.hpp:
  Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/mgmsrv/main.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationExec.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanFilter.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
storage/ndb/tools/delete_all.cpp:
  Auto merged
storage/ndb/tools/desc.cpp:
  Auto merged
storage/ndb/tools/drop_index.cpp:
  Auto merged
storage/ndb/tools/drop_tab.cpp:
  Auto merged
storage/ndb/tools/listTables.cpp:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
storage/ndb/tools/restore/Restore.hpp:
  Auto merged
storage/ndb/tools/restore/consumer.hpp:
  Auto merged
storage/ndb/tools/select_all.cpp:
  Auto merged
storage/ndb/tools/select_count.cpp:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-cp932.c:
  Auto merged
strings/ctype-eucjpms.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
strings/decimal.c:
  Auto merged
BUILD/SETUP.sh:
  manual merge
BUILD/compile-pentium-gcov:
  manual merge
Makefile.am:
  manual merge
client/mysqltest.c:
  Automatic merge
include/mysql.h:
  manual merge
libmysqld/lib_sql.cc:
  Automatic merge
mysql-test/r/mysqlbinlog.result:
  Automatic merge
mysql-test/r/mysqlcheck.result:
  Fixed test case (we should never drop 'test' database)
mysys/my_bitmap.c:
  manual merge
server-tools/instance-manager/commands.h:
  manual merge
server-tools/instance-manager/guardian.cc:
  manual merge
server-tools/instance-manager/mysql_connection.cc:
  manual merge
server-tools/instance-manager/options.cc:
  manual merge
server-tools/instance-manager/options.h:
  manual merge
server-tools/instance-manager/parse.cc:
  Automatic merge
server-tools/instance-manager/user_map.cc:
  manual merge
server-tools/instance-manager/user_map.h:
  manual merge
sql/field.cc:
  manual merge
sql/field.h:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
sql/handler.cc:
  manual merge
sql/item.cc:
  manual merge
sql/item.h:
  Automatic merge
sql/log.cc:
  manual merge
sql/log_event.cc:
  manual merge
sql/mysqld.cc:
  manual merge
sql/slave.cc:
  manual merge
sql/spatial.cc:
  Automatic merge
sql/sql_class.h:
  manual merge
sql/sql_insert.cc:
  manual merge
sql/sql_parse.cc:
  manual merge
sql/sql_select.cc:
  manual merge
sql/sql_show.cc:
  manual merge
sql/sql_table.cc:
  manual merge
sql/sql_trigger.cc:
  manual merge
sql/sql_view.cc:
  manual merge
sql/sql_yacc.yy:
  manual merge
  Made setting thd and lex uniform
sql/table.cc:
  manual merge
sql/unireg.cc:
  manual merge
storage/archive/ha_archive.cc:
  manual merge
storage/federated/ha_federated.cc:
  manual merge
storage/heap/ha_heap.cc:
  manual merge
storage/myisam/ha_myisam.cc:
  manual merge
storage/myisammrg/ha_myisammrg.cc:
  manual merge
storage/ndb/include/util/InputStream.hpp:
  manual merge
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  manual merge
storage/ndb/src/common/util/Bitmask.cpp:
  manual merge
storage/ndb/src/common/util/ConfigValues.cpp:
  Automatic merge
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  manual merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  manual merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  manual merge
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  manual merge
  Changed commented code to be #ifdef-ed instead
storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  manual merge
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Automatic merge
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
  manual merge
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Automatic merge
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Automatic merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Automatic merge
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  manual merge
storage/ndb/tools/restore/restore_main.cpp:
  manual merge
tests/mysql_client_test.c:
  manual merge
2007-01-27 03:46:45 +02:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
autorun.sh This patch removes need for a innodb to have its own configure. 2006-08-23 13:59:16 -07:00
check-cpu Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work1-testcases-20061 2007-01-22 16:37:27 +01:00
cleanup hanged UDF interface to use clear() instead of reset() 2003-08-27 22:30:50 +03:00
compile-alpha Update to autoconf 2.52 2002-02-07 21:34:35 +02:00
compile-alpha-ccc Remove automatically generated autotools files from revision control. 2005-05-18 15:23:29 +04:00
compile-alpha-cxx Many files: 2006-08-21 15:34:29 +02:00
compile-alpha-debug Many files: 2006-08-21 15:34:29 +02:00
compile-amd64-debug-max Remove dead code from BUILD/ scripts: $debug_extra_warnings is 2006-04-05 17:50:33 +04:00
compile-amd64-debug-max-no-ndb Remove dead code from BUILD/ scripts: $debug_extra_warnings is 2006-04-05 17:50:33 +04:00
compile-amd64-max Remove dead code from BUILD/ scripts. 2006-04-05 16:50:12 +04:00
compile-amd64-valgrind-max Bug#25396 2007-01-23 05:09:14 -08:00
compile-darwin-mwcc Remove dead code from BUILD/ scripts: $debug_extra_warnings is 2006-04-05 17:50:33 +04:00
compile-dist Many files: 2006-08-21 15:34:29 +02:00
compile-hpux11-parisc2-aCC Remove automatically generated autotools files from revision control. 2005-05-18 15:23:29 +04:00
compile-ia64-debug-max Many files: 2006-08-21 15:34:29 +02:00
compile-irix-mips64-mipspro Remove automatically generated autotools files from revision control. 2005-05-18 15:23:29 +04:00
compile-ndb-autotest ndb - 2006-08-02 09:08:21 +02:00
compile-pentium Update to autoconf 2.52 2002-02-07 21:34:35 +02:00
compile-pentium-cybozu Add missing parts for the "Cybozu" custom build, to avoid future manual patches. 2005-04-08 13:56:48 +02:00
compile-pentium-debug Remove dead code from BUILD/ scripts: $debug_extra_warnings is 2006-04-05 17:50:33 +04:00
compile-pentium-debug-max Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 2006-04-19 21:22:35 -04:00
compile-pentium-debug-max-no-embedded Implement --warning-mode in SETUP.sh. The value of the 2006-04-07 02:25:59 +04:00
compile-pentium-debug-max-no-ndb Remove dead code from BUILD/ scripts: $debug_extra_warnings is 2006-04-05 17:50:33 +04:00
compile-pentium-debug-openssl BUG#18818 configure: No longer finds OpenSSL on Mac OS X 2006-05-17 13:59:37 +02:00
compile-pentium-debug-yassl BUG#18818 configure: No longer finds OpenSSL on Mac OS X 2006-05-17 13:59:37 +02:00
compile-pentium-gcov Merge mysql.com:/home/my/mysql-5.0 2007-01-27 03:46:45 +02:00
compile-pentium-gprof Update to autoconf 2.52 2002-02-07 21:34:35 +02:00
compile-pentium-icc Bug #12717 yassl: Crashes in "integer.cpp" when compiled with icc 2005-09-01 14:07:45 +02:00
compile-pentium-icc-valgrind-max Remove dead code from BUILD/ scripts. 2006-04-05 16:50:12 +04:00
compile-pentium-icc-yassl Bug #12717 yassl: Crashes in "integer.cpp" when compiled with icc 2005-09-01 14:07:45 +02:00
compile-pentium-max Remove dead code from BUILD/ scripts. 2006-04-05 16:50:12 +04:00
compile-pentium-myodbc - cleaned up BUILD scripts 2000-12-18 23:24:19 +02:00
compile-pentium-mysqlfs-debug Remove dead code from BUILD/ scripts: $debug_extra_warnings is 2006-04-05 17:50:33 +04:00
compile-pentium-pgcc merge 2005-05-18 22:26:23 +02:00
compile-pentium-valgrind-max Implement --warning-mode in SETUP.sh. The value of the 2006-04-07 02:25:59 +04:00
compile-pentium64 Added --pipe option for faster compile 2006-06-06 20:21:36 +03:00
compile-pentium64-debug Added --pipe option for faster compile 2006-06-06 20:21:36 +03:00
compile-pentium64-debug-max Added --pipe option for faster compile 2006-06-06 20:21:36 +03:00
compile-pentium64-valgrind-max Remove dead code from BUILD/ scripts: $debug_extra_warnings is 2006-04-05 17:50:33 +04:00
compile-ppc - fixed file permissions (need execute bits set) 2004-12-02 10:11:28 +01:00
compile-ppc-debug Remove dead code from BUILD/ scripts: $debug_extra_warnings is 2006-04-05 17:50:33 +04:00
compile-ppc-debug-max Remove dead code from BUILD/ scripts: $debug_extra_warnings is 2006-04-05 17:50:33 +04:00
compile-ppc-debug-max-no-ndb Remove dead code from BUILD/ scripts: $debug_extra_warnings is 2006-04-05 17:50:33 +04:00
compile-ppc-max Remove dead code from BUILD/ scripts. 2006-04-05 16:50:12 +04:00
compile-solaris-sparc This fixes support for building mysql on Solaris with GNU tools. 2006-09-13 22:09:04 -07:00
compile-solaris-sparc-debug This fixes support for building mysql on Solaris with GNU tools. 2006-09-13 22:09:04 -07:00
compile-solaris-sparc-forte Remove automatically generated autotools files from revision control. 2005-05-18 15:23:29 +04:00
compile-solaris-sparc-purify First stage removeal of BDB. 2006-08-09 17:33:08 -07:00
FINISH.sh Removed compiler warnings 2006-11-27 18:16:08 +02:00
Makefile.am Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
SETUP.sh Merge mysql.com:/home/my/mysql-5.0 2007-01-27 03:46:45 +02:00