Commit graph

51308 commits

Author SHA1 Message Date
msvensson@pilot.mysql.com
601cb9f96b Merge bk-internal:/home/bk/mysql-5.1-rpl
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
2007-12-07 11:12:12 +01:00
skozlov/ksm@mysql.com/virtop.localdomain
63800e091a WL#4091, part1. replace --sleep by include/wait_condition.inc 2007-12-06 18:27:10 +03:00
msvensson@pilot.mysql.com
99653a3aee Remove disabling of ctype_big5, bug#26711 has nothing to do with it 2007-12-05 16:43:44 +01:00
msvensson@pilot.mysql.com
60880ec8ae Revert bad merge, should have used local code 2007-11-29 12:23:18 +01:00
mkindahl@dl145h.mysql.com
0d13a48c25 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-new-rpl
2007-11-28 12:34:25 +01:00
mkindahl@dl145h.mysql.com
087c239bb3 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-new-rpl
2007-11-28 12:05:35 +01:00
mkindahl@dl145h.mysql.com
b1428496df Disabling several tests that fail and reported as errors. 2007-11-27 11:02:00 +01:00
msvensson@pilot.mysql.com
038a093c97 Increase the slave_net_timeout to double of what the master
uses for connect_timeout
2007-11-27 10:56:46 +01:00
msvensson@pilot.mysql.com
ec08b4a405 Remove disabling of testcases 2007-11-26 20:05:52 +01:00
msvensson@pilot.mysql.com
f45cf3e975 Bug#25146 Some warnings/errors not shown when using --show-warnings
- Additional patch to fix compiler warnings
2007-11-26 19:50:43 +01:00
msvensson@pilot.mysql.com
385e3a895e Revert 2007-11-26 19:42:07 +01:00
msvensson@pilot.mysql.com
702361735a Fix warning about possibly uninitialized variable "warnings" 2007-11-26 16:45:58 +01:00
msvensson@pilot.mysql.com
7c739af321 Merge bk-internal:/home/bk/mysql-5.1-rpl-merge
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl-merge
2007-11-26 16:42:19 +01:00
msvensson@pilot.mysql.com
16d372ce7d Add suppressions for expected warning messages that appears in
slave's error log when running rpl_extraColmaster_*.test
2007-11-26 16:31:35 +01:00
mkindahl@dl145h.mysql.com
3f1c8ab526 Disabling testcases that have warnings that PB cannot handle. 2007-11-26 16:20:37 +01:00
msvensson@pilot.mysql.com
da8ca56667 Disable combinations processing until next version 2007-11-26 16:19:34 +01:00
msvensson@pilot.mysql.com
b235d54f30 Remove lib/* from EXTRA_DIST and pointout exactly which subdir
of lib/ that should be included
2007-11-26 15:43:47 +01:00
mkindahl@dl145h.mysql.com
ebbcf7a6e2 Disabling failing test that has been reported as bug. 2007-11-26 15:36:23 +01:00
msvensson@pilot.mysql.com
7a258d43ec Remove superfluous check for "skip", it's already done previous in the loop 2007-11-26 10:53:21 +01:00
skozlov/ksm@mysql.com/virtop.localdomain
862cb6cadf WL#3949, Added the optimization of rpl tests if mtr started w/o a combination and --mysqld=--binlog-format=XXX 2007-11-24 20:34:30 +03:00
msvensson@shellback.(none)
d60eb19086 Add mysql-test/lib/*.sql to dists* 2007-11-23 18:12:14 +01:00
msvensson@shellback.(none)
6bd4f5921b Remove printout 2007-11-23 16:19:42 +01:00
msvensson@shellback.(none)
175926c9ac - Don't process already skipped testcases one more time
in optimization phase
- Don't check specified binlog format if hasn't been assigned one
2007-11-23 16:14:56 +01:00
msvensson@shellback.(none)
6e73b86b6e Add lib to extra dist 2007-11-23 15:59:50 +01:00
msvensson@shellback.(none)
10a36ca4ec Apply patch for BUG#30630 2007-11-23 15:54:11 +01:00
msvensson@shellback.(none)
a4414d541f Merge bk-internal:/home/bk/mysql-5.1-rpl
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-rpl-wl3949
2007-11-23 15:03:43 +01:00
msvensson@shellback.(none)
b6efeea6bd Move the "use lib" directive to mtr.pl 2007-11-23 15:02:50 +01:00
mats@kindahl-laptop.dnsalias.net
f9f1e135ab Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
into  kindahl-laptop.dnsalias.net:/home/bk/b32580-mysql-5.1-rpl
2007-11-23 14:47:16 +01:00
mats@kindahl-laptop.dnsalias.net
8809b0db86 BUG#32580 (mysqlbinlog cannot read binlog event generated by user variable usage):
The client program 'mysqlbinlog' crashed when trying to print a User_var_log_event holding
a floating-point value since the format specifier for my_b_printf() does not support
floating-point format specifiers.

This patch prints the floating-point number to an internal buffer, and then writes
that buffer to the output instead.
2007-11-23 14:41:41 +01:00
msvensson@shellback.(none)
20fe800c45 WL#3949 Test should set binlog format dnamically
- Reorganize collect a little to make it easier to apply optimizations
  and settings to collected test cases.
- Add suite/rpl/combination file
- Rename include/set_binlog_format_x.inc to .sql since thay are run by "mysql"
2007-11-23 13:29:31 +01:00
mkindahl@dl145h.mysql.com
93d9d62353 Post-merge fixes. 2007-11-23 12:51:14 +01:00
mkindahl@dl145h.mysql.com
29e48c4f63 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2007-11-22 20:15:42 +01:00
df@pippilotta.erinye.com
bf6cf069f1 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
2007-11-22 18:07:09 +01:00
skozlov/ksm@virtop.localdomain
447363877a Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into  mysql.com:/home/ksm/commits/mysql-5.1-new-rpl
2007-11-22 00:00:21 +03:00
skozlov/ksm@mysql.com/virtop.localdomain
22c2cdd1a7 WL#3949, added skip combinations for some conditions 2007-11-21 23:44:31 +03:00
mkindahl@dl145h.mysql.com
0c7f3bdeba Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2007-11-21 21:15:33 +01:00
df@pippilotta.erinye.com
9d8981033d Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-11-21 19:44:40 +01:00
df@pippilotta.erinye.com
f67a748ab4 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-11-21 19:44:12 +01:00
df@pippilotta.erinye.com
8c88e1faa2 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-11-21 19:42:50 +01:00
df@pippilotta.erinye.com
cf7b21c005 add wrong warning to suppression file 2007-11-21 19:41:13 +01:00
df@pippilotta.erinye.com
ca249707a1 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-11-21 19:33:27 +01:00
mleich@five.local.lan
2bc3dba9c8 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
2007-11-21 18:55:27 +01:00
df@pippilotta.erinye.com
c25cbcec13 ignore readline warnings 2007-11-21 18:11:08 +01:00
sven@riska.(none)
a820324569 BUG#31581: 5.1-telco-6.1 -> 5.1.22. Slave crashes during starting
The patch I previously pushed for this bug did not compile because
a field in class THD had been renamed.
This patch renames thd->query_error to thd->is_slave_error in
log_event_old.cc by applying the same patch to log_event_old.cc as
was previously applied to log_event.cc.
2007-11-21 16:53:46 +01:00
sven@riska.(none)
c26a136ed3 Merge riska.(none):/home/sven/bkroot/5.1-new-rpl
into  riska.(none):/home/sven/bk/b31581-5.1.22-rbr_slave_crash
2007-11-21 15:27:12 +01:00
mleich@five.local.lan
6ffbe3d076 Merge five.local.lan:/work/merge/mysql-5.0-build-30418
into  five.local.lan:/work/merge/mysql-5.1-build-31610
2007-11-21 15:06:38 +01:00
mleich@five.local.lan
4922727fb7 This changeset fixes
Bug#31567 "datadict" tests (all engines) fail:
             Reference protocol is non-standard build
   Bug#30418 "datadict" tests (all engines) fail:
             Dependency on the host name for ordering   
Modifications:
   1. The standard builds (build team) do not contain
      the collation 'utf8_general_cs'.
      The common developer builds (compuile-....-max)
      contain this collation.
      Solution fitting to both build variants:
         Exclude the collation 'utf8_general_cs' from
         result sets.
   2. Use mysqltest builtin sorting of result set for
      the statement where the hostname affects the
      row order.
2007-11-21 13:50:17 +01:00
skozlov/ksm@mysql.com/virtop.localdomain
95b65235ba WL#3949, fixed path to combination file 2007-11-21 13:25:14 +03:00
tsmith@ramayana.hindu.god
56b9199ba3 Merge ramayana.hindu.god:/home/tsmith/m/bk/build/b25146/51
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
2007-11-20 20:35:14 -07:00
tsmith@ramayana.hindu.god
6a193c5528 Bug #25146: Some warnings/errors not shown when using --show-warnings
In several cases, an error when processing the query would cause mysql to
return to the top level without printing warnings.  Fix is to always
print any available warnings before returning to the top level.
2007-11-20 17:03:56 -07:00