Commit d3a7137a authored by unknown's avatar unknown
Browse files

Merge mysql.com:/mnt/raid/alik/MySQL/devel/5.1-tree 

into  mysql.com:/mnt/raid/alik/MySQL/devel/5.1-rt-bug20294


sql/mysqld.cc:
  Auto merged
mysql-test/t/disabled.def:
  Manually merged.
parents a0e5d9da 0cb8f695

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -462,6 +462,7 @@ libmysqld/event.cc 
libmysqld/event_executor.cc

libmysqld/event_scheduler.cc

libmysqld/event_timed.cc

libmysqld/events.cc

libmysqld/examples/client_test.c

libmysqld/examples/client_test.cc

libmysqld/examples/completion_hash.cc

include/my_time.h

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ enum interval_type 
  INTERVAL_YEAR_MONTH, INTERVAL_DAY_HOUR, INTERVAL_DAY_MINUTE,

  INTERVAL_DAY_SECOND, INTERVAL_HOUR_MINUTE, INTERVAL_HOUR_SECOND,

  INTERVAL_MINUTE_SECOND, INTERVAL_DAY_MICROSECOND, INTERVAL_HOUR_MICROSECOND,

  INTERVAL_MINUTE_MICROSECOND, INTERVAL_SECOND_MICROSECOND

  INTERVAL_MINUTE_MICROSECOND, INTERVAL_SECOND_MICROSECOND, INTERVAL_LAST

};



C_MODE_END

libmysqld/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ ADD_LIBRARY(mysqldemb emb_qcache.cc libmysqld.c lib_sql.cc 
            ../libmysql/libmysql.c ../sql/password.c ../sql-common/client.c

            ../sql-common/my_time.c ../sql-common/my_user.c

            ../sql-common/pack.c ../sql/derror.cc ../sql/event_executor.cc

            ../sql/event_timed.cc ../sql/event.cc ../sql/discover.cc

            ../sql/event_timed.cc ../sql/events.cc ../sql/discover.cc

            ../sql/field_conv.cc ../sql/field.cc ../sql/filesort.cc

            ../sql/gstream.cc ../sql/ha_heap.cc ../sql/ha_myisam.cc

            ../sql/ha_myisammrg.cc ${mysql_se_ha_src}

libmysqld/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ 
	spatial.cc gstream.cc sql_help.cc tztime.cc sql_cursor.cc \

	sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \

	parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \

	event_scheduler.cc event.cc event_timed.cc \

	event_scheduler.cc events.cc event_timed.cc \

	rpl_filter.cc sql_partition.cc sql_builtin.cc sql_plugin.cc \

	sql_tablespace.cc \

	rpl_injector.cc my_user.c partition_info.cc

mysql-test/r/im_instance_conf.result

+56 −27
Original line number Diff line number Diff line
@@ -13,7 +13,9 @@ Variable_name Value 
server_id	1



---> connection: default

CREATE INSTANCE mysqld3;

CREATE INSTANCE mysqld3

server_id = 3,

socket = "$MYSQL_TMP_DIR/mysqld_3.sock";

SHOW INSTANCES;

instance_name	state

mysqld3	offline
@@ -22,6 +24,7 @@ mysqld1 online 
--------------------------------------------------------------------

server_id           = 1

server_id           = 2

server_id=3

--------------------------------------------------------------------

CREATE INSTANCE mysqld1;

ERROR HY000: Instance already exists
@@ -32,7 +35,10 @@ ERROR HY000: Instance already exists 
--------------------------------------------------------------------

nonguarded

--------------------------------------------------------------------

CREATE INSTANCE mysqld4 nonguarded;

CREATE INSTANCE mysqld4

nonguarded,

server_id = 4,

socket = "$MYSQL_TMP_DIR/mysqld_4.sock";

SHOW INSTANCES;

instance_name	state

mysqld3	offline
@@ -46,7 +52,11 @@ nonguarded 
--------------------------------------------------------------------

--------------------------------------------------------------------

--------------------------------------------------------------------

CREATE INSTANCE mysqld5 test-A = 000, test-B = test;

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
@@ -61,7 +71,11 @@ test-B=test 
--------------------------------------------------------------------

--------------------------------------------------------------------

--------------------------------------------------------------------

CREATE INSTANCE mysqld6  test-C1  =  10  ,  test-C2  =  02  ;

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
@@ -116,7 +130,11 @@ mysqld4 offline 
--------------------------------------------------------------------

--------------------------------------------------------------------

--------------------------------------------------------------------

CREATE INSTANCE mysqld9 test-1=" hello world ", test-2='  ';

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
@@ -126,56 +144,67 @@ mysqld6 offline 
mysqld3	offline

mysqld4	offline

mysqld9	offline

CREATE INSTANCE mysqld9a test-3='\b\babc\sdef';

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

mysqld9a	offline

mysqld9	offline

mysqld5	offline

mysqld6	offline

mysqld3	offline

mysqld4	offline

mysqld9	offline

mysqld10	offline

mysqld2	offline

CREATE INSTANCE mysqld9b test-4='abc\tdef', test-5='abc\ndef';

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

mysqld9b	offline

mysqld9a	offline

mysqld1	online

mysqld11	offline

mysqld5	offline

mysqld6	offline

mysqld3	offline

mysqld4	offline

mysqld9	offline

mysqld10	offline

mysqld2	offline

mysqld1	online

CREATE INSTANCE mysqld9c test-6="abc\rdef", test-7="abc\\def";

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

mysqld9b	offline

mysqld6	offline

mysqld1	online

mysqld9	offline

mysqld5	offline

mysqld9c	offline

mysqld6	offline

mysqld3	offline

mysqld4	offline

mysqld9	offline

mysqld10	offline

mysqld2	offline

mysqld1	online

mysqld9a	offline

CREATE INSTANCE mysqld10 test-bad=' \ ';

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

mysqld9b	offline

mysqld6	offline

mysqld1	online

mysqld9	offline

mysqld5	offline

mysqld9c	offline

mysqld6	offline

mysqld3	offline

mysqld4	offline

mysqld9	offline

mysqld10	offline

mysqld2	offline

mysqld1	online

mysqld9a	offline

mysqld12	offline

mysqld11	offline

--------------------------------------------------------------------

test-1= hello world 

--------------------------------------------------------------------