Commit graph

493 commits

Author SHA1 Message Date
skozlov/ksm@mysql.com/virtop.localdomain
6c67d11f20 WL#3949. Added an option for support "combinations" of mysqld arguments for a suite 2007-11-03 00:32:17 +03:00
cmiller@zippy.cornsilk.net
04296df344 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-10-08 12:40:21 -04:00
msvensson@shellback.(none)
c2f6d59db1 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2007-10-05 19:29:55 +02:00
msvensson@shellback.(none)
be40fefd73 Bug#27753 enable mysql-test-run.pl to ignore tests based on wildcard 2007-10-05 19:23:44 +02:00
cmiller@zippy.cornsilk.net
eedde95a33 Change URLs.
Our web server has been restructured several times, and references
to it in our source code has stayed the same.  This patch from Paul
DuBois updates all URLs to modern semantics.
2007-10-05 13:16:54 -04:00
msvensson@shellback.(none)
c78ef4128a Remove printout 2007-10-05 18:24:48 +02:00
msvensson@shellback.(none)
1e4fac1677 Bug#31400 mysql-test-run inconvenience problems running a certain test
- Allow test case names to be specied in various different ways
2007-10-05 14:42:38 +02:00
msvensson@pilot.(none)
f26d69e01a Add support for specifying suites not located in mysql-test/suite/
Example otions that will all run binlog_stm_binlog.test in suite/binlog:
 --suite=binlog binlog.binlog_stm_binlog
 --suite=binlog binlog_stm_binlog
 binlog_stm_binlog
 --suite=suite/binlog binlog.binlog_stm_binlog
 --suite=suite/binlog binlog_stm_binlog
2007-09-11 15:00:52 +02:00
msvensson@pilot.(none)
66ae874371 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-09-01 11:42:43 +02:00
msvensson@pilot.(none)
0ccf3502ef Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-09-01 11:41:59 +02:00
msvensson@pilot.(none)
c5ea7b0641 Use eval around "rmtree" and use our own version of rmtree if it fails 2007-09-01 11:41:38 +02:00
msvensson@pilot.(none)
4c571eb3e8 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-29 14:40:38 +02:00
msvensson@pilot.(none)
2028c2b696 Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-29 14:39:59 +02:00
msvensson@pilot.(none)
f164a136e1 Fix typo: '$$' => '$' 2007-08-29 14:39:40 +02:00
msvensson@pilot.(none)
e10fb4ffb3 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-29 11:55:03 +02:00
msvensson@pilot.(none)
523cddeec3 Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-29 11:53:36 +02:00
msvensson@pilot.(none)
387990f78d Add 'mtr_rmtree' 2007-08-29 11:51:34 +02:00
msvensson@pilot.(none)
0b27b3bc0e Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-27 10:50:44 +02:00
msvensson@pilot.(none)
89780a84c8 Remove unsued variable $glob_hostname, unused functions
'mtr_short_hostname' and 'mtr_full_hostname'
2007-08-24 15:43:45 +02:00
msvensson@pilot.(none)
52e60422e0 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-24 13:10:53 +02:00
msvensson@pilot.(none)
4fcea0fc5c Remove unecessary use of "Socket" 2007-08-24 13:10:34 +02:00
msvensson@pilot.(none)
0b8d2a92b1 Merge 192.168.0.7:mysql/mysql-5.1-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-20 15:15:44 +02:00
msvensson@shellback.(none)
cbecd2007e Make it possible to pass mysql-test-run.pl test cases to run
also on the <suite>.<testname> format
2007-08-20 15:12:14 +02:00
msvensson@pilot.(none)
02419588a4 Merge bk-internal:/home/bk/mysql-5.1-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-13 11:35:10 +02:00
msvensson@pilot.(none)
5e4b4ca6ab Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-08 10:05:09 +02:00
msvensson@pilot.(none)
912aad3b2e Improve comments and log messages in lib/mtr_timer.pl 2007-08-08 10:04:26 +02:00
msvensson@pilot.(none)
7afa0163e5 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-03 13:26:43 +02:00
msvensson@pilot.(none)
51abee54c5 Merge 192.168.0.7:mysql/mysql-5.0-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-03 13:15:03 +02:00
msvensson@shellback.(none)
cc00660f95 WL#3935 Improve mysqltest report and exitcode for diff
- Move the code to generate test report to the test tool(in this
   case mysqltest) where the best control of what failed is
- Simplify the code in mysql-test-run.pl
- mysqltest will now find what diff to use in a best effort attempt
  using "diff -u", "diff -c" and finally dumping the two files verbatim
  in the report.
2007-08-03 13:12:53 +02:00
msvensson@pilot.(none)
9e55a4f3b9 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-03 12:52:31 +02:00
msvensson@pilot.(none)
820f53e84b Merge 192.168.0.7:mysql/mtr_log/my50-mtr_log
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-03 12:52:04 +02:00
msvensson@pilot.(none)
ba3c906428 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-03 12:50:36 +02:00
msvensson@pilot.(none)
ea692e9028 Improve report on test execution time
Define tot_real_tim locally in mtr_report.pl
2007-08-03 12:50:00 +02:00
msvensson@shellback.(none)
b3db467178 Send output to var/log/mysql-test-run.log to facilitate easier debugging
of mysql-test-run.pl
2007-08-03 12:36:32 +02:00
cbell/Chuck@mysql_cab_desk.
dc2cab6561 Merge mysql_cab_desk.:C:/source/c++/mysql-5.1
into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl-merge
2007-08-02 15:27:47 -04:00
mats@kindahl-laptop.dnsalias.net
ef36039db6 BUG#29809 (Slave SQL errors in warnings file):
Adding code to filter out slave SQL errors since these are checked by
the tests themselves.
2007-07-26 16:44:57 +02:00
svoj@mysql.com/june.mysql.com
b94217491a BUG#29839 - lowercase_table3.test: Cannot find table test/T1 from
the internal data dictiona
- re-enabled lowercase_table3 test;
- added a rule to throw away expected warning to mtr_report.pl;
- fixed a test case to produce unique warning.
2007-07-18 13:55:50 +05:00
svoj@mysql.com/june.mysql.com
ee13e03ca0 BUG#29807 - innodb_mysql.test: Cannot find table test/t2 from the
internal data dictionary
- re-enabled innodb_mysql test;
- added a rule to through away expected warning to mtr_report.pl;
- fixed a test case to produce unique warning.
2007-07-16 15:09:46 +05:00
tsmith@sita.local
5f12f35c34 Merge sita.local:/Users/tsmith/m/bk/51
into  sita.local:/Users/tsmith/m/bk/maint/51

