Commit be0f204c authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-4.1 

into mysql.com:/home/jonas/src/mysql-4.1-ndb
parents 86ab1dd2 40b622f2

mysql-test/r/rpl_user_variables.result

+17 −17
Original line number Diff line number Diff line
@@ -78,32 +78,32 @@ NULL 
NULL

show binlog events from 141;

Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info

slave-bin.000001	141	User var	2	141	@i1=12345678901234

slave-bin.000001	184	User var	2	184	@i2=-12345678901234

slave-bin.000001	227	User var	2	227	@i3=0

slave-bin.000001	270	User var	2	270	@i4=-1

slave-bin.000001	141	User var	2	141	@`i1`=12345678901234

slave-bin.000001	184	User var	2	184	@`i2`=-12345678901234

slave-bin.000001	227	User var	2	227	@`i3`=0

slave-bin.000001	270	User var	2	270	@`i4`=-1

slave-bin.000001	313	Query	1	313	use `test`; insert into t1 values (@i1), (@i2), (@i3), (@i4)

slave-bin.000001	396	User var	2	396	@r1=12.5

slave-bin.000001	439	User var	2	439	@r2=-12.5

slave-bin.000001	396	User var	2	396	@`r1`=12.5

slave-bin.000001	439	User var	2	439	@`r2`=-12.5

slave-bin.000001	482	Query	1	482	use `test`; insert into t1 values (@r1), (@r2)

slave-bin.000001	551	User var	2	551	@s1=_latin1'This is a test' COLLATE latin1_swedish_ci

slave-bin.000001	600	User var	2	600	@s2=_latin1'' COLLATE latin1_swedish_ci

slave-bin.000001	635	User var	2	635	@s3=_latin1'abc'def' COLLATE latin1_swedish_ci

slave-bin.000001	677	User var	2	677	@s4=_latin1'abc\def' COLLATE latin1_swedish_ci

slave-bin.000001	719	User var	2	719	@s5=_latin1'abc'def' COLLATE latin1_swedish_ci

slave-bin.000001	551	User var	2	551	@`s1`=_latin1'This is a test' COLLATE latin1_swedish_ci

slave-bin.000001	600	User var	2	600	@`s2`=_latin1'' COLLATE latin1_swedish_ci

slave-bin.000001	635	User var	2	635	@`s3`=_latin1'abc\'def' COLLATE latin1_swedish_ci

slave-bin.000001	677	User var	2	677	@`s4`=_latin1'abc\\def' COLLATE latin1_swedish_ci

slave-bin.000001	719	User var	2	719	@`s5`=_latin1'abc\'def' COLLATE latin1_swedish_ci

slave-bin.000001	761	Query	1	761	use `test`; insert into t1 values (@s1), (@s2), (@s3), (@s4), (@s5)

slave-bin.000001	851	User var	2	851	@n1=NULL

slave-bin.000001	851	User var	2	851	@`n1`=NULL

slave-bin.000001	877	Query	1	877	use `test`; insert into t1 values (@n1)

slave-bin.000001	939	User var	2	939	@n2=NULL

slave-bin.000001	939	User var	2	939	@`n2`=NULL

slave-bin.000001	965	Query	1	965	use `test`; insert into t1 values (@n2)

slave-bin.000001	1027	Query	1	1027	use `test`; insert into t1 values (@a:=0), (@a:=@a+1), (@a:=@a+1)

slave-bin.000001	1115	User var	2	1115	@a=2

slave-bin.000001	1115	User var	2	1115	@`a`=2

slave-bin.000001	1157	Query	1	1157	use `test`; insert into t1 values (@a+(@b:=@a+1))

slave-bin.000001	1229	User var	2	1229	@q=_latin1'abc' COLLATE latin1_swedish_ci

slave-bin.000001	1229	User var	2	1229	@`q`=_latin1'abc' COLLATE latin1_swedish_ci

slave-bin.000001	1266	Query	1	1266	use `test`; insert t1 values (@q), (@q:=concat(@q, 'n1')), (@q:=concat(@q, 'n2'))

slave-bin.000001	1370	User var	2	1370	@a=5

slave-bin.000001	1370	User var	2	1370	@`a`=5

slave-bin.000001	1412	Query	1	1412	use `test`; insert into t1 values (@a),(@a)

slave-bin.000001	1478	User var	2	1478	@a=NULL

slave-bin.000001	1478	User var	2	1478	@`a`=NULL

slave-bin.000001	1503	Query	1	1503	use `test`; insert into t1 values (@a),(@a),(@a*5)

drop table t1;

stop slave;

ndb/src/common/mgmcommon/ConfigInfo.cpp

+6 −2
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    ConfigInfo::INT64,

    3000 * 8192,

    128 * 8192,

    192000 * 8192 },

    ((Uint64)192000) * ((Uint64)8192) },



  {

    KEY_INTERNAL,
@@ -638,7 +638,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    ConfigInfo::INT64,

    10000 * 8192,

    128 * 8192,

    400000 * 8192 },

    ((Uint64)400000) * ((Uint64)8192) },



  {

    KEY_INTERNAL,
@@ -2446,6 +2446,8 @@ void ConfigInfo::print(const Properties * section, 
    }

    ndbout << endl;

    break;

  case ConfigInfo::SECTION:

    break;

  }

}
@@ -2643,6 +2645,8 @@ applyDefaultValues(InitConfigFileParser::Context & ctx, 
	  ctx.m_currentSection->put(name, val);

	  break;

	}

	case ConfigInfo::SECTION:

	  break;

	}

      }

    }

ndb/src/common/mgmcommon/InitConfigFileParser.cpp

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ InitConfigFileParser::storeNameValuePair(Context& ctx, 
    }

    if (!m_info->verify(ctx.m_currentInfo, fname, value_int)) {

      ctx.reportError("Illegal value %s for parameter %s.\n"

		      "Legal values are between %d and %d", value, fname,

		      "Legal values are between %Lu and %Lu", value, fname,

		      m_info->getMin(ctx.m_currentInfo, fname), 

		      m_info->getMax(ctx.m_currentInfo, fname));

      return false;