mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
51316 commits 2780 branches 343 tags 1.6 GiB
Commit graph

51316 commits

This branch
This branch
All branches
Author SHA1 Message Date
hezx@hezx.(none)
ef8606b3cb fix manual merge 2007-12-13 10:40:39 +08:00
hezx@hezx.(none)
81f04074ca Merge hezx.(none):/media/hda5/work/mysql/bkwork/bug#30998/mysql-5.0-rpl 
into  hezx.(none):/media/hda5/work/mysql/bkwork/bug#30998/merge-mysql-5.1-new-rpl
 2007-12-12 15:43:52 +08:00
hezx@hezx.(none)
90bb675975 Merge hezx.(none):/media/hda5/work/mysql/bkroot/mysql-5.1-new-rpl 
into  hezx.(none):/media/hda5/work/mysql/bkwork/bug#30998/5.1
 2007-12-12 15:02:28 +08:00
hezx@hezx.(none)
a85e8a3f21 Merge hezx.(none):/media/hda5/work/mysql/bkroot/mysql-5.0-rpl 
into  hezx.(none):/media/hda5/work/mysql/bkwork/bug#30998/5.0
 2007-12-11 17:34:37 +08: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
bar@mysql.com/bar.myoffice.izhnet.ru
25debb1db6 sql_string.cc: 
Fixing a wrong comment.
 2007-12-05 12:26:21 +04:00
hezx@hezx.(none)
0e0f2feb78 Bug#30998 Drop View breaks replication if view does not exist 
When executing drop view statement on the master, the statement is not written into bin-log if any error occurs, this could cause master slave inconsistence if any view has been dropped. 

If some error occured and no view has been dropped, don't bin-log the statement, if at least one view has been dropped the query is bin-logged possible with an error.
 2007-12-03 16:54:44 +08:00
hezx@hezx.(none)
c267a923a3 Bug#30998 Drop View breaks replication if view does not exist 
When executing drop view statement on the master, the statement is written
into bin-log without checking for possible errors, so the statement would 
always be bin-logged with error code cleared even if some error might occur, 
for example, some of the views being dropped does not exist. This would cause 
failure on the slave.

Writing bin-log after check for errors, if at least one view has been dropped
the query is bin-logged possible with an error.
 2007-12-03 13:11:40 +08: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
mats@capulet.kindahl.net
6168d3e14f Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  capulet.kindahl.net:/home/bk/mysql-5.0-rpl
 2007-11-22 21:59:36 +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