into msdesk.(none):/home/msvensson/mysql-5.0
BUILD/SETUP.sh:
Auto merged
BitKeeper/deleted/.del-ctype-cp932.c:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
Auto merged
BitKeeper/deleted/.del-ndb_range_bounds.pl~ff7e47a35fb44c74:
Auto merged
innobase/os/os0sync.c:
Auto merged
mysql-test/r/ctype_tis620.result:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_uca.test:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/ctype_ujis.test:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-gbk.c:
Auto merged
strings/ctype-simple.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
client/mysql.cc:
Sam change in both 4.1 and 5.0
mysql-test/r/ctype_uca.result:
Merge
mysql-test/r/ctype_ujis.result:
Merge
strings/ctype-mb.c:
Merge
strings/ctype-tis620.c:
Merge
Let pthread_mutex_init() macro return 0 on Windows
mysql_priv.h:
Return type is to be 'my_bool' for 'opt_enable_shared_memory'
sql/mysql_priv.h:
Return type is to be 'my_bool' for 'opt_enable_shared_memory'
include/my_pthread.h:
Let pthread_mutex_init() macro return 0 on Windows
fixed CHECKSUM TABLE to be independent from the first 'deleted' bit in the null bitmask (undefined in the InnoDB)
bug#13710
sql/sql_table.cc:
fixed CHECKSUM TABLE to be independent from the first 'deleted' bit in the null bitmask (undefined in the InnoDB)
bug#13710
Some options were declared as 'bool', but since those are being
handled in my_getopt.c, bool can be machine dependent. To make
sure it works in all circumstances, the type should be my_bool
for C (not C++) programs.
sql/mysql_priv.h:
Fixed some bools to my_bools.
sql/mysqld.cc:
Changed several bools to my_bools.
sql/slave.cc:
Changed bool to my_bool.
sql/slave.h:
Changed bool to my_bool.
using wrong type in assignment etc.
cmd-line-utils/readline/complete.c:
Fixed problem with implicitely defining wcwidth() in case when
compiling with icc.
cmd-line-utils/readline/display.c:
Fixed problem with implicitely defining wcwidth() in case when
compiling with icc.
cmd-line-utils/readline/mbutil.c:
Fixed problem with implicitely defining wcwidth() in case when
compiling with icc.
server-tools/instance-manager/protocol.cc:
Fixed some types from int to char. Made ERROR_PACKET_CODE
static global variable in this file.
sql/log.cc:
Removed warning of unused goto when not in debug mode.
fixed CHECKSUM TABLE to be independent from last - undefined in InnoDB - bits in the null bitmask
bug#13710
sql/table.h:
fixed CHECKSUM TABLE to be independent from last - undefined in InnoDB - bits in the null bitmask
bug#13710
sql/table.cc:
fixed CHECKSUM TABLE to be independent from last - undefined in InnoDB - bits in the null bitmask
bug#13710
sql/sql_table.cc:
fixed CHECKSUM TABLE to be independent from last - undefined in InnoDB - bits in the null bitmask
bug#13710
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.h:
Auto merged
sql/sql_base.cc:
Auto merged
into zim.(none):/home/brian/mysql/fix-5.0
sql/ha_berkeley.cc:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
May changes were to simplify storage engine setup and support for legacy call to show storage engines.
mysql-test/r/ps_1general.result:
Fixed test results for new listing order
sql/examples/ha_tina.cc:
Removed dead code
sql/examples/ha_tina.h:
Removed dead code
sql/ha_archive.cc:
Capitalized sotrage engine name and moved disabled code.
sql/ha_berkeley.cc:
Moved deisabled code
sql/ha_federated.cc:
Removed disabled code
sql/ha_innodb.cc:
Removed disabled message
sql/ha_ndbcluster.cc:
Removed disabled message
sql/handler.cc:
Added in legacy support for sotrage engine listing (ala Serg's request). Removed handlertons variables and we now have simplified ha_init code.
sql/handler.h:
No longer need handlertons array.
mysql-test/include/check_var_limit.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/have_big5.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/have_compress.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/have_crypt.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/have_outfile.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/have_query_cache.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/have_tis620.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/have_ucs2.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/have_ujis.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/not_embedded.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/system_db_struct.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/test_outfile.inc:
Turn off EOLN_NATIVE flag
mysql-test/r/greedy_optimizer.result:
Turn off EOLN_NATIVE flag
mysql-test/r/index_merge.result:
Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_bdb.result:
Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_innodb.result:
Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_innodb2.result:
Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_ror.result:
Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_ror_cpk.result:
Turn off EOLN_NATIVE flag
mysql-test/r/join_nested.result:
Turn off EOLN_NATIVE flag
mysql-test/r/rowid_order_bdb.result:
Turn off EOLN_NATIVE flag
mysql-test/r/rowid_order_innodb.result:
Turn off EOLN_NATIVE flag
mysql-test/r/rpl_session_var.result:
Turn off EOLN_NATIVE flag
mysql-test/r/sp-error.result:
Turn off EOLN_NATIVE flag
mysql-test/r/sp-security.result:
Turn off EOLN_NATIVE flag
mysql-test/r/sp.result:
Turn off EOLN_NATIVE flag
mysql-test/r/sum_distinct.result:
Turn off EOLN_NATIVE flag
mysql-test/std_data/des_key_file:
Turn off EOLN_NATIVE flag
mysql-test/std_data/init_file.dat:
Turn off EOLN_NATIVE flag
mysql-test/std_data/loaddata1.dat:
Turn off EOLN_NATIVE flag
mysql-test/std_data/loaddata2.dat:
Turn off EOLN_NATIVE flag
mysql-test/std_data/loaddata3.dat:
Turn off EOLN_NATIVE flag
mysql-test/std_data/loaddata4.dat:
Turn off EOLN_NATIVE flag
mysql-test/std_data/rpl_loaddata.dat:
Turn off EOLN_NATIVE flag
mysql-test/std_data/rpl_loaddata2.dat:
Turn off EOLN_NATIVE flag
mysql-test/std_data/warnings_loaddata.dat:
Turn off EOLN_NATIVE flag
mysql-test/t/greedy_optimizer.test:
Turn off EOLN_NATIVE flag
mysql-test/t/index_merge.test:
Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_bdb.test:
Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_innodb.test:
Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_innodb2.test:
Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_ror.test:
Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_ror_cpk.test:
Turn off EOLN_NATIVE flag
mysql-test/t/join_nested.test:
Turn off EOLN_NATIVE flag
mysql-test/t/rowid_order_bdb.test:
Turn off EOLN_NATIVE flag
mysql-test/t/rowid_order_innodb.test:
Turn off EOLN_NATIVE flag
mysql-test/t/rpl_session_var.test:
Turn off EOLN_NATIVE flag
mysql-test/t/sp-error.test:
Turn off EOLN_NATIVE flag
mysql-test/t/sp-security.test:
Turn off EOLN_NATIVE flag
mysql-test/t/sp.test:
Turn off EOLN_NATIVE flag
mysql-test/t/sum_distinct.test:
Turn off EOLN_NATIVE flag
in SHOW CREATE TABLE if a temporary file cannot be created.
(Bug #13002)
sql/ha_innodb.cc:
ha_innobase::get_foreign_key_create_info(): Display an error
message to the user if a temporary file cannot be created.
