← Back to team overview

maria-developers team mailing list archive

Re: bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2698)

 

Hi!

knielsen@xxxxxxxxxxxxxxx пишет:
> #At lp:maria
> 
>  2698 knielsen@xxxxxxxxxxxxxxx	2009-04-27
>       Misc. small fixes:
>        - Fixes for pool-of-threads patch.
>        - Fixes for push of PBXT storage engine.
>        - mysql-test-run.pl fix.
>       modified:
>         BUILD/compile-dist
>         mysql-test/Makefile.am
>         mysql-test/lib/mtr_unique.pm
>         mysql-test/t/pool_of_threads.cnf
>         sql/set_var.cc
> 
> per-file messages:
>   BUILD/compile-dist
>     Fix that PBXT was missing in source tarball after `BUILD/compile-dist && make dist`
>   mysql-test/Makefile.am
>     Fix that PBXT test suite was missing from `make dist` source tarball.
>   mysql-test/lib/mtr_unique.pm
>     Better fix to avoid races when chmod'ing the semaphore file.
>     (Though using chmod 666 shared files in /tmp/ is still not a very good solution).
>   mysql-test/t/pool_of_threads.cnf
>     Fix that test case pool_of_threads fails if run on mysqld with no --with-libevent support.
>   sql/set_var.cc
>     Fix missing static declaration on pool_of_threads.

OK to push after fixing one code-style related thing:


> === modified file 'sql/set_var.cc'
> --- a/sql/set_var.cc	2009-04-08 16:55:26 +0000
> +++ b/sql/set_var.cc	2009-04-27 13:17:47 +0000
> @@ -642,7 +642,7 @@ static sys_var_long_ptr	sys_table_lock_w
>  static sys_var_long_ptr	sys_thread_cache_size(&vars, "thread_cache_size",
>  					      &thread_cache_size);
>  #if HAVE_POOL_OF_THREADS == 1
> -sys_var_long_ptr	sys_thread_pool_size(&vars, "thread_pool_size",
> +static sys_var_long_ptr	sys_thread_pool_size(&vars, "thread_pool_size",
>  					      &thread_pool_size);

You have to add spaces to the line above to get it correctly aligned
according to the first line of the function declared.

[skip]



References