Commit graph

60009 commits

Author SHA1 Message Date
Sergei Golubchik
e7441f0b60 my_once.c: clarify the comment 2009-12-26 21:55:32 +01:00
Sergei Golubchik
9c22d1ecfa don't show the value of open_files_limit 2009-12-26 09:35:42 +01:00
Sergei Golubchik
bd05ac9a6b don't show --ssl* option if ssl is not compiled in 2009-12-25 22:36:59 +01:00
Sergei Golubchik
56deea0dd7 merged 2009-12-24 21:18:53 +01:00
Sergei Golubchik
025d86a60a slightly more complete mysqld--help test 2009-12-24 12:30:23 +01:00
Alexander Nozdrin
10eab6ccb0 Manual merge from mysql-trunk.
Conflicts:
  - storage/myisam/mi_static.c
2009-12-24 10:12:07 +03:00
Alexander Nozdrin
0b74a91126 Postfix for Bug#37408 (fix for Bug#49898). 2009-12-24 10:10:05 +03:00
Sergei Golubchik
5b9ed28575 backport typos found 2009-12-23 17:51:03 +01:00
Alexander Nozdrin
4a489a2592 Merge default.conf from mysql-trunk. 2009-12-23 15:10:25 +03:00
Alexander Nozdrin
5be5b55ff4 Fix default.conf. 2009-12-23 15:09:31 +03:00
Alexander Nozdrin
d6cc32a047 Auto-merge (empty) from mysql-trunk-bugfixing. 2009-12-23 15:06:10 +03:00
Sergei Golubchik
b188b1bfcc fixed "engine not found" error in open_binary_frm
corrected rotten test
2009-12-23 13:06:03 +01:00
Alexander Nozdrin
ba60b39ca3 Backporting fix for Bug#49834 from mysql-next-mr-bugfixing
into mysql-trunk-bugfixing.

Original revision:
------------------------------------------------------------
revision-id: vvaintroub@mysql.com-20091222115311-bam0xorumd8gvjyo
parent: mattias.jonsson@sun.com-20091221104426-x2e6c93x8iik4fo0
committer: Vladislav Vaintroub <vvaintroub@mysql.com>
branch nick: mysql-next-mr-bugfixing
timestamp: Tue 2009-12-22 12:53:11 +0100
message:
  Bug#49834 - fixed a bug introduced by mismerge.
  restore original innobase version
------------------------------------------------------------
2009-12-23 15:03:51 +03:00
Alexander Nozdrin
cb8b607187 Auto-merge from mysql-trunk-bugfixing. 2009-12-23 13:43:52 +03:00
Alexander Nozdrin
8cdcb078d3 Auto-merge from mysql-next-mr. 2009-12-23 13:42:03 +03:00
Alexander Nozdrin
a987a27dc7 Auto-merge from mysql-trunk. 2009-12-23 13:41:55 +03:00
Sergei Golubchik
3bfb8797d0 fix atomic/solaris.h to conform
remove duplicated boilerplate code
2009-12-23 09:27:41 +01:00
Vladislav Vaintroub
f415cd2911 merge 2009-12-22 22:05:04 +01:00
Vladislav Vaintroub
dcdaa8f4fc Fix build error with CMake 2.8 (mysql_stmt_next_result not exported
by shared embedded library)
2009-12-22 21:49:37 +01:00
Vladislav Vaintroub
7c8220a136 merge 2009-12-22 13:06:31 +01:00
Vladislav Vaintroub
0d0ff32c6e Bug#49834 - fixed a bug introduced by mismerge.
restore original innobase version
2009-12-22 12:53:11 +01:00
Sergei Golubchik
274e1e4497 32-bit fix 2009-12-22 12:05:51 +01:00
Sergei Golubchik
bb865442a4 minimal changes to errmst-utf8.txt (mostly whitespace) to match 6.0-codebase better 2009-12-22 12:02:52 +01:00
Alexander Nozdrin
eeb39410f4 Auto-merge from mysql-next-mr. 2009-12-22 13:23:47 +03:00
Sergei Golubchik
1ad5bb1a69 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


CMakeLists.txt:
  Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled
client/mysql.cc:
  don't crash with --show-warnings when mysqld dies
config/ac-macros/plugins.m4:
  Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled
include/my_getopt.h:
  comments
include/my_pthread.h:
  fix double #define
mysql-test/mysql-test-run.pl:
  run sys_vars suite by default
  properly recognize envirinment variables (e.g. MTR_MAX_SAVE_CORE) set to 0
  escape gdb command line arguments
mysql-test/suite/sys_vars/r/rpl_init_slave_func.result:
  init_slave+utf8 bug
mysql-test/suite/sys_vars/t/rpl_init_slave_func.test:
  init_slave+utf8 bug
mysys/my_getopt.c:
  Bug#34599 MySQLD Option and Variable Reference need to be consistent in formatting!
  Bug#46586 When using the plugin interface the type "set" for options caused a crash.
  Bug#49640 ambiguous option '--skip-skip-myisam' (double skip prefix)
mysys/typelib.c:
  support for flagset
sql/ha_ndbcluster.cc:
  backport from telco tree
sql/item_func.cc:
  Bug#49644 init_connect and \0
  Bug#49645 init_slave and multi-byte characters
