VC++Files/client/mysqldump.vcproj:
Add missing source file.
VC++Files/mysql.sln:
Fix configuration mismatch.
VC++Files/sql/mysqld.vcproj:
Enable row-based replication.
Add missing source files.
scripts/make_win_src_distribution.sh:
Add copying of missing directory.
sql/event.h:
Fix type conflict only visible on Windows.
sql/event_executor.cc:
Fix non-portable thread stuff.
sql/event_timed.cc:
Fix type conflict only visible on Windows.
sql/ha_archive.cc:
Add cast needed for Windows.
sql/handler.h:
Fix Windows byte * <-> char * mismatch.
sql/opt_range.cc:
Fix Windows byte * <-> char * mismatch.
sql/set_var.cc:
BUG#16811
Fix Windows compilation by making the cast-away of volatile implicit
(Windows linker does not like volatile <-> non-volatile mismatch, in
contrast to Unix)
sql/sql_partition.cc:
Fix Windows byte * <-> char * mismatch.
VC++Files/client/mysqlslap.vcproj:
Explicit library specification removed from project file
VC++Files/mysql.sln:
Dependency to mysqlclient & mysys is added for mysqlslap in mysql.sln
/var/tmp in my path when testing data diretory. the var directory
exists in a src tree but may not exist in a different testing
build setup.
mysql-test/r/partition_mgm_err.result:
added a row insert just to make sure the data and index files are made
mysql-test/t/partition_mgm_err.test:
removed the /var/tmp path elements since there is not guarantee that
other build setups will include this path
into linux.site:/home/reggie/work/mysql-5.1-bug14354
mysql-test/r/partition_mgm_err.result:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/ha_partition.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
mysql-test/t/partition_mgm_err.test:
SCCS merged
Add massive printout when failure detected
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Add dumping of replica info
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Add dumping of replica info
Try to open an old 5.0 table name
if encoded name doesn't exist.
This makes SELECT working without having
to rename tables with tricky characters
in name into 5.1 format (simpliefies upgrade).
sql/table.cc:
Try to open an old 5.0 table name
if encoded name doesn't exist.
This makes SELECT working without having
to rename tables with tricky characters
in name into 5.1 format (simpliefies upgrade).
into mysql.com:/home/psergey/mysql-5.1-ppruning-r5-push
mysql-test/r/binlog_row_ctype_cp932.result:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
Updated to remove ndb_dd_disk2memory
ndb_dd_disk2memory.result:
Updated results to match change to show create table for NDB tables. WL 2604
mysql-test/r/ndb_dd_disk2memory.result:
Updated results to match change to show create table for NDB tables. WL 2604
mysql-test/t/disabled.def:
Updated to remove ndb_dd_disk2memory
fix typo + add error code to printable list
storage/ndb/include/kernel/signaldata/Extent.hpp:
Set correct error code
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
err is already negative
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Set correct error code
storage/ndb/src/ndbapi/ndberror.c:
Add error code to printable list
mysql-test/r/partition_mgm_err.result:
only the single drop table since we have disabled query logging for the create table
mysql-test/t/partition_mgm_err.test:
test for bug #14354
first make sure /tmp/bug14354 is not there, then make the dir
create a partitioned table with the partition using
/tmp/bug14354 as it's data dir
we are disabling query logging since we are using $MYSQL_TEST_DIR
and we are not certain where the tmp files will be created.
sql/ha_partition.cc:
pass partition filename with pathname into
set_up_table_before_create.
remove the path from the passed in value and then append the filename
to the data_file_name or index_file_name if those values were
specified.
sql/ha_partition.h:
added partition_name_with_path to set_up_table_before_create
sql/mysql_priv.h:
move append_file_to_dir to mysql_priv.h
sql/sql_parse.cc:
moving append_file_to_dir to mysql_priv.h
sql/sql_partition.cc:
add_keyword_string was not writing keyword value with quotes
"make test" != "mysql-test-run && mysql-test-run --ps-protocol". "make test" is what should be used;
had it been, the failure would have been noticed earlier. Putting back cxx flags I had by accident removed.
Disclaimer: 5.1-new is in a sorry state: log_tables and some ndb* fail, mysqlslap test crashes randomly in a row-based replication assertion (sql_class.cc:2207).
BUILD/SETUP.sh:
Putting back flags which I, by accident, removed during the push of row-based replication (I had removed
them in my tree because they cause tens of wrong warnings with my gcc4.0.0, and committed that by accident).
mysql-test/r/binlog_row_ctype_cp932.result:
result update (people should run "make test" now, it tests row-based replication too).
this was fixed by WL 2604
mysql-test/r/partition_mgm_err.result:
result block for bug#15523
mysql-test/t/partition_mgm_err.test:
test block for bug #15523
This bug was fixed as part of the large WL 2604 push.
mysql-test/r/partition_mgm_err.result:
results block for bug #16534
mysql-test/t/partition_mgm_err.test:
test block for bug# 16534
into lmy004.:/work/mysql-5.1-tt-copy-works
sql/event.cc:
Auto merged
sql/event_executor.cc:
Auto merged
sql/event_timed.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
change status variable from have_partition_engine to have_partitioning.
mysql-test/include/have_partition.inc:
updated to use new status variable
mysql-test/r/have_partition.require:
updated to use new status variable
sql/set_var.cc:
change status variable from have_partition_engine to have_partitioning.
The log content is obviously different in two modes,
as Queries are translated into Prepare and Execute
commands. Thus we should use test only in one mode
to get the match with result.
mysql-test/t/log_tables.test:
disable ps-protocol in log_tables test
