mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +01:00
788ad30f08
Added missing DBUG_RETURN statements (in mysqldump.c) Added missing enums Fixed a lot of wrong DBUG_PRINT() statements, some of which could cause crashes Removed usage of %lld and %p in printf strings as these are not portable or produces different results on different systems. client/mysqldump.c: Fixed some compiler warnings Added some missing DBUG_RETURN Remove copying of 'cluster' database client/mysqlslap.c: Fixed compiler warnings client/mysqltest.c: After merge fix extra/yassl/taocrypt/include/algebra.hpp: Removed compiler warning mysql-test/include/im_check_env.inc: Fixed race condition (mysqld1 could report 'starting' or 'online' mysql-test/mysql-test-run.pl: After merge fixes Added missing directory to LD_LIBRARY_PATH mysql-test/r/ctype_cp1250_ch.result: After merge fix mysql-test/r/im_cmd_line.result: Fixed race condition mysql-test/r/im_daemon_life_cycle.result: Fixed race condition mysql-test/r/im_instance_conf.result: Fixed race condition mysql-test/r/im_life_cycle.result: Fixed race condition mysql-test/r/im_utils.result: Fixed race condition mysql-test/r/log_tables.result: Fixed wrong result mysql-test/t/disabled.def: Disabled ndb_restore_partion, as ndb_restore_compate caused it to fail, becasue of table 'cluster/def/schema' which is stored in ndb_backup50 mysys/my_compress.c: Removed compiler warnings mysys/my_getopt.c: Ensure we always have at least one space between option name and value plugin/fulltext/plugin_example.c: Removed compiler warnings server-tools/instance-manager/mysql_connection.cc: After merge fix sql/event_data_objects.cc: Fixed compiler warnings Fixed platform compatibility issues (%lld is not portable) sql/event_data_objects.h: Fixed compiler warnings sql/event_db_repository.cc: Fixed compiler warnings sql/event_queue.cc: Fixed compiler warnings sql/event_scheduler.cc: Fixed compiler warnings sql/events.cc: Fixed compiler warnings sql/field.cc: Fixed compiler warnings sql/ha_ndbcluster.cc: Fixed compiler warnings sql/ha_ndbcluster_binlog.cc: Fixed compiler warnings sql/ha_partition.cc: Fixed compiler warnings sql/handler.cc: Fixed compiler warnings sql/item_cmpfunc.cc: Fixed DBUG_PRINT style sql/item_func.cc: Fixed compiler warnings sql/log.cc: Fixed compiler warnings sql/log_event.cc: Fixed compiler warnings sql/mysqld.cc: Fixed compiler warnings sql/opt_range.cc: Fixed compiler warnings sql/repl_failsafe.cc: Indentation fixes sql/rpl_rli.cc: Fixed compiler warnings sql/rpl_tblmap.cc: Fixed compiler warnings sql/set_var.cc: Fixed compiler warnings sql/slave.cc: Fixed compiler warnings sql/sp_head.cc: Fixed compiler warnings sql/sql_base.cc: Fixed compiler warnings Fixed indentation sql/sql_binlog.cc: Fixed compiler warnings sql/sql_cache.cc: Fixed compiler warnings sql/sql_class.cc: Fixed compiler warnings sql/sql_handler.cc: Fixed compiler warnings sql/sql_lex.cc: Fixed compiler warnings sql/sql_parse.cc: Fixed compiler warnings sql/sql_partition.cc: Fixed compiler warnings sql/sql_prepare.cc: Fixed compiler warnings sql/sql_table.cc: Fixed compiler warnings sql/sql_test.cc: Fixed DBUG_PRINT style sql/sql_trigger.cc: Fixed DBUG_PRINT style sql/table.cc: Fixed compiler warnings storage/federated/ha_federated.cc: Fixed compiler warnings storage/myisam/mi_rsamepos.c: Fixed compiler warnings storage/ndb/include/ndb_global.h.in: After merge fix storage/ndb/include/util/NdbOut.hpp: Inform gcc that ndbout_c takes a printf() string as argument storage/ndb/include/util/SimpleProperties.hpp: After merge fixes storage/ndb/src/kernel/blocks/backup/Backup.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Fixed compiler warnings Fixed usage of uninitialized value (Got help from Jonas with patch) storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/lgman.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/pgman.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/restore.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/suma/Suma.cpp: Fixed compiler warnings Added missing enum's to switch storage/ndb/src/kernel/vm/Configuration.cpp: Fixed compiler warnings storage/ndb/src/kernel/vm/DLHashTable.hpp: Fixed compiler warnings storage/ndb/src/kernel/vm/RWPool.hpp: Fixed compiler warnings storage/ndb/src/kernel/vm/SimulatedBlock.cpp: Fixed compiler warnings storage/ndb/src/kernel/vm/WOPool.hpp: Fixed compiler warnings storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp: Fixed compiler warnings storage/ndb/src/mgmclient/CommandInterpreter.cpp: Fixed compiler warnings storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/DictCache.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbIndexOperation.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbIndexStat.cpp: Initialize possible uninitialized variable storage/ndb/src/ndbapi/NdbOperationInt.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbRecAttr.cpp: Added missing enum's (To avoid compiler warnings) storage/ndb/src/ndbapi/NdbScanOperation.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/ObjectMap.hpp: Fixed compiler warnings storage/ndb/tools/desc.cpp: Fixed compiler warnings storage/ndb/tools/restore/Restore.cpp: Fixed compiler warnings storage/ndb/tools/restore/consumer_restore.cpp: Fixed compiler warnings unittest/mytap/t/basic-t.c: Fixed compiler warnings unittest/mytap/tap.c: Fixed compiler warnings
225 lines
6.8 KiB
Text
225 lines
6.8 KiB
Text
SHOW VARIABLES LIKE 'server_id';
|
|
Variable_name Value
|
|
server_id 1
|
|
SHOW INSTANCES;
|
|
instance_name state
|
|
mysqld1 XXXXX
|
|
mysqld2 offline
|
|
--------------------------------------------------------------------
|
|
server_id = 1
|
|
server_id = 2
|
|
--------------------------------------------------------------------
|
|
CREATE INSTANCE mysqld3
|
|
server_id = 3,
|
|
socket = "$MYSQL_TMP_DIR/mysqld_3.sock";
|
|
SHOW INSTANCES;
|
|
instance_name state
|
|
mysqld3 offline
|
|
mysqld2 offline
|
|
mysqld1 online
|
|
--------------------------------------------------------------------
|
|
server_id = 1
|
|
server_id = 2
|
|
server_id=3
|
|
--------------------------------------------------------------------
|
|
CREATE INSTANCE mysqld1;
|
|
ERROR HY000: Instance already exists
|
|
CREATE INSTANCE mysqld2;
|
|
ERROR HY000: Instance already exists
|
|
CREATE INSTANCE mysqld3;
|
|
ERROR HY000: Instance already exists
|
|
--------------------------------------------------------------------
|
|
nonguarded
|
|
--------------------------------------------------------------------
|
|
CREATE INSTANCE mysqld4
|
|
nonguarded,
|
|
server_id = 4,
|
|
socket = "$MYSQL_TMP_DIR/mysqld_4.sock";
|
|
SHOW INSTANCES;
|
|
instance_name state
|
|
mysqld3 offline
|
|
mysqld4 offline
|
|
mysqld1 online
|
|
mysqld2 offline
|
|
--------------------------------------------------------------------
|
|
nonguarded
|
|
nonguarded
|
|
--------------------------------------------------------------------
|
|
--------------------------------------------------------------------
|
|
--------------------------------------------------------------------
|
|
--------------------------------------------------------------------
|
|
CREATE INSTANCE mysqld5
|
|
test-A = 000,
|
|
test-B = test,
|
|
server_id = 5,
|
|
socket = "$MYSQL_TMP_DIR/mysqld_5.sock";
|
|
SHOW INSTANCES;
|
|
instance_name state
|
|
mysqld1 online
|
|
mysqld4 offline
|
|
mysqld5 offline
|
|
mysqld2 offline
|
|
mysqld3 offline
|
|
--------------------------------------------------------------------
|
|
test-A=000
|
|
--------------------------------------------------------------------
|
|
test-B=test
|
|
--------------------------------------------------------------------
|
|
--------------------------------------------------------------------
|
|
--------------------------------------------------------------------
|
|
--------------------------------------------------------------------
|
|
CREATE INSTANCE mysqld6
|
|
test-C1 = 10 ,
|
|
test-C2 = 02 ,
|
|
server_id = 6,
|
|
socket = "$MYSQL_TMP_DIR/mysqld_6.sock";
|
|
SHOW INSTANCES;
|
|
instance_name state
|
|
mysqld1 online
|
|
mysqld2 offline
|
|
mysqld5 offline
|
|
mysqld6 offline
|
|
mysqld3 offline
|
|
mysqld4 offline
|
|
--------------------------------------------------------------------
|
|
test-C1=10
|
|
--------------------------------------------------------------------
|
|
test-C2=02
|
|
--------------------------------------------------------------------
|
|
--------------------------------------------------------------------
|
|
--------------------------------------------------------------------
|
|
--------------------------------------------------------------------
|
|
CREATE INSTANCE mysqld7 test-D = test-D-value ;
|
|
ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use
|
|
SHOW INSTANCES;
|
|
instance_name state
|
|
mysqld1 online
|
|
mysqld2 offline
|
|
mysqld5 offline
|
|
mysqld6 offline
|
|
mysqld3 offline
|
|
mysqld4 offline
|
|
CREATE INSTANCE mysqld8 test-E 0 ;
|
|
ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use
|
|
SHOW INSTANCES;
|
|
instance_name state
|
|
mysqld1 online
|
|
mysqld2 offline
|
|
mysqld5 offline
|
|
mysqld6 offline
|
|
mysqld3 offline
|
|
mysqld4 offline
|
|
CREATE INSTANCE mysqld8 test-F = ;
|
|
ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use
|
|
SHOW INSTANCES;
|
|
instance_name state
|
|
mysqld1 online
|
|
mysqld2 offline
|
|
mysqld5 offline
|
|
mysqld6 offline
|
|
mysqld3 offline
|
|
mysqld4 offline
|
|
--------------------------------------------------------------------
|
|
--------------------------------------------------------------------
|
|
--------------------------------------------------------------------
|
|
--------------------------------------------------------------------
|
|
--------------------------------------------------------------------
|
|
--------------------------------------------------------------------
|
|
--------------------------------------------------------------------
|
|
--------------------------------------------------------------------
|
|
--------------------------------------------------------------------
|
|
--------------------------------------------------------------------
|
|
--------------------------------------------------------------------
|
|
CREATE INSTANCE mysqld9
|
|
test-1=" hello world ",
|
|
test-2=' ',
|
|
server_id = 9,
|
|
socket = "$MYSQL_TMP_DIR/mysqld_9.sock";
|
|
SHOW INSTANCES;
|
|
instance_name state
|
|
mysqld1 online
|
|
mysqld2 offline
|
|
mysqld5 offline
|
|
mysqld6 offline
|
|
mysqld3 offline
|
|
mysqld4 offline
|
|
mysqld9 offline
|
|
CREATE INSTANCE mysqld10
|
|
test-3='\b\babc\sdef',
|
|
server_id = 10,
|
|
socket = "$MYSQL_TMP_DIR/mysqld_10.sock";
|
|
SHOW INSTANCES;
|
|
instance_name state
|
|
mysqld1 online
|
|
mysqld9 offline
|
|
mysqld5 offline
|
|
mysqld6 offline
|
|
mysqld3 offline
|
|
mysqld4 offline
|
|
mysqld10 offline
|
|
mysqld2 offline
|
|
CREATE INSTANCE mysqld11
|
|
test-4='abc\tdef',
|
|
test-5='abc\ndef',
|
|
server_id = 11,
|
|
socket = "$MYSQL_TMP_DIR/mysqld_11.sock";
|
|
SHOW INSTANCES;
|
|
instance_name state
|
|
mysqld1 online
|
|
mysqld11 offline
|
|
mysqld5 offline
|
|
mysqld6 offline
|
|
mysqld3 offline
|
|
mysqld4 offline
|
|
mysqld10 offline
|
|
mysqld2 offline
|
|
mysqld9 offline
|
|
CREATE INSTANCE mysqld12
|
|
test-6="abc\rdef",
|
|
test-7="abc\\def",
|
|
server_id = 12,
|
|
socket = "$MYSQL_TMP_DIR/mysqld_12.sock";
|
|
SHOW INSTANCES;
|
|
instance_name state
|
|
mysqld1 online
|
|
mysqld9 offline
|
|
mysqld5 offline
|
|
mysqld6 offline
|
|
mysqld3 offline
|
|
mysqld4 offline
|
|
mysqld10 offline
|
|
mysqld2 offline
|
|
mysqld12 offline
|
|
mysqld11 offline
|
|
CREATE INSTANCE mysqld13 test-bad=' \ ';
|
|
ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use
|
|
SHOW INSTANCES;
|
|
instance_name state
|
|
mysqld1 online
|
|
mysqld9 offline
|
|
mysqld5 offline
|
|
mysqld6 offline
|
|
mysqld3 offline
|
|
mysqld4 offline
|
|
mysqld10 offline
|
|
mysqld2 offline
|
|
mysqld12 offline
|
|
mysqld11 offline
|
|
--------------------------------------------------------------------
|
|
test-1= hello world
|
|
--------------------------------------------------------------------
|
|
test-2=
|
|
--------------------------------------------------------------------
|
|
test-3=abc def
|
|
--------------------------------------------------------------------
|
|
test-4=abc def
|
|
--------------------------------------------------------------------
|
|
test-5=abc
|
|
--------------------------------------------------------------------
|
|
test-6=abc
|
|
def
|
|
--------------------------------------------------------------------
|
|
test-7=abc\def
|
|
--------------------------------------------------------------------
|
|
--------------------------------------------------------------------
|
|
CREATE INSTANCE qqq1;
|
|
ERROR HY000: Malformed instance name.
|