Commit 368a8bb4 authored by gshchepa/uchum@host.loc's avatar gshchepa/uchum@host.loc
Browse files

Merge host.loc:/home/uchum/work/5.0-opt-34223 

into  host.loc:/home/uchum/work/5.0-opt
parents 543140a6 8adc63ad

mysql-test/r/variables.result

+6 −0
Original line number Diff line number Diff line
@@ -838,6 +838,12 @@ SELECT @@log_slow_queries; 
1

SET GLOBAL log_slow_queries=0;

ERROR HY000: Variable 'log_slow_queries' is a read only variable

set @my_innodb_autoextend_increment=@@global.innodb_autoextend_increment;

set global innodb_autoextend_increment=8;

set global innodb_autoextend_increment=@my_innodb_autoextend_increment;

set @my_innodb_commit_concurrency=@@global.innodb_commit_concurrency;

set global innodb_commit_concurrency=0;

set global innodb_commit_concurrency=@my_innodb_commit_concurrency;

End of 5.0 tests

set global binlog_cache_size         =@my_binlog_cache_size;

set global connect_timeout           =@my_connect_timeout;

mysql-test/t/variables.test

+13 −0
Original line number Diff line number Diff line
@@ -696,6 +696,19 @@ SELECT @@log_slow_queries; 
--error 1238

SET GLOBAL log_slow_queries=0;



#

# Bug #34223: Assertion failed: (optp->var_type & 127) == 8,

#             file .\my_getopt.c, line 830

#



set @my_innodb_autoextend_increment=@@global.innodb_autoextend_increment;

set global innodb_autoextend_increment=8;

set global innodb_autoextend_increment=@my_innodb_autoextend_increment;



set @my_innodb_commit_concurrency=@@global.innodb_commit_concurrency;

set global innodb_commit_concurrency=0;

set global innodb_commit_concurrency=@my_innodb_commit_concurrency;



--echo End of 5.0 tests



# This is at the very after the versioned tests, since it involves doing

sql/mysqld.cc

+2 −2
Original line number Diff line number Diff line
@@ -5798,7 +5798,7 @@ log and this option does nothing anymore.", 
   "Data file autoextend increment in megabytes",

   (gptr*) &srv_auto_extend_increment,

   (gptr*) &srv_auto_extend_increment,

   0, GET_LONG, REQUIRED_ARG, 8L, 1L, 1000L, 0, 1L, 0},

   0, GET_ULONG, REQUIRED_ARG, 8L, 1L, 1000L, 0, 1L, 0},

  {"innodb_buffer_pool_awe_mem_mb", OPT_INNODB_BUFFER_POOL_AWE_MEM_MB,

   "If Windows AWE is used, the size of InnoDB buffer pool allocated from the AWE memory.",

   (gptr*) &innobase_buffer_pool_awe_mem_mb, (gptr*) &innobase_buffer_pool_awe_mem_mb, 0,
@@ -5811,7 +5811,7 @@ log and this option does nothing anymore.", 
  {"innodb_commit_concurrency", OPT_INNODB_COMMIT_CONCURRENCY,

   "Helps in performance tuning in heavily concurrent environments.",

   (gptr*) &srv_commit_concurrency, (gptr*) &srv_commit_concurrency,

   0, GET_LONG, REQUIRED_ARG, 0, 0, 1000, 0, 1, 0},

   0, GET_ULONG, REQUIRED_ARG, 0, 0, 1000, 0, 1, 0},

  {"innodb_concurrency_tickets", OPT_INNODB_CONCURRENCY_TICKETS,

   "Number of times a thread is allowed to enter InnoDB within the same \

    SQL query after it has once got the ticket",