SHOW INSTANCE STATUS output
mysql-test/r/im_life_cycle.result:
update result
mysql-test/t/im_life_cycle.imtest:
fix test to take into account the new column
server-tools/instance-manager/commands.cc:
add a version_no column to the SHOW INSTANCE STATUS output
server-tools/instance-manager/instance_options.cc:
cleanup
mysql-test/r/im_life_cycle.result:
correct result
mysql-test/t/im_life_cycle.imtest:
check that wrong command is processed correctly
server-tools/instance-manager/Makefile.am:
always look for passwords in /etc/ on unixes
server-tools/instance-manager/commands.cc:
fix warning
server-tools/instance-manager/instance.cc:
fix monitoring capabilities, when no port was specified
for an instance
server-tools/instance-manager/instance_map.cc:
allow relative paths in --defaults-file option
server-tools/instance-manager/mysqlmanager.cc:
fix windows warning
server-tools/instance-manager/options.cc:
add vars to allow relative paths in --defaults-file option
server-tools/instance-manager/options.h:
add an option
server-tools/instance-manager/parse.cc:
check for get_text_id return value
server-tools/instance-manager/portability.h:
add _snprintf define, move platfrom-independent
ifdefs to priv.h
server-tools/instance-manager/priv.cc:
increase net timeout. it should be equal to mysqld's
server-tools/instance-manager/priv.h:
move platform-independent ifdefs here
corrected multiple --log-bin options in mysql-test-run
mysql-test/mysql-test-run.sh:
corrected multiple --log-bin options in mysql-test-run
mysql-test/r/rpl_ndb_sync.result:
changed to use temporary heap table on a ndb test
mysql-test/t/rpl_ndb_sync.test:
changed to use temporary heap table on a ndb test
into mysql.com:/home/alexi/innodb/mysql-5.1-merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
internal charset to one associated with currently being handled query.
To note such a query can come from interactive client either.
There was a discussion within replication team and Monty who's suggestion won.
It avoids straightforward parsing of all `set' queries that could affect client side
character set.
According to the idea, mysql client does not parse `set' queries but rather cares of
`charset new_cs_name' command.
This command is generated by mysqlbinlog in form of exclaiming comment (Lars' suggestion)
so that enlightened clients like `mysql' knows what to do with it.
Interactive human can switch between many multi-byte charsets during the session
providing the command explicitly.
To note that setting new internal mysql's charset does not
trigger sending any `SET' sql statement to the server.
client/mysql.cc:
BUG#16217 revealed the problem of switching between charsets in mysql client.
Such switching is necessary in a case when being scanned query consists of
multi-byte chars and internal charset was initialized differently. mysql finds
`/' escape and misiterprete it
while in fact one could be a part of a multi-byte symbol like the bug page reported.
This patch extends mysql `charset' command, '\C' shortcut.
mysql-test/r/ctype_ucs_binlog.result:
comment line generated by mysqlbinlog for processing of logs with multi-byte chars.
mysql-test/r/mysql.result:
results are altered due to #16217
mysql-test/r/mysqlbinlog.result:
Results are altered due to #16217
mysql-test/r/mysqlbinlog2.result:
commeted command for mysql client due to multi-byte binlog
mysql-test/r/rpl_charset.result:
commented command for mysql due to multi-byte binlogs
mysql-test/r/rpl_timezone.result:
commented command for mysql client due to multi-byte binlogs
mysql-test/r/user_var-binlog.result:
commented command for mysql client due to multi-byte binlogs
mysql-test/t/mysql.test:
Main test for mysql client is extended to check `charset' command.
mysql-test/t/mysqlbinlog.test:
Checking how /*! \C cs_name */ are added to the output of mysqlbinlog.
The exclaiming comment is for further processing by mysql client.
The added part mimics the failure to recover tables from binlog - see BUG#16217.
sql/log_event.cc:
Sending into output instructions for mysql client to switch internally
to appropriate charset.
mysql client is supposed to be invoked with --default-character-set=
"to default character set of the server created the binlog".
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
client/mysqltest.c:
Auto merged
mysql-test/lib/mtr_cases.pl:
Merge
mysql-test/mysql-test-run.pl:
Merge
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
BitKeeper/deleted/.del-ndb_load.result:
Delete: mysql-test/r/ndb_load.result
BitKeeper/deleted/.del-ndb_load.test:
Delete: mysql-test/t/ndb_load.test
extra/perror.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/ndb_blob.result:
Auto merged
mysql-test/r/sp-code.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
mysql-test/t/sp-destruct.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
Auto merged
storage/ndb/src/kernel/main.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
Auto merged
storage/ndb/tools/delete_all.cpp:
Auto merged
mysql-test/t/disabled.def:
Manual merge.
into neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my51-mysqltestrun_faster
mysql-test/lib/mtr_match.pl:
Auto merged
mysql-test/lib/mtr_stress.pl:
Auto merged
mysql-test/lib/mtr_cases.pl:
Merge 5.0 -> 5.1, added some comments and set skip if opt_skip_ndbcluster
mysql-test/mysql-test-run.pl:
Merge backpoort from 5.0 -> 5.1
not needed by the tescases. This will save test time for those testcases
that does not need cluster, but need a restart, as they dont have to wait
the extra time it would take for cluster to restart. It will also save
time for other testcases, as cluster does not
need to be contacted for each table to be dropped or created.
Backport from 5.1
mysql-test/lib/mtr_cases.pl:
Mark all test cases where name contains "ndb" as ndbcluster needed
mysql-test/lib/mtr_match.pl:
Add mtr_match_substring function
mysql-test/lib/mtr_stress.pl:
Extre param to mysqld_start
mysql-test/mysql-test-run.pl:
Only start ndbcluster for testcases that needs it.
mysql-test/t/rpl_row_sp005.test:
Updated by adding ORDER by to use test with NDB engine
mysql-test/r/rpl_row_sp005.result:
Updated by adding ORDER by to use test with NDB engine
mysql-test/t/rpl_row_sp009.test:
Updated by adding ORDER by to use test with NDB engine
mysql-test/r/rpl_row_sp009.result:
Updated by adding ORDER by to use test with NDB engine
mysql-test/t/rpl_row_view01.test:
Updated by adding ORDER BY and sleep to use test with NDB engine
mysql-test/r/rpl_row_view01.result:
Updated by adding ORDER BY and sleep to use test with NDB engine
mysql-test/r/rpl_relay_space_myisam.result:
updated
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
configure.in:
Auto merged
include/heap.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
sql/ha_heap.cc:
Auto merged
sql/ha_heap.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
storage/heap/hp_create.c:
Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
Auto merged
sql/sql_update.cc:
Manual merge
tests/mysql_client_test.c:
SCCS merged
mysql-test/r/ndb_view.result:
New BitKeeper file ``mysql-test/r/ndb_view.result''
mysql-test/t/ndb_view.test:
New BitKeeper file ``mysql-test/t/ndb_view.test''
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
mysql-test/extra/rpl_tests/rpl_log.test:
Auto merged
mysql-test/r/rpl_insert_id.result:
Auto merged
mysql-test/r/rpl_replicate_do.result:
Auto merged
mysql-test/r/rpl_row_log.result:
Auto merged
mysql-test/r/rpl_skip_error.result:
Auto merged
mysql-test/t/rpl_replicate_do.test:
Auto merged
mysql-test/t/rpl_skip_error.test:
Auto merged
BitKeeper/deleted/.del-rpl000004.result~a3147834a662043a:
Auto merged
BitKeeper/deleted/.del-rpl000004.test~61532b03f9ad2734:
Auto merged
mysql-test/t/rpl_load_from_master.test:
Auto merged
mysql-test/extra/rpl_tests/rpl_row_blob.test:
Changes that Larss requested
mysql-test/r/rpl_row_blob_innodb.result:
Changes that Larss requested
mysql-test/r/rpl_row_blob_myisam.result:
Changes that Larss requested
mysql-test/r/rpl_insert_id.result:
updated results
mysql-test/extra/rpl_tests/rpl_insert_id_pk.test:
Suggested PK test by Lars
mysql-test/t/rpl_insert_id_pk.test:
Suggested PK test by Lars
mysql-test/t/rpl_insert_id_pk-slave.opt:
Suggested PK test by Lars
mysql-test/r/rpl_insert_id_pk.result:
Suggested PK test by Lars
mysql-test/extra/rpl_tests/rpl_insert_id.test:
updated per lars
mysql-test/extra/rpl_tests/rpl_insert_id.test:
Updated wiht 1022 error, order by and PK for use with NDB engine
mysql-test/r/rpl_insert_id.result:
Updated wiht 1022 error, order by and PK for use with NDB engine
mysql-test/t/rpl_skip_error.test:
updated to wrk with ndb
mysql-test/r/rpl_skip_error.result:
updated to wrk with ndb
mysql-test/t/rpl_sporadic_master.test:
updated to wrk with ndb
mysql-test/r/rpl_sporadic_master.result:
updated to wrk with ndb
mysql-test/t/rpl_row_trig002.test:
updated to work with NDB engine
mysql-test/r/rpl_row_trig002.result:
updated to work with NDB engine
mysql-test/t/rpl_temporary.test:
updated to work with NDB engine
mysql-test/r/rpl_temporary.result:
updated to work with NDB engine
mysql-test/extra/rpl_tests/rpl_row_001.test:
updated to work with NDB as default engine
mysql-test/r/rpl_row_001.result:
updated to work with NDB as default engine
mysql-test/t/rpl_row_blob_innodb.test:
Fixed bug in test case
mysql-test/t/rpl_row_blob_innodb-slave.opt:
Added slave option file to ensure correct engine type on slave
mysql-test/r/rpl_row_blob_innodb.result:
Updated results
mysql-test/r/rpl_row_blob_myisam.result:
Updated results
mysql-test/r/rpl_ndb_log.result:
update results file
Apply a patch by Jonas for NDB diskdata.
mysql-test/r/sp-code.result:
Fix a test result after merge: 94 and 95 are SQLCOM codes of
SQLCOM_CALL. New commands were added in 5.1 so SQLCOM_CALL got
renumbered.
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Apply second patch by Jonas to make NDB diskdata work on systems
without O_DIRECT support.
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
client/mysqltest.c:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/type_float.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
mysql-test/t/sp-error.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/type_float.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
