Commit graph

60020 commits

Author SHA1 Message Date
Alexander Nozdrin
f37f38006b Auto-merge from mysql-next-mr-serg. 2010-01-04 12:34:59 +03:00
Sergei Golubchik
4949ee3a75 possible fix for sporadic sys_vars.delayed_insert_limit_func failures 2009-12-31 14:05:33 +01:00
Alexey Kopytov
85d5a08b51 Manual merge of WL#4738 from mysql-next-mr:
- backported code that handles %f/%g arguments in 
my_vsnprintf.c from 6.0 
- backported %f/%g tests in unittest/mysys/my_vsnprintf-t.c 
from 6.0 
- replaced snprintf("%g") in sql/set_var.cc with my_gcvt() 
- removed unnecessary "--replace-result"s for Windows in 
mysql-test/suite/sys_vars/t/long_query_time_basic.test 
- some test results adjustments
2009-12-28 15:54:16 +03:00
Sergei Golubchik
31cd0643ae my_once.c: clarify the comment 2009-12-26 21:55:32 +01:00
Sergei Golubchik
825ba2ec8b don't show the value of open_files_limit 2009-12-26 09:35:42 +01:00
Sergei Golubchik
28056ba204 don't show --ssl* option if ssl is not compiled in 2009-12-25 22:36:59 +01:00
Alexander Nozdrin
ece5ad57e9 Auto-merge from mysql-next-mr. 2009-12-25 16:22:25 +03:00
Alexey Kopytov
ca409d5756 Automerge. 2009-12-25 00:09:18 +03:00
Alexey Kopytov
064ebe5769 Addendum to the backport patch for WL#2934:
Unlike other platforms --mfpmath=sse is the default 
gcc mode on Mac OS X Intel. So it is unnecessary
to switch FPU to double precision mode (in fact,
it even breaks some math library functions).
2009-12-25 00:06:53 +03:00
Sergei Golubchik
50f9dc6a1d merged 2009-12-24 21:18:53 +01:00
Sergei Golubchik
b4a39aeb5d slightly more complete mysqld--help test 2009-12-24 12:30:23 +01:00
Alexander Nozdrin
9f335d9e91 Manual merge from mysql-trunk.
Conflicts:
  - storage/myisam/mi_static.c
2009-12-24 10:12:07 +03:00
Alexander Nozdrin
9721437edf Postfix for Bug#37408 (fix for Bug#49898). 2009-12-24 10:10:05 +03:00
Sergei Golubchik
dec9ad1e25 backport typos found 2009-12-23 17:51:03 +01:00
Alexander Nozdrin
88642ae7e6 Merge default.conf from mysql-trunk. 2009-12-23 15:10:25 +03:00
Alexander Nozdrin
97412d1d41 Fix default.conf. 2009-12-23 15:09:31 +03:00
Alexander Nozdrin
919f7968e5 Auto-merge (empty) from mysql-trunk-bugfixing. 2009-12-23 15:06:10 +03:00
Sergei Golubchik
a85539a83a fixed "engine not found" error in open_binary_frm
corrected rotten test
2009-12-23 13:06:03 +01:00
Alexey Kopytov
c15b85f26c Fixed test failures from the 'parts' suite introduced by
backporting WL#2934.
2009-12-23 15:04:32 +03:00
Alexander Nozdrin
84caa9480f 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
0f8ea111b9 Auto-merge from mysql-trunk-bugfixing. 2009-12-23 13:43:52 +03:00
Alexander Nozdrin
1b7ced0008 Auto-merge from mysql-next-mr. 2009-12-23 13:42:03 +03:00
Alexander Nozdrin
29f54b416f Auto-merge from mysql-trunk. 2009-12-23 13:41:55 +03:00
Sergei Golubchik
18d082109c fix atomic/solaris.h to conform
remove duplicated boilerplate code
2009-12-23 09:27:41 +01:00
Alexey Kopytov
79c8b38a2b Fixed more PB2 test failures introduced by backporting WL#2934. 2009-12-23 08:52:18 +03:00
Vladislav Vaintroub
fd14e3dd1e merge 2009-12-22 22:05:04 +01:00
Alexey Kopytov
0372181e3b Fixed more PB2 test failures introduced by backporting WL#2934. 2009-12-22 23:55:56 +03:00
Vladislav Vaintroub
2c4015fba5 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
Alexey Kopytov
ff4eeae1bc Fixed a Windows build failure 2009-12-22 21:10:31 +03:00
Alexey Kopytov
f02525be83 Backport of WL #2934: Make/find library for doing float/double
to string conversions and vice versa" 
Initial import of the dtoa.c code and custom wrappers around it 
to allow its usage from the server code. 
 
