mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-30 04:26:45 +03:00 
			
		
		
		
	into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge BitKeeper/deleted/.del-im_check_os.inc: Auto merged BitKeeper/deleted/.del-im_options_set.imtest~b53d9d60e5684833: Auto merged BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921: Auto merged BitKeeper/deleted/.del-im_options_unset.imtest~768eb186b51d0048: Auto merged configure.in: Auto merged BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f: Auto merged include/mysql_com.h: Auto merged mysql-test/lib/mtr_io.pl: Auto merged mysql-test/r/im_daemon_life_cycle.result: Auto merged mysql-test/r/im_life_cycle.result: Auto merged mysql-test/r/im_utils.result: Auto merged mysql-test/r/sp-error.result: Auto merged mysql-test/r/trigger.result: Auto merged mysql-test/r/type_varchar.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/im_daemon_life_cycle.imtest: Auto merged mysql-test/t/im_life_cycle.imtest: Auto merged mysql-test/t/im_utils.imtest: Auto merged mysql-test/t/sp-error.test: Auto merged mysql-test/t/trigger.test: Auto merged mysql-test/t/type_varchar.test: Auto merged mysql-test/t/view.test: 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_row.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/net_serv.cc: Auto merged sql/protocol.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_cache.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_error.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_trigger.h: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/mysql-test-run.pl: Use local. Alik will merge his changes manually. mysql-test/lib/mtr_process.pl: Use local. mysql-test/r/grant.result: Use local. mysql-test/r/sp.result: Use local. mysql-test/r/ps.result: Manual merge. mysql-test/t/grant.test: Manual merge. mysql-test/t/ps.test: Manual merge. mysql-test/t/sp.test: Manual merge. sql/Makefile.am: Manual merge. sql/field.cc: Manual merge. sql/mysqld.cc: Manual merge. sql/share/errmsg.txt: Manual merge. sql/sp.cc: Manual merge. sql/sp_head.h: Manual merge. sql/sql_trigger.cc: Manual merge. sql/sql_view.cc: Manual merge.
		
			
				
	
	
		
			95 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			95 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
| SHOW VARIABLES LIKE 'server_id';
 | |
| Variable_name	Value
 | |
| server_id	1
 | |
| SHOW INSTANCES;
 | |
| instance_name	state
 | |
| mysqld1	online
 | |
| mysqld2	offline
 | |
| SHOW INSTANCE OPTIONS mysqld1;
 | |
| option_name	value
 | |
| instance_name	VALUE
 | |
| socket	VALUE
 | |
| pid-file	VALUE
 | |
| port	VALUE
 | |
| datadir	VALUE
 | |
| log	VALUE
 | |
| log-error	VALUE
 | |
| log-slow-queries	VALUE
 | |
| language	VALUE
 | |
| character-sets-dir	VALUE
 | |
| basedir	VALUE
 | |
| server_id	VALUE
 | |
| skip-stack-trace	VALUE
 | |
| skip-innodb	VALUE
 | |
| skip-ndbcluster	VALUE
 | |
| log-output	VALUE
 | |
| SHOW INSTANCE OPTIONS mysqld2;
 | |
| option_name	value
 | |
| instance_name	VALUE
 | |
| socket	VALUE
 | |
| pid-file	VALUE
 | |
| port	VALUE
 | |
| datadir	VALUE
 | |
| log	VALUE
 | |
| log-error	VALUE
 | |
| log-slow-queries	VALUE
 | |
| language	VALUE
 | |
| character-sets-dir	VALUE
 | |
| basedir	VALUE
 | |
| server_id	VALUE
 | |
| skip-stack-trace	VALUE
 | |
| skip-innodb	VALUE
 | |
| skip-ndbcluster	VALUE
 | |
| nonguarded	VALUE
 | |
| log-output	VALUE
 | |
| START INSTANCE mysqld2;
 | |
| Success: the process has been started.
 | |
| STOP INSTANCE mysqld2;
 | |
| Success: the process has been stopped.
 | |
| SHOW mysqld1 LOG FILES;
 | |
| Logfile	Path	File size
 | |
| ERROR LOG	PATH	FILE_SIZE
 | |
| GENERAL LOG	PATH	FILE_SIZE
 | |
| SLOW LOG	PATH	FILE_SIZE
 | |
| SHOW mysqld2 LOG FILES;
 | |
| Logfile	Path	File size
 | |
| ERROR LOG	PATH	FILE_SIZE
 | |
| GENERAL LOG	PATH	FILE_SIZE
 | |
| SLOW LOG	PATH	FILE_SIZE
 | |
| SHOW mysqld1 LOG ERROR 10;
 | |
| Log
 | |
| LOG_DATA
 | |
| SHOW mysqld1 LOG SLOW 10;
 | |
| Log
 | |
| LOG_DATA
 | |
| SHOW mysqld1 LOG GENERAL 10;
 | |
| Log
 | |
| LOG_DATA
 | |
| SHOW mysqld1 LOG ERROR 10, 2;
 | |
| Log
 | |
| LOG_DATA
 | |
| SHOW mysqld1 LOG SLOW 10, 2;
 | |
| Log
 | |
| LOG_DATA
 | |
| SHOW mysqld1 LOG GENERAL 10, 2;
 | |
| Log
 | |
| LOG_DATA
 | |
| SHOW mysqld2 LOG ERROR 10;
 | |
| Log
 | |
| LOG_DATA
 | |
| SHOW mysqld2 LOG SLOW 10;
 | |
| Log
 | |
| LOG_DATA
 | |
| SHOW mysqld2 LOG GENERAL 10;
 | |
| Log
 | |
| LOG_DATA
 | |
| SHOW mysqld2 LOG ERROR 10, 2;
 | |
| Log
 | |
| LOG_DATA
 | |
| SHOW mysqld2 LOG SLOW 10, 2;
 | |
| Log
 | |
| LOG_DATA
 | |
| SHOW mysqld2 LOG GENERAL 10, 2;
 | |
| Log
 | |
| LOG_DATA
 |