1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Commit Graph

1602 Commits

Author SHA1 Message Date
Sergey Vojtovich
7c4cae75b8 Clean-up after applying innodb-zip-ss6129 snapshot:
- re-enabled main.innodb_bug44369;
- re-enabled main.innodb_bug47777;
- re-enabled innodb.innodb_information_schema.
2009-11-03 18:41:04 +04:00
Jonathan Perkin
25067ea7e1 Additional change required for bug#46834, find the std_data directory
correctly in RPMs.
2009-11-03 13:56:35 +00:00
Sergey Vojtovich
b703edd747 Clean-ups after applying InnoDB snapshot 5.1-ss6129:
- disabled main.innodb_bug47777.test with InnoDB plugin
  until fix for plugin is applied.
- disabled main.innodb-autoinc.test (failing)
- re-enabled main.innodb_bug39438.test
- added error message suppression to innodb_bug39438, as
  requested by InnoDB/Oracle
- reverted change to main.innodb_bug34300 as plugin specific.
2009-11-03 12:46:04 +04:00
Vladislav Vaintroub
2377eed362 Bug #47423 mtr connects to wrong database
The reason for the bug is that mysqtest as well as other client tools
running in test suite (mysqlbinlog, mysqldump) will first try to connect 
whatever database has created shared memory with default base name 
"MySQL" and use this. (Same effect could be seen on Unix if mtr would
not care to calculate "port" and "socket" parameter).
      
