1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-27 01:57:48 +03:00

1537 Commits

Author SHA1 Message Date
Bjorn Munch
7dde8d567c upmerge 50182, 50540 2010-01-25 11:30:31 +01:00
Bjorn Munch
fe2dffeede upmerge 50182, 50540 2010-01-25 11:24:22 +01:00
Bjorn Munch
efd5ecb0e0 Bug #50182 mtr: allow $MTR_PORT_BASE or --port-base= as alternative to MTR_BUILD_THREAD
As suggested, convert internally to value of build_thread
2010-01-25 11:20:52 +01:00
Bernd Ocklin
bcc97357f1 fix LD_LIBRARY_PATH (bug#50540) 2010-01-22 14:12:17 +01:00
Bjorn Munch
da1aab425b merge from next-mr 2010-01-19 13:35:23 +01:00
Vladislav Vaintroub
6e7a75bf5f merge 2010-01-14 16:07:27 +01:00
Marc Alff
67a48e1a4c WL#2360 Performance schema
Part V: performance schema implementation
2010-01-11 18:47:27 -07:00
Bjorn Munch
a7dc95fbd1 backport some changes from WL 4378 2010-01-07 13:19:09 +01:00
Bjorn Munch
be128c547f backport some changes from WL 4378 2010-01-07 13:17:54 +01:00
Bjorn Munch
e9313022c2 merge 48863,49269,49345,49672,49761 2010-01-06 10:01:11 +01:00
Bjorn Munch
afdaf6d9df merge 48863,49269,49345,49672,49761 2010-01-06 09:57:44 +01:00
Bjorn Munch
fcb43b2956 merge 49345 2010-01-06 09:54:43 +01:00
Bjorn Munch
dc3a76b2da merge 49672 2010-01-06 09:52:55 +01:00
Bjorn Munch
1ae30d113d Bug #49345 re-introduce gprof to mysql-test-run.pl
Was available in v1
Porting to v2 required some rewriting
Updated after review comments
2010-01-05 21:35:50 +01:00
Vladislav Vaintroub
2def71f0c1 Fix mysqld--help to ignore optional engines 2010-01-05 13:55:58 +01:00
Bjorn Munch
eec8deed8b Bug #49166 mtr --combination is broken after restrictions of combination names
Combinations beginning with -- not allowed
Allow them...
2010-01-05 13:31:38 +01:00
Bjorn Munch
658d3f5b16 upmerge 49166 2010-01-05 13:15:27 +01:00
Bjorn Munch
1419268c07 upmerge 49166 2010-01-05 13:13:16 +01:00
Bjorn Munch
c7a1f5212c Bug #49166 mtr --combination is broken after restrictions of combination names
Combinations beginning with -- not allowed
Allow them...
2010-01-05 13:05:00 +01:00
Bjorn Munch
a7b2a1ff99 merge from mysql-next-mr 2010-01-04 14:12:30 +01:00
Bjorn Munch
1b6006257c merge from mysql-trunk 2010-01-04 13:50:48 +01:00
Vladislav Vaintroub
e8bdef8fcd merge 2009-12-25 16:49:21 +01:00
Sergei Golubchik
ae2768ce9c WL#4738 streamline/simplify @@variable creation process
Bug#16565 mysqld --help --verbose does not order variablesBug#20413 sql_slave_skip_counter is not shown in show variables
Bug#20415 Output of mysqld --help --verbose is incomplete
Bug#25430 variable not found in SELECT @@global.ft_max_word_len;
Bug#32902 plugin variables don't know their names
Bug#34599 MySQLD Option and Variable Reference need to be consistent in formatting!
Bug#34829 No default value for variable and setting default does not raise error
Bug#34834 ? Is accepted as a valid sql mode
Bug#34878 Few variables have default value according to documentation but error occurs  
Bug#34883 ft_boolean_syntax cant be assigned from user variable to global var.
Bug#37187 `INFORMATION_SCHEMA`.`GLOBAL_VARIABLES`: inconsistent status
Bug#40988 log_output_basic.test succeeded though syntactically false.
Bug#41010 enum-style command-line options are not honoured (maria.maria-recover fails)
Bug#42103 Setting key_buffer_size to a negative value may lead to very large allocations 
Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled
Bug#44797 plugins w/o command-line options have no disabling option in --help
Bug#46314 string system variables don't support expressions
Bug#46470 sys_vars.max_binlog_cache_size_basic_32 is broken
Bug#46586 When using the plugin interface the type "set" for options caused a crash.
Bug#47212 Crash in DBUG_PRINT in mysqltest.cc when trying to print octal number
Bug#48758 mysqltest crashes on sys_vars.collation_server_basic in gcov builds
Bug#49417 some complaints about mysqld --help --verbose output
Bug#49540 DEFAULT value of binlog_format isn't the default value
Bug#49640 ambiguous option '--skip-skip-myisam' (double skip prefix)
Bug#49644 init_connect and \0
Bug#49645 init_slave and multi-byte characters
Bug#49646 mysql --show-warnings crashes when server dies
2009-12-22 10:35:56 +01:00
Bjorn Munch
b40dd1e592 Merge from next-mr 2009-12-16 12:14:14 +01:00
Bjorn Munch
5828a6528b merge from trunk 2009-12-16 10:43:02 +01:00
Alexander Nozdrin
0b1a15e9a7 Backporing patch for Bug#48351 (Inconsistent library names for semisync plugin)
from mysql-next-mr-bugfixing to mysql-trunk-bugfixing.

Original revision:
------------------------------------------------------------
revision-id: zhenxing.he@sun.com-20091127084945-wng7gakygduv3q8k
committer: He Zhenxing <zhenxing.he@sun.com>
branch nick: 5.1-rep-semisync
timestamp: Fri 2009-11-27 16:49:45 +0800
message:
  Bug#48351 Inconsistent library names for semisync plugin
  
  The semisync plugin library names on Unix like systems were prefixed with
  'lib', which did not follow the conventions.
  
  Fix the problem by removing the 'lib' prefix on Unix systems.
------------------------------------------------------------
2009-12-15 23:40:20 +03:00
Alexander Nozdrin
7688c7369c Backporting a patch for Bug#49170 (Inconsistent placement of semisync
plugin prevents it from getting tested) from mysql-next-mr-bugfixing
to mysql-trunk-bugfixing.