Conversion of FLOAT/DOUBLE values to DECIMAL ones or strings 
and vice versa has been significantly reworked. As the new 
algoritms are more precise than the older ones, results of such 
conversions may not always match those obtained from older 
server versions. This in turn may break compatibility for some 
applications. 
 
This patch also fixes the following bugs: 
- bug #12860 "Difference in zero padding of exponent between 
Unix and Windows" 
- bug #21497 "DOUBLE truncated to unusable value" 
- bug #26788 "mysqld (debug) aborts when inserting specific 
numbers into char fields" 
- bug #24541 "Data truncated..." on decimal type columns 
without any good reason"
2009-12-22 19:23:13 +03:00
Vladislav Vaintroub
83f61bb7ea merge 2009-12-22 13:06:31 +01:00
Vladislav Vaintroub
13d5d2f747 Bug#49834 - fixed a bug introduced by mismerge.
restore original innobase version
2009-12-22 12:53:11 +01:00
Sergei Golubchik
d14aefa6c9 32-bit fix 2009-12-22 12:05:51 +01:00
Sergei Golubchik
82adf55efc minimal changes to errmst-utf8.txt (mostly whitespace) to match 6.0-codebase better 2009-12-22 12:02:52 +01:00
Alexander Nozdrin
f058e97ffe Auto-merge from mysql-next-mr. 2009-12-22 13:23:47 +03: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
Alexander Nozdrin
09f8e195f6 Auto-merge (empty) from mysql-trunk-build. 2009-12-22 09:36:04 +03:00
Alexander Nozdrin
6f8073497c Manual merge from mysql-next-mr.
Conflicts:
  - storage/ibmdb2i/ha_ibmdb2i.cc
2009-12-22 09:32:58 +03:00
Alexander Nozdrin
f23b17696c Manual merge from mysql-trunk.
Conflicts:
  - storage/ibmdb2i/ha_ibmdb2i.cc
2009-12-22 09:31:24 +03:00
Alexander Nozdrin
ba28878bac Auto-merge from mysql-next-mr. 2009-12-22 08:29:03 +03:00
Alexander Nozdrin
1741282d22 Null-merge default.conf from mysql-trunk-bugfixing. 2009-12-21 18:41:48 +03:00
Alexander Nozdrin
92b4a908fb Null-merge default.conf from mysql-next-mr. 2009-12-21 18:40:39 +03:00
Alexander Nozdrin
b7ac3c2692 Null-merge default.conf from mysql-trunk. 2009-12-21 18:40:26 +03:00
Alexander Nozdrin
9af3a8bf83 Merge default.conf from mysql-trunk. 2009-12-21 18:36:59 +03:00
Alexander Nozdrin
9ce5872e03 Fix default.conf. 2009-12-21 18:35:38 +03:00
Mikael Ronstrom
1d60eece25 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
a96c22fe8e merge 2009-12-21 11:44:26 +01:00
Mattias Jonsson
4309b20402 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)
2009-12-21 11:38:31 +01:00
Alexander Nozdrin
a67056d183 Auto-merge from mysql-trunk-bugfixing. 2009-12-21 13:23:41 +03:00
Alexander Nozdrin
858cf5555c Disable plugin_load.test due to Bug#42144. 2009-12-21 13:20:43 +03:00