Alexander Nozdrin
09ff80f2a0
Manual merge from mysql-5.1.
2009-11-05 11:48:06 +03:00
Alexander Nozdrin
85f3e8ce24
Manual merge from mysql-5.1.
2009-11-05 11:40:01 +03:00
Alexander Nozdrin
55a28d6ff4
Fix default.conf.
2009-10-31 11:11:10 +03:00
Alexander Nozdrin
436223fbe3
Make rpl_timezone experimental due to Bug#47017.
2009-10-27 13:05:06 +03:00
Alexander Nozdrin
d0a10357bb
Automerge from mysql-trunk.
2009-10-23 00:24:24 +04:00
Alexander Nozdrin
4b8eb9891c
Fix default.conf.
2009-10-23 00:13:18 +04:00
Alexander Nozdrin
dac879a413
Automerge from mysql-trunk.
2009-10-22 22:05:42 +04:00
Jonathan Perkin
1516f6d34f
Apply missing patch from bug#46834 to mysql-trunk-bugfixing.
2009-10-22 16:48:52 +01:00
Bjorn Munch
8aee8bd2c7
null merge from 5.1
2009-10-22 09:28:39 +02:00
Bjorn Munch
6756d64b81
new merge from trunk
2009-10-22 09:13:44 +02:00
Alexander Nozdrin
8d953ecef1
Pass --vardir to MTR in mysql-trunk.push.
2009-10-22 10:05:53 +04:00
Alexander Nozdrin
c0718f032b
Disable the test in mysql-trunk because of Bug#46931
...
instead of making it experimental.
2009-10-22 10:01:23 +04:00
Alexander Nozdrin
9787943c5e
Mark rpl.rpl_innodb_bug28430 experimental unconditionally.
2009-10-21 00:26:56 +04:00
Satya B
0ddb2ca740
Fix the windows Build failure due to the changes to CMakelists by r2910.
...
Remove the extra line which try to use the name INNOBASE again. The IF ELSE
loop above declares the library name based on the version of mysql
2009-10-20 16:11:50 +05:30
Bjorn Munch
684b1d39ac
merge 48149
2009-10-20 12:05:28 +02:00
Bjorn Munch
e00d636494
merge 48149
2009-10-20 12:04:55 +02:00
Satya B
bca54639b6
Merge a CMakeLists.txt change from Innodb plugin 1.0.5
2009-10-20 15:12:38 +05:30
Alexander Nozdrin
01a9db0621
Automerge from mysql-trunk.
2009-10-19 22:40:08 +04:00
Bjorn Munch
23ef842e03
Bug #48149 MTR should automatically skip SSL tests if SSL not supported
...
Knowledge of no SSL support is not used
Skip tests the same way e.g. innodb tests are
Does not refer to have_ssl_communication.inc,
will add this when merging to 6.0-codebase
2009-10-19 15:51:47 +02:00
Bjorn Munch
a47a167492
merge 48130 and 48133
2009-10-19 15:33:34 +02:00
Alexander Nozdrin
b930b18ec3
Merge from mysql-5.1.
2009-10-19 17:28:31 +04:00
Alexander Nozdrin
4ed388a5b4
Merge from mysql-5.1.
2009-10-19 17:19:37 +04:00
Alexander Nozdrin
f3457a73d6
Merge from mysql-5.1.
2009-10-19 17:17:08 +04:00
Bjorn Munch
3e43817fca
merge 48130 and 48133 from 5.1
2009-10-19 15:12:16 +02:00
Alexander Nozdrin
af9de4ff6b
Null-merge up to revno:3163 from mysql-5.1 (InnoDB changes).
2009-10-19 17:10:22 +04:00
Bjorn Munch
6c68019899
Bug #48133 MTR should not dump entire history of mysqld log when failing to start server
...
Don't print entire log, but use extract_server_log() introduced by 46007
2009-10-18 13:01:46 +02:00
Bjorn Munch
2bbe4cc882
merge from trunk
2009-10-18 09:54:50 +02:00
Bjorn Munch
264c330fd0
Bug #48130 Expected failures should not count towards max-test-fail
...
Test batches may be terminated too early
Avoid counting exp-fail tests
2009-10-17 18:34:56 +02:00
Bjorn Munch
6c9cb9ba22
merge from 5.1 main
2009-10-16 23:25:05 +02:00
Timothy Smith
813d8ff6dc
Merge from mysql-5.4.3-beta-release
2009-10-16 20:19:36 +02:00
Timothy Smith
6d569306b4
Update _libdir/plugin to _libdir/mysql/plugin in a few places
2009-10-16 19:59:23 +02:00
Timothy Smith
e1c54dd9ad
Work around a problem in IBM compiler (on aix / i5os) that doesn't
...
use function prototypes from header in conjunction with K&R-style
function definitions. The symptom is a type mismatch between
int and wchar_t.
2009-10-16 19:53:10 +02:00
Joerg Bruehe
0e11bad589
Merge merge changesets from main 5.1 into 5.1-bugteam.
2009-10-16 18:40:25 +02:00
Joerg Bruehe
34358bec25
Upmerge a merge changeset.
2009-10-16 16:53:04 +02:00
Joerg Bruehe
ee56b111a0
Upmerge merge changesets.
2009-10-16 16:12:42 +02:00
Joerg Bruehe
9cabf98cb0
Merge a compile fix.
2009-10-16 15:35:39 +02:00
Georgi Kodinov
9588bc2207
merge
2009-10-16 16:11:21 +03:00
Joerg Bruehe
5c95f2363a
Upmerge the Windows compile fix from 5.0 to 5.1
2009-10-16 15:05:52 +02:00
Joerg Bruehe
f359b258ee
Merge 5.0-bugteam (compile fix) into main 5.0
2009-10-16 14:29:41 +02:00
Joerg Bruehe
0e5dd3712a
Upmerge a Windows compile fix from 5.0 to 5.1.
2009-10-16 14:21:20 +02:00
Joerg Bruehe
11d4eb352d
Merge the Windows compile fix into the push tree.
2009-10-16 14:09:31 +02:00
Joerg Bruehe
9ceeabd9b2
Compile fix for Windows:
...
Use "#ifdef", not plain "#if".
2009-10-16 14:06:33 +02:00
Satya B
a0e12ec269
Merging Innodb plugin 1.0.5 revisions from 5.1-main from revisions 3149 to 3163
...
also merged missing Innodb plugin revisions r5636,r5635 manually
2009-10-16 17:28:02 +05:30
Martin Hansson
c6a11dff02
Bug#46019: ERROR 1356 When selecting from within another
...
view that has Group By
When SELECT'ing from a view that mentions another,
materialized, view, access was being denied. The issue was
resolved by lifting a special case which avoided such access
checking in check_single_table_access. In the past, this was
necessary since if such a check were performed, the error
message would be downgraded to a warning in the case of SHOW
CREATE VIEW. The downgrading of errors was meant to handle
only that scenario, but could not distinguish the two as it
read only the error messages.
The special case was needed in the fix of bug no 36086.
Before that, views were confused with derived tables.
After bug no 35996 was fixed, the manipulation of errors
during SHOW CREATE VIEW execution is not dependent on the
actual error messages in the queue, it rather looks at the
actual cause of the error and takes appropriate
action. Hence the aforementioned special case is now
superfluous and the bug is fixed.
2009-10-16 13:12:21 +02:00
Georgi Kodinov
8f6f3dba21
Bug #40877 : multi statement execution fails in 5.1.30
...
Implemented the server infrastructure for the fix:
1. Added a function LEX_STRING *thd_query_string(THD) to return
a LEX_STRING structure instead of char *.
This is the function that must be called in innodb instead of
thd_query()
2. Did some encapsulation in THD : aggregated thd_query and
thd_query_length into a LEX_STRING and made accessor and mutator
methods for easy code updating.
3. Updated the server code to use the new methods where applicable.
2009-10-16 13:29:42 +03:00
Joerg Bruehe
9c76415a03
Upmerge a merge changeset - no contents change.
2009-10-16 11:33:39 +02:00
Georgi Kodinov
757e641dea
merge
2009-10-16 12:07:50 +03:00
Bjorn Munch
b21c62bedd
merge 46007 from 5.1
2009-10-16 11:02:37 +02:00
Georgi Kodinov
6b81bff83c
Revert the fix for bug #47123 until test suite failures are resolved.
2009-10-16 11:42:16 +03:00
Joerg Bruehe
d12bd3f794
Merge the bug fixes into the push tree.
2009-10-15 20:28:04 +02:00
