Vladislav Vaintroub
b518871130
merge
2010-01-11 17:46:16 +01:00
Vladislav Vaintroub
125cd58f2b
Add option for specifying MYSQL build configurations.
...
Add mysql_release.cmake intended for use by the build team (
compile options, build settings to do MySQL releases)
2010-01-11 14:42:07 +01:00
Vladislav Vaintroub
36549c4fa2
Install docs
2010-01-09 01:16:07 +01:00
Vladislav Vaintroub
d882efd1c0
Address Kents comments: copy docs, remove autom4te.cache subdirectory if exists.
2010-01-09 00:38:19 +01:00
vladislav vaintroub
b51195d651
CMake 2.6.2 fix
2010-01-08 11:06:42 +01:00
Vladislav Vaintroub
4da913b50d
Fix error with cmake 2.6
2010-01-08 10:33:28 +01:00
Vladislav Vaintroub
10c0917897
some refactoring around readline/libedit
...
(handle dependent options, allow user with change WITH_READLINE to
WITH_LIBEDIT and other way around after the first compile)
2010-01-08 07:20:43 +01:00
Marc Alff
a4c3bc618b
WL#2360 Performance schema
...
Part IV: sql instrumentation
2010-01-06 22:42:07 -07:00
Marc Alff
b2b055034c
Merge mysql-next-mr (revno 2955) --> mysql-next-mr-marc
2010-01-06 14:26:03 -07:00
Vladislav Vaintroub
87513992ed
merge
2010-01-06 17:59:59 +00:00
Vladislav Vaintroub
6c66620684
Fix version string parsing
2010-01-07 02:58:55 +01:00
Vladislav Vaintroub
fcb597348b
remove table formatting (squeeze many spaces into one)
...
in mysqld--help test.
When mysql is compiled with different options,columns
might have different size (this depends on parameter
names and some parameters might only be available
when some option is switched on)
2010-01-06 17:57:10 +00:00
Vladislav Vaintroub
645628d4f3
Do not use fvisibility flag if GCC does not support it
...
(i.e if gcc version < 4)
2010-01-06 12:31:35 +00:00
Alexander Nozdrin
e698ae0112
Change version tag (to 5.5.99-m3).
2010-01-06 13:02:42 +03:00
Vladislav Vaintroub
756e708fa1
merge
2010-01-05 22:37:10 +01:00
Vladislav Vaintroub
e72db2b4cf
Fix buggy test that fails due to "error: packets out of order" message in the trace file
...
when EXTRA_DEBUG is enabled. The reason for the error message is that a query
was issued with send, but response was not read with reap.
2010-01-05 22:36:08 +01:00
Vladislav Vaintroub
7accdb2af6
fix white space differences in mysqld--help-notwin.result
2010-01-05 16:30:41 +01:00
Vladislav Vaintroub
2def71f0c1
Fix mysqld--help to ignore optional engines
2010-01-05 13:55:58 +01:00
Vladislav Vaintroub
7edec12185
Fix the last merge
2010-01-05 02:26:20 +01:00
Vladislav Vaintroub
00549a37fe
merge
2010-01-04 23:46:42 +01:00
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
Vladislav Vaintroub
e8bdef8fcd
merge
2009-12-25 16:49:21 +01:00
Alexander Nozdrin
ece5ad57e9
Auto-merge from mysql-next-mr.
2009-12-25 16:22:25 +03:00
Vladislav Vaintroub
57e3ba292a
merge
2009-12-25 03:24:00 +01:00
Vladislav Vaintroub
e64ba44004
enable Cygwin build again
2009-12-25 03:22:23 +01: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
Vladislav Vaintroub
221c879bb4
merge
2009-12-24 16:56:52 +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
Vladislav Vaintroub
f8d896fca5
use systemtap on linux if installed, for dtrace functionality
2009-12-24 07:21:05 +01:00
Sergei Golubchik
dec9ad1e25
backport typos found
2009-12-23 17:51:03 +01:00
Vladislav Vaintroub
c716ed9ad8
recompile partition plugin for embedded server, its behavior depends on WITH_EMBEDDED_SERVER preprocessor definition
2009-12-23 16:37:22 +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
Vladislav Vaintroub
e54898c463
merge
2009-12-23 12:47:14 +01:00
Vladislav Vaintroub
49710c1c37
merge
2009-12-23 12:44:40 +01: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