This merge requires a post-merge fix to remove rpl_udf from
suite/rpl/t/disabled.def.
2007-07-09 03:27:03 -06:00
antony@ppcg5.local
6402e4324a Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines
into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines.merge
2007-07-06 09:03:50 -07:00
tsmith@maint1.mysql.com
54253a0763 Merge maint1.mysql.com:/data/localhome/tsmith/bk/51
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-07-04 22:38:53 +02:00
lars/lthalmann@dl145k.mysql.com
4be62a8e7f Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.1
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
2007-07-02 17:45:46 +02:00
lars/lthalmann@dl145j.mysql.com
a4c81471e8 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-07-02 13:42:39 +02:00
tomas@whalegate.ndb.mysql.com
c82aaf4b05 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-06-30 11:46:20 +02:00
tomas@whalegate.ndb.mysql.com
325d8002f5 ndb test suite cleanup + making ndb_autodiscover3 less flaky 2007-06-30 11:42:41 +02:00
msvensson@pilot.(none)
db84337b37 Reduce time for mysqladmin to try to shutdown servers from 70 to 20 seconds 2007-06-29 14:18:20 +02:00
anozdrin/alik@ibm.
9fae9ef66f Patch for the following bugs:
- BUG#11986: Stored routines and triggers can fail if the code
    has a non-ascii symbol
  - BUG#16291: mysqldump corrupts string-constants with non-ascii-chars
  - BUG#19443: INFORMATION_SCHEMA does not support charsets properly
  - BUG#21249: Character set of SP-var can be ignored
  - BUG#25212: Character set of string constant is ignored (stored routines)
  - BUG#25221: Character set of string constant is ignored (triggers)

There were a few general problems that caused these bugs:
1. Character set information of the original (definition) query for views,
   triggers, stored routines and events was lost.
2. mysqldump output query in client character set, which can be
   inappropriate to encode definition-query.
3. INFORMATION_SCHEMA used strings with mixed encodings to display object
   definition;

1. No query-definition-character set.

In order to compile query into execution code, some extra data (such as
environment variables or the database character set) is used. The problem
here was that this context was not preserved. So, on the next load it can
differ from the original one, thus the result will be different.

The context contains the following data:
  - client character set;
  - connection collation (character set and collation);
  - collation of the owner database;

The fix is to store this context and use it each time we parse (compile)
and execute the object (stored routine, trigger, ...).

2. Wrong mysqldump-output.

The original query can contain several encodings (by means of character set
introducers). The problem here was that we tried to convert original query
to the mysqldump-client character set.

Moreover, we stored queries in different character sets for different
objects (views, for one, used UTF8, triggers used original character set).

The solution is
  - to store definition queries in the original character set;
  - to change SHOW CREATE statement to output definition query in the
    binary character set (i.e. without any conversion);
  - introduce SHOW CREATE TRIGGER statement;
  - to dump special statements to switch the context to the original one
    before dumping and restore it afterwards.

Note, in order to preserve the database collation at the creation time,
additional ALTER DATABASE might be used (to temporary switch the database
collation back to the original value). In this case, ALTER DATABASE
privilege will be required. This is a backward-incompatible change.

3. INFORMATION_SCHEMA showed non-UTF8 strings

The fix is to generate UTF8-query during the parsing, store it in the object
and show it in the INFORMATION_SCHEMA.

Basically, the idea is to create a copy of the original query convert it to
UTF8. Character set introducers are removed and all text literals are
converted to UTF8.

This UTF8 query is intended to provide user-readable output. It must not be
used to recreate the object.  Specialized SHOW CREATE statements should be
used for this.

The reason for this limitation is the following: the original query can
contain symbols from several character sets (by means of character set
introducers).

Example:

  - original query:
    CREATE VIEW v1 AS SELECT _cp1251 'Hello' AS c1;

  - UTF8 query (for INFORMATION_SCHEMA):
    CREATE VIEW v1 AS SELECT 'Hello' AS c1;
2007-06-28 21:34:54 +04:00
msvensson@pilot.(none)
2238ef2b62 Merge pilot.(none):/data/msvensson/mysql/wl3933/my51-wl3933-new2
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-27 14:29:10 +02:00
msvensson@pilot.(none)
8661497e9b WL#3933 Split main test suite to rpl, rpl_ndb and ndb
- Update mysql-test-run.pl to collect tests from several suites
 - Group test into suites
 - Add suite.opt file
2007-06-27 14:28:02 +02:00
msvensson@pilot.(none)
76a2a818db Merge pilot.(none):/data/msvensson/mysql/bug18415/my51-bug18415
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-27 09:22:01 +02:00