Original revision:
------------------------------------------------------------
revision-id: zhenxing.he@sun.com-20091204014339-2m06r42vajhm9vke
committer: He Zhenxing <zhenxing.he@sun.com>
branch nick: 5.1-rep-semisync
timestamp: Fri 2009-12-04 09:43:39 +0800
message:
  Bug#49170 Inconsistent placement of semisync plugin prevents it from getting tested
  
  Add $basedir/lib/plugin to the search paths for semisync plugins.
------------------------------------------------------------
2009-12-15 23:23:01 +03:00
Bjorn Munch
b82642966b Bug #49672 mtr should extract end of result log if mysqltest fails without output
Extracts last 20 lines if no output after failure
2009-12-15 10:12:24 +01:00
Vladislav Vaintroub
91d9e6b670 merge 2009-12-11 21:17:17 +01:00
He Zhenxing
cbafed1cae Auto merge from 5.1-rep-semisync 2009-12-05 10:28:53 +08:00
He Zhenxing
4ea0296e43 Bug#49170 Inconsistent placement of semisync plugin prevents it from getting tested
Add $basedir/lib/plugin to the search paths for semisync plugins.
2009-12-04 09:43:39 +08:00
Vladislav Vaintroub
82b605ea37 merge 2009-12-02 22:16:33 +01:00
Alexander Nozdrin
f26ac4ba7a Manual merge from mysql-next-mr.
Conflicts:
  - sql/sql_yacc.yy