sql/sql_builtin.cc.in:
  Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled
sql/sql_plugin.cc:
  Bug#44691 Some plugins configured as MYSQL_PLUGIN_MANDATORY in can be disabled
  Bug#32902 plugin variables don't know their names
  Bug#44797 plugins w/o command-line options have no disabling option in --help
sql/sys_vars.cc:
  all server variables are defined here
storage/myisam/ft_parser.c:
  remove unnecessary updates of param->quot
storage/myisam/ha_myisam.cc:
  myisam_* variables belong here
strings/my_vsnprintf.c:
  %o and %llx
unittest/mysys/my_vsnprintf-t.c:
  %o and %llx tests
vio/viosocket.c:
  bugfix: fix @@wait_timeout to work with socket timeouts (vs. alarm thread)
2009-12-22 10:35:56 +01:00
Alexander Nozdrin
809d309968 Auto-merge (empty) from mysql-trunk-build. 2009-12-22 09:36:04 +03:00
Alexander Nozdrin
8ed868fa1e Manual merge from mysql-next-mr.
Conflicts:
  - storage/ibmdb2i/ha_ibmdb2i.cc
2009-12-22 09:32:58 +03:00
Alexander Nozdrin
f238adf75d Manual merge from mysql-trunk.
Conflicts:
  - storage/ibmdb2i/ha_ibmdb2i.cc
2009-12-22 09:31:24 +03:00
Alexander Nozdrin
6cd0792808 Auto-merge from mysql-next-mr. 2009-12-22 08:29:03 +03:00
Alexander Nozdrin
b4565c3cf6 Null-merge default.conf from mysql-trunk-bugfixing. 2009-12-21 18:41:48 +03:00
Alexander Nozdrin
918d3d4cc7 Null-merge default.conf from mysql-next-mr. 2009-12-21 18:40:39 +03:00
Alexander Nozdrin
1f0ef431d1 Null-merge default.conf from mysql-trunk. 2009-12-21 18:40:26 +03:00
Alexander Nozdrin
9e4f62f967 Merge default.conf from mysql-trunk. 2009-12-21 18:36:59 +03:00
Alexander Nozdrin
23e70189ab Fix default.conf. 2009-12-21 18:35:38 +03:00
Mikael Ronstrom
ec93c3ed23 Force use of c-register in CAS instruction on x86-32 bit architecture, b-register used for push and pop, so don't want to give compile the chance to choose the wrong register 2009-12-21 14:08:11 +01:00
Mattias Jonsson
abb773b50f merge 2009-12-21 11:44:26 +01:00
Mattias Jonsson
287dfc1469 Bug#48737: Partitions: search fails with ucs2
Recommit of patch:
http://lists.mysql.com/commits/91400

Test case only (code part was pushes as bug-49028)

mysql-test/r/partition_column.result:
  Bug#48737: Partitions: search fails with ucs2
  
  added test case
mysql-test/t/partition_column.test:
  Bug#48737: Partitions: search fails with ucs2
  
  Added result
2009-12-21 11:38:31 +01:00
Alexander Nozdrin
a13f2adddc Auto-merge from mysql-trunk-bugfixing. 2009-12-21 13:23:41 +03:00
Alexander Nozdrin
c736665e43 Disable plugin_load.test due to Bug#42144. 2009-12-21 13:20:43 +03:00
Vladislav Vaintroub
22c6534698 Fix inconsistently defined THR_LOCK_myisam_mmap
It was pthread_mutex_t in mi_static.c and 
mysql_mutex_t in my_thr_init.c

Solaris linker complains about different size of the 
symbol.

Fix : use mysql_mutex_t everywhere.
2009-12-20 21:20:11 +00:00
Alexander Nozdrin
2c145a94ff Auto-merge from mysql-next-mr. 2009-12-20 12:48:09 +03:00
Alexander Nozdrin
a5a2835c06 Auto-merge (empty) from mysql-trunk-bugfixing. 2009-12-20 12:43:07 +03:00
Mikael Ronstrom
d4f23f0cf6 Yet one more fix for Solaris atomics in builds 2009-12-19 18:24:52 +01:00
Mikael Ronstrom
d60b5fa260 Fixed Solaris build issues 2009-12-19 17:44:45 +01:00
Mikael Ronstrom
6bcd9edc8a Post-merge fix: wait for statement result before disconnecting. Otherwise the statement might affect unrelated tests. mysql-test/t/lock_multi.test, Reap statement status 2009-12-19 13:26:00 +01:00
Mikael Ronstrom
2126212df1 Merged in latest mysql-next-mr 2009-12-19 12:50:48 +01:00
Mikael Ronstrom
a99300e264 Fixed solaris builds 2009-12-19 12:48:39 +01:00
Alexander Nozdrin
3360882025 Auto-merge (empty) from mysql-trunk-bugfixing. 2009-12-19 11:38:14 +03:00
Alexander Nozdrin
a5cdaab3eb Auto-merge from mysql-next-mr. 2009-12-19 11:35:19 +03:00
Alexander Nozdrin
6ee1776ccf Auto-merge from mysql-trunk. 2009-12-19 11:33:33 +03:00