1
0
mirror of https://github.com/MariaDB/server.git synced 2025-10-27 05:56:07 +03:00
Commit Graph

3987 Commits

Author SHA1 Message Date
Kristofer Pettersson
bef12c6ed1 Bug58747 57359 patch: breaks secure_file_priv+not secure yet+still accesses other folders
"load data infile .."  allowed for access to 
unautohorized tables.
Due to a faulty if-statement it was possible to
circumvent the secure_file_priv restriction.
2010-12-16 11:49:40 +01:00
Sergey Petrunya
58b646001a Merge DS-MRR/CPK improvements into 5.3-main 2010-12-13 13:42:40 +03:00
Bjorn Munch
e7a29acfb4 merge from 5.5-mtr 2010-12-09 20:53:22 +01:00
Bjorn Munch
5a95f0aeb1 upmerge 58511,58522,58608,58092 2010-12-09 15:32:39 +01:00
Bjorn Munch
b5fdbcb2fe Bug #58608 mysqltestrun --help incongruences
Fixed some errors
Added note about 'no' prefix to options
See also follow-up comment to bug report
2010-12-09 14:40:36 +01:00
Bjorn Munch
c1463af64c Bug #58282 "mtr --mem" does not work on a machine with libaio installed
Workaround: add --loose-skip-innodb-use-native-aio
Only on linux if explicitly using --mem or setting $OPT_MEM
2010-12-09 14:04:35 +01:00
Bjorn Munch
5ac43e27a5 Bug #58122 Using DBUG_EXECUTE_IF and normal DBUG printouts not compatible
Added option --debug-common which sets 'd' debug flags to the suggested list
2010-12-09 12:10:49 +01:00
Bjorn Munch
09889ea2c3 merge from 5.5-mtr 2010-12-09 20:53:22 +01:00
Bjorn Munch
f072749e06 upmerge 58511,58522,58608,58092 2010-12-09 15:32:39 +01:00
Bjorn Munch
117237a62e Bug #58608 mysqltestrun --help incongruences
Fixed some errors
Added note about 'no' prefix to options
See also follow-up comment to bug report
2010-12-09 14:40:36 +01:00
Bjorn Munch
899a49bcc2 Bug #58282 "mtr --mem" does not work on a machine with libaio installed
Workaround: add --loose-skip-innodb-use-native-aio
Only on linux if explicitly using --mem or setting $OPT_MEM
2010-12-09 14:04:35 +01:00
Bjorn Munch
d7c04a5996 Bug #58122 Using DBUG_EXECUTE_IF and normal DBUG printouts not compatible
Added option --debug-common which sets 'd' debug flags to the suggested list
2010-12-09 12:10:49 +01:00
Bjorn Munch
50d1f9f368 merge from 5.1-mtr 2010-12-09 20:32:47 +01:00
Bjorn Munch
7a404214e0 merge from 5.1-mtr 2010-12-09 20:32:47 +01:00
Vladislav Vaintroub
8b4b8c8e65 merge 2010-12-02 16:19:28 +01:00
Vladislav Vaintroub
ea72880659 address review comments 2010-12-02 15:56:25 +01:00
Vladislav Vaintroub
2f7a1564bb Adapt fix_vs_config_dir () for VS2010
MTR_VS_CONFIG is now determined by looking at parent directory 
of sql\*\mysqld.exe,  instead of looking at *\*\BuildLog.htm

Reason : VS2010 does not create BuildLog.htm, hence prior method did not work.
2010-12-01 23:28:47 +01:00
Michael Widenius
1e5061fe3b merge with 5.1 2010-11-30 23:11:03 +02:00
Bjorn Munch
d6df320d9e merge from 5.5-mtr 2010-11-27 11:52:17 +01:00
Bjorn Munch
d2fb19855e merge from 5.5-mtr 2010-11-27 11:52:17 +01:00
Bjorn Munch
7197f142cc merge from 5.1-mtr 2010-11-27 11:51:22 +01:00
Bjorn Munch
86a4cf1116 merge from 5.1-mtr 2010-11-27 11:51:22 +01:00
Sergei Golubchik
65ca700def merge.
checkpoint.
does not compile.
2010-11-25 18:17:28 +01:00
Michael Widenius
1a6373e8e2 Merge with MySQL 5.1.53
Open issues:
- A better fix for #57688; Igor is working on this
- Test failure in index_merge_innodb.test ; Igor promised to look at this
- Some Innodb tests fails (need to merge with latest xtradb) ; Kristian promised to look at this.
 - Failing tests: innodb_plugin.innodb_bug56143 innodb_plugin.innodb_bug56632 innodb_plugin.innodb_bug56680 innodb_plugin.innodb_bug57255 