2009-12-02 18:50:14 +03:00
Andrei Elkin
e8e85ed2a6 Manual resolving for the following files
Text conflict in mysql-test/collections/default.experimental
Text conflict in mysql-test/r/show_check.result
Text conflict in mysql-test/r/sp-code.result
Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result
Text conflict in mysql-test/suite/rpl/t/disabled.def
Text conflict in mysql-test/t/show_check.test
Text conflict in mysys/my_delete.c
Text conflict in sql/item.h
Text conflict in sql/item_cmpfunc.h
Text conflict in sql/log.cc
Text conflict in sql/mysqld.cc
Text conflict in sql/repl_failsafe.cc
Text conflict in sql/slave.cc
Text conflict in sql/sql_parse.cc
Text conflict in sql/sql_table.cc
Text conflict in sql/sql_yacc.yy
Text conflict in storage/myisam/ha_myisam.cc

Corrected results for
 stm_auto_increment_bug33029.reject      2009-12-01
		20:01:49.000000000 +0300
       <andrei> @@ -42,9 +42,6 @@
       <andrei>  RETURN i;
       <andrei>  END//
       <andrei>  CALL p1();
       <andrei> -Warnings:
       <andrei> -Note   1592    Statement may not be safe to log in statement
		format.
       <andrei> -Note   1592    Statement may not be safe to log in statement
		format.

There should be indeed no Note present because there is in fact autoincrement 
top-level query in sp() that triggers inserting in yet another auto-inc table.
(todo: alert DaoGang to improve the test).
2009-12-01 21:07:18 +02:00
Vladislav Vaintroub
5dfa313eb7 - Introduce MYSQL_ADD_PLUGIN that replaces MYSQL_STORAGE_ENGINE
- Fix semisync library prefix (remove lib on Unixes)
- restrict exported symbols from zlib and yassl (fvisibility=hidden)
2009-12-01 12:00:50 +01:00
He Zhenxing
9b262a3d9f Merge fix of bug#48351 from 5.1-rep-semisync 2009-11-29 10:10:09 +08:00
He Zhenxing
75b9db91de Bug#48351 Inconsistent library names for semisync plugin
The semisync plugin library names on Unix like systems were prefixed with
'lib', which did not follow the conventions.

Fix the problem by removing the 'lib' prefix on Unix systems.
2009-11-27 16:49:45 +08:00
Bjorn Munch
eb334fd962 merge 48250, 48918, 49096 2009-11-26 12:08:18 +01:00
Bjorn Munch
16c8611bb0 merge 48250, 48918, 49096 2009-11-26 11:36:37 +01:00
Bjorn Munch
15d5390010 Bug #48918 MTR uses an un-initialized value in comparison
mysqld->{proc} not defined for an embedded server
Check only if {proc} defined
2009-11-26 11:34:16 +01:00
Bjorn Munch
4deb53a56d Bug #49096 mtr: --mem option should be ignored on Windows
Ignored w/message in v1 and v2
2009-11-26 11:23:30 +01:00
Vladislav Vaintroub
2f3e777797 add --disable-shared equivalent
fix mtr (empty argument passed to mysqld)
2009-11-25 05:13:51 +01:00
Bjorn Munch
e536016cbe merge 47978,48683 2009-11-24 12:27:19 +01:00
Bjorn Munch
66d661d4dd merge 47978,48683 2009-11-24 12:26:06 +01:00
Bjorn Munch
8e04f4c73c Bug #47978 timer : expired after 90 seconds
Problems occur after killing threads on Windows
Get rid of the timeout threads, implement simple timer in wait_any_timeout()
2009-11-24 09:12:48 +01:00
Bjorn Munch
679f097010 upmerge 35543,48367,48671,48806,48808 2009-11-19 10:25:57 +01:00
Bjorn Munch
0adf3db01f upmerge 35543,48367,48671,48806,48808 2009-11-19 10:24:24 +01:00
Bjorn Munch
db1b1160dd merge 48808 2009-11-19 10:19:18 +01:00
Bjorn Munch
964a6ebaac merge 48806 2009-11-19 10:17:56 +01:00
Bjorn Munch
1cc0f036d6 merge 35543 2009-11-19 10:14:25 +01:00