The fix ensures that all client tools and  running in mtr use unique  
per-database shared memory base parameters, so there is no possibility
to clash with already installed one. We use socket name for shared memory 
base (it's known to be unique). This shared-memory-base is written to the
MTR config file to the [client] and [mysqld] sections. Fix made also made 
sure all client tools understand and correctly handle --shared-memory-base.
Prior to this patch  it was not the case for  mysqltest, mysqlbinlog and 
mysql_client_test.
      
All new connections done from mtr scripts via connect() will by default 
set shared-memory-base. And finally, there is a possibility to force 
shared memory or pipe connection and overwrite shared memory/pipe base name
from within mtr scripts via optional PIPE or SHM modifier. This functionality
was manually backported from 6.0
(original patch  http://lists.mysql.com/commits/74749)
2009-11-03 01:19:37 +01:00
Sergey Vojtovich
cd167ee2e9 Merge innodb-5.1-ss6129 to mysql-5.1-bugteam. 2009-11-03 13:19:02 +04:00
Vladislav Vaintroub
b51777484f merge 2009-11-03 01:52:57 +01:00
Bjorn Munch
462c2fdae4 upmerge 48240 2009-10-26 15:30:49 +01:00
Bjorn Munch
efd58d0a1f upmerge 48240 2009-10-26 15:29:38 +01:00
Bjorn Munch
c22826bfad Bug #48240 "Test suite timeout" and "Too many tests failed" is masked from status page
Prepend "Completed", "Timeout" or "Too many failed" to summary line
2009-10-26 14:28:51 +01:00
Alexander Nozdrin
a8c6e84a42 Automerge from mysql-next-mr. 2009-10-23 00:24:32 +04:00
Alexander Nozdrin
2a6e8d37f1 Automerge from mysql-trunk. 2009-10-23 00:24:24 +04:00
Alexander Nozdrin
564952afb0 Automerge from mysql-next-mr. 2009-10-22 22:06:01 +04:00
Alexander Nozdrin
4f12a0ba80 Automerge from mysql-trunk. 2009-10-22 22:05:42 +04:00
Jonathan Perkin
136a4225c7 Apply missing patch from bug#46834 to mysql-trunk-bugfixing. 2009-10-22 16:48:52 +01:00
Bjorn Munch
e26a2f3b61 new merge from next-mr 2009-10-22 09:36:39 +02:00
Bjorn Munch
3a2434d432 new merge from trunk 2009-10-22 09:13:44 +02:00
Alexander Barkov
dcb8bb23c2 Merging mysql-next-mr-merge to mysql-next-mr. 2009-10-21 15:48:22 +05:00
Bjorn Munch
0632e9a407 merge from next-mr 2009-10-21 12:18:33 +02:00
Bjorn Munch
78b2ca30c6 merge 48149 2009-10-20 12:06:33 +02:00
Bjorn Munch
0777ef567d merge 48149 2009-10-20 12:05:28 +02:00
Bjorn Munch
4113d6ca88 merge 48149 2009-10-20 12:04:55 +02:00
Bjorn Munch
e6bc01d170 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
2f36bc160a merge 48130 and 48133 2009-10-19 15:33:34 +02:00
Bjorn Munch
6203b7b367 merge 48130 and 48133 from 5.1 2009-10-19 15:14:26 +02:00
Bjorn Munch
599b745bc1 merge 48130 and 48133 from 5.1 2009-10-19 15:12:16 +02:00
Bjorn Munch
dcf6aae407 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
72c96cbd0e merge from 5.1 main 2009-10-16 23:25:05 +02:00
Sergey Glukhov
d8c3f2263f WL#751 Error message construction, backport 2009-10-15 17:23:43 +05:00
Michael Widenius
75a949fb41 Automatic merge with 5.1-merge 2009-10-14 11:09:56 +03:00
Alexander Nozdrin
310833ff2e Merge from mysql-5.1. 2009-10-14 11:17:49 +04:00
Bjorn Munch
9b61982f4d merge from mtr-51 2009-10-08 11:34:42 +02:00
Bjorn Munch
0aca4f0011 Bug #46625 Pushbuild2: does not notice test failure in "Innodb Plugin" mode
Disallow (and don't use) space in combination names
2009-10-08 11:14:42 +02:00
unknown
ece15c313a Merge. 2009-10-08 00:59:07 +02:00
unknown
68602b939b Fixes for package name change mysql -> mariadb.
- Don't need any m1 prefix for the first release based on given MySQL
   version number.

 - Fix mysql-test-run to understand that some stuff is installed under
   share/mariadb rather than share/mysql.
2009-10-08 00:57:43 +02:00
Sergey Petrunya
538d689f11 MBUG#442254: mysql-test-run --embedded fails on Windows with: ERROR: .opt file references 'EXAMPLE_PLUGIN_OPT'
- Fix suggested by Kristian on review: ignore the test using mtr's facilities
2009-10-08 01:29:04 +04:00
Vladislav Vaintroub
b96230c858 merge 2009-10-07 16:34:45 +02:00
Magnus Blåudd
6ff8f716c3 Bug#47867 compiler warning _WIN32_WINNT macro redefinition
- Remove the conflicting macro definitions since we define a higher value
   directly in the cmake files.
2009-10-06 18:10:34 +02:00
Bjorn Munch
6eb9c2bec9 merge of 47383 from 5.1-mtr 2009-10-06 14:37:37 +02:00
unknown
76d47f53d4 MBug#443014: Too many 'skipped' messages in mysql-test-run
Remove mysql-test-run.pl unnecessary and confusing 'skipped' messages.

 - In mysql-test-run.pl, we auto-generate combinations of replication
   tests. But this sometimes generates combinations that are meaningless,
   like running a test that requires row-based replication with
   statement-based. These superfluous combinationes should not be
   reported as skipped, they should just be deleted.

 - Remove ndb suites from default suites, as we do not support NDB
   in MariaDB.

Keep skip messages resulting from running mysql-test-run.pl in special
ways, eg. --mysqld=--binlog-format=statement.
2009-10-05 14:26:57 +02:00
Satya B
95c6cc51a5 Applying InnoDB snapshot 5.1-ss5921, part 2. Fixes BUG#44369
BUG#44369 - InnoDB: Does not uniformly disallow disallowed column names

Detailed revision comments:

r5741 | jyang | 2009-09-03 07:16:01 +0300 (Thu, 03 Sep 2009) | 5 lines
branches/5.1: Block creating table with column name conflicting
with Innodb reserved key words. (Bug #44369) rb://151 approved
by Sunny Bains.


r5760 | jyang | 2009-09-04 07:07:34 +0300 (Fri, 04 Sep 2009) | 3 lines
branches/5.1: This is to revert change 5741. A return status for
create_table_def() needs to be fixed.

r5834 | jyang | 2009-09-11 00:43:05 +0300 (Fri, 11 Sep 2009) | 5 lines
branches/5.1: Block creating table with column name conflicting
with Innodb reserved key words. (Bug #44369) rb://151 approved
by Sunny Bains.
2009-10-05 16:47:48 +05:30
Satya B
b9ce9f79d6 Applying InnoDB snapshot 5.1-ss5921, Part 1. Fixes BUG#46000
1. BUG#46000 - using index called GEN_CLUST_INDEX crashes server

Detailed revision comments:

r5895 | jyang | 2009-09-15 03:39:21 +0300 (Tue, 15 Sep 2009) | 5 lines
branches/5.1: Disallow creating index with the name of
"GEN_CLUST_INDEX" which is reserved for the default system
primary index. (Bug #46000) rb://149 approved by Marko Makela.
2009-10-05 16:39:07 +05:30
Bjorn Munch
28b190b272 Bug #47383 let mysql-test-run.pl run innodb tests using the plugin
Alt. solution: let the "InnoDB plugin" combinations apply
Added some alternative plugin paths (I need to move the code anyway)
2009-10-02 10:36:38 +02:00
Vladislav Vaintroub
017a0fd20d Bug #47731 mtr freezes for many seconds when process to be killed has already gone.
The problem is that safe_kill_win fails to detect a dead process. OpenProcess() will 
succeed even after the process died, it will first fail after the last handle to process 
is closed.

To fix the problem, check process status with GetExitCodeProcess() and consider 
process to be dead if the exit code returned by this routine is not STILL_ALIVE.
2009-09-30 00:19:00 +02:00
Davi Arnaut
88365681af Don't use the semicolon character as a argument separator as it
can be interpreted as a shell metacharacter in some circumstances.
For example, it is interpreted as a command separator when invoking
a debugger.

mysql-test/lib/mtr_cases.pm:
  Use ':' as the separator on non-Windows platforms.
mysql-test/mysql-test-run.pl:
  Remove unnecessary use of the separator.
2009-09-29 11:11:46 -03:00
unknown
44718ad445 Merge MySQL-5.1.38 and XtraDB-7 into MariaDB.
Merge Percona microsec_process patch.
Includes lots of after-merge fixes, Windows fixes, and other misc. small fixes.
2009-09-25 10:56:53 +02:00
unknown
9404bbc363 merge 2009-09-24 15:49:39 +03:00
unknown
a4a6f1d5af Ability to stop mysql-test-run.pl temporary (useful for them who run buildbot slave on thier work computers) 2009-09-24 15:19:15 +03:00
Satya B
1eef766534 Additional Fix for BUG#44030 - Error: (1500) Couldn't read the MAX(ID) autoinc
value from the index (PRIMARY)


With the fix for BUG#46760, we correctly flag the presence of row_type 
only when it's actually changed and enables the FAST ALTER TABLE which was
disabled with the BUG#39200.

So the changes made by BUG#46760 makes MySQL data dictionaries to be out of 
sync but they are handled already by InnoDB with this BUG#44030.

The test was originally written to handle this but we requested Innodb to
update the test as the data dictionaries were in sync after the fix for 
BUG#39200.

Adjusting the innodb-autoinc testcase as mentioned in the comments.

mysql-test/lib/mtr_cases.pm:
  Re-enable the innodb-autoinc test case for plugin as we have a common
  result file.
mysql-test/r/innodb-autoinc.result:
  Additional Fix for BUG#44030 - Error: (1500) Couldn't read the MAX(ID) autoinc 
                                 value from the index (PRIMARY)
  
  Adjust the innodb-autoinc testcase as the patch for BUG#46760 enables the 
  FAST ALTER TABLE and makes the data dictonaries go out of sync. This is 
  expected in the testcase.
mysql-test/t/innodb-autoinc.test:
  Additional Fix for BUG#44030 - Error: (1500) Couldn't read the MAX(ID) autoinc 
                                 value from the index (PRIMARY)
  
  Adjust the innodb-autoinc testcase as the patch for BUG#46760 enables the 
  FAST ALTER TABLE and makes the data dictonaries go out of sync. This is 
  expected in the testcase.
2009-09-23 17:42:12 +05:30
Bjorn Munch
bb181d25cb new merge from trunk 2009-09-21 11:43:01 +02:00
Alexander Nozdrin
ede2edd19b Merge from mysql-5.1. 2009-09-19 13:07:51 +04:00