- Werror is disabled;  Should be enabled after merge with xtradb.
2010-11-25 00:57:34 +02:00
Bjorn Munch
cad53ac74a upmerge 58424 and 43418 follow-up 2010-11-24 21:09:08 +01:00
Bjorn Munch
31ae256421 upmerge 58424 and 43418 follow-up 2010-11-24 21:09:08 +01:00
Bjorn Munch
dffe3ad3e7 merge 58424 2010-11-24 13:51:45 +01:00
Bjorn Munch
891593e42e merge 58424 2010-11-24 13:51:45 +01:00
Bjorn Munch
5ba54e9343 upmerge 58424 2010-11-24 10:47:50 +01:00
Bjorn Munch
222dd6e138 upmerge 58424 2010-11-24 10:47:50 +01:00
Bjorn Munch
a2cbe6e949 Bug #58424 mtr ignores failing mysqltest in the presence of expect file for mysqld
If mysqltest dies, mtr waits to see if mysqld dies too within 100ms
But in that case, it should not care about expected crash
Fix: jump past the code that checks the expect file
2010-11-24 10:22:03 +01:00
Bjorn Munch
e1fa8cb9bb Bug #58424 mtr ignores failing mysqltest in the presence of expect file for mysqld
If mysqltest dies, mtr waits to see if mysqld dies too within 100ms
But in that case, it should not care about expected crash
Fix: jump past the code that checks the expect file
2010-11-24 10:22:03 +01:00
Michael Widenius
b52020221e Merge with MySQL 5.1.52 2010-11-23 23:39:59 +02:00
Bjorn Munch
881373c207 Bug #58415 mtr cannot find libmysqld.dll in new 5.5 packages
Done as suggested
Also tested from src build directory
2010-11-23 15:03:44 +01:00
Bjorn Munch
4ff8a4b3de Bug #58415 mtr cannot find libmysqld.dll in new 5.5 packages
Done as suggested
Also tested from src build directory
2010-11-23 15:03:44 +01:00
Bjorn Munch
b768d7fdef Bug #43418 MTR2: does not notice a memory leak occuring at shutdown of mysqld w/ --valgrind
Follow-up discussed with Reporter:
Avoid hard shutdown after test failure, if caused by server log warning
  AND we are running valgrind
More general pick-up of valgrind summaries, order may apparently vary
Do exit(1) if we did find valgrind summary warnings
2010-11-23 14:34:00 +01:00
Bjorn Munch
f2b4622346 Bug #43418 MTR2: does not notice a memory leak occuring at shutdown of mysqld w/ --valgrind
Follow-up discussed with Reporter:
Avoid hard shutdown after test failure, if caused by server log warning
  AND we are running valgrind
More general pick-up of valgrind summaries, order may apparently vary
Do exit(1) if we did find valgrind summary warnings
2010-11-23 14:34:00 +01:00
Bjorn Munch
dfca5156c3 merge from 5.5-mtr 2010-11-19 11:26:43 +01:00
Bjorn Munch
0b260aca41 merge from 5.5-mtr 2010-11-19 11:26:43 +01:00
Magnus Blåudd
e012532ad9 Merge 5.5-bug58159 -> 5.5-mtr 2010-11-15 08:41:11 +01:00
Magnus Blåudd
24bc175e55 Merge 5.5-bug58159 -> 5.5-mtr 2010-11-15 08:41:11 +01:00
Sergey Petrunya
9ab54acbf0 Merge MWL#121-125 DS-MRR improvements into MWL#128 Classic hash join tree 2010-11-15 04:45:49 +03:00
Bjorn Munch
22ae28d3e1 merge from 5.5 2010-11-14 13:24:29 +01:00
Bjorn Munch
5e51571f7b merge from 5.5 2010-11-14 13:24:29 +01:00
Magnus Blåudd
2184a619c9 Bug#58159 mtr.pl can't run out of source build with NDB
- use $bindir instead of $basedir when looking for binaries
 - NOTE! the $ENV{NDB_EXAMPLES_*} will be reworked so that
  mtr.pl does not need to set them up.
2010-11-12 11:50:37 +01:00
Magnus Blåudd
b57fd36736 Bug#58159 mtr.pl can't run out of source build with NDB
- use $bindir instead of $basedir when looking for binaries
 - NOTE! the $ENV{NDB_EXAMPLES_*} will be reworked so that
  mtr.pl does not need to set them up.
2010-11-12 11:50:37 +01:00
Bjorn Munch
22830296ee merge from 5.5-mtr 2010-11-09 13:04:44 +01:00
Bjorn Munch
9de480c577 merge from 5.5-mtr 2010-11-09 13:04:44 +01:00
Sergey Petrunya
a2da3692c4 Include optimizer_unfixed_bugs testsuite in buildbot runs 2010-11-09 13:30:35 +02:00
Bjorn Munch
6eaa3c0750 merge from 5.1-mtr 2010-11-09 11:20:50 +01:00