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

374 commits

Author SHA1 Message Date
gkodinov/kgeorge@magare.gmz
e9be3793fb fixing the 5.1-opt merge of the fix for bug 29571: 
cannot check the statments in the binlog for row based 
replication.
 2007-07-27 17:29:48 +03:00
joerg@debian.(none)
4d9cbaf313 Fix a bad BitKeeper dependency structure for the "funcs_1" suite: 
Step 2:
Restore the 5.1 contents in the 5.0-dependent files.
 2007-07-27 15:41:27 +02:00
mats@kindahl-laptop.dnsalias.net
2d75cab687 BUG#27972 (Test failure for rpl_ndb_circular_simplex): 
Removing a RESET MASTER inside the test since that will change binlog
positions in such a manner that the dual masters lose track of where
they acually are.
 2007-07-27 15:06:46 +02:00
gkodinov/kgeorge@magare.gmz
61a525b6ab portation of the test case for bug 29571 to cover row replication 2007-07-27 15:36:10 +03:00
joerg@debian.(none)
c80ced4111 Fix a bad BitKeeper dependency structure for the "funcs_1" suite: 
The files below "mysql-test/suite/funcs_1" in version 5.1
did not depend on the equivalent ones in 5.0,
probably because they had been checked in independent of each other
in both versions.

Step 1:
Foreach file F in the suite that has a "deleted" counterpart D, use
    bk rm $F
    bk mv $D $F
to get those files into the 5.1 suite that (for BK) depend on 5.0.
 2007-07-27 13:32:32 +02:00
gkodinov/kgeorge@magare.gmz
40e0efeba1 5.0-opt -> 5.1-opt merge of the test case for bug 29571: 
- reset the logs before and after the test.
 - cleanup from the previous tests : use the correct schema.
 2007-07-27 14:28:36 +03:00
joerg@debian.(none)
25f39c08bb Merge debian.(none):/M50/rowlock-5.0 
into  debian.(none):/M51/rowlock-5.1
 2007-07-26 18:40:46 +02:00
joerg@debian.(none)
db5ad35ec9 Merge debian.(none):/M50/rowlock-5.0 
into  debian.(none):/M50/push-5.0
 2007-07-26 18:26:04 +02:00
joerg@debian.(none)
1e455b4c28 Remove the "row_lock" suite from the sources. 
For more information, see WL#3866 and the bugs numbered 28685 and 20390.
 2007-07-26 17:25:03 +02: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@april.(none)
5c83b14b48 Merge mysql.com:/home/svoj/devel/bk/mysql-5.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG29806/mysql-5.1-engines
 2007-07-25 19:58:18 +05:00
svoj@mysql.com/april.(none)
3b18aae71c BUG#29806 - binlog_innodb.test creates a server log 
Stopping mysql server could result in an entry in mysql error
file: "InnoDB: Error: MySQL is freeing a thd".

This happened because InnoDB assumes that the server will never
call external_lock(F_UNLCK) in case external_lock(READ/WRITE)
failed.

Prior to this patch we haven't had strict definition whether
external_lock(F_UNLCK) must be called in case external_lock(READ/WRITE)
fails.

This patch states that we never call external_lock(F_UNLCK) in case
external_lock(READ/WRITE) fails.
 2007-07-25 19:56:17 +05:00
mkindahl@dl145h.mysql.com
bb8831ce1d Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-main 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-2team
 2007-07-25 15:40:43 +02:00
omer@linux.site
ad0c033b84 Updated/fixed test and result files to 5.0.46 
Note datadict files do not include wrong is_updatable wrong value 
     as a result of bug 30020.
 2007-07-24 21:31:25 -07:00
kent@kent-amd64.(none)
60b78f9f1a Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
 2007-07-21 01:52:15 +02:00
gshchepa/uchum@gleb.loc
95d43074cc Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-20 04:21:46 +05:00
joerg@trift2.
7c4f905d55 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-07-19 20:16:27 +02:00
gshchepa/uchum@gleb.loc
35a2a20160 Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-19 20:01:13 +05:00
joerg@trift2.
2285f9d7e1 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-07-17 21:36:51 +02:00
tsmith@ramayana.hindu.god
23695e4e1e Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-07-17 11:33:26 -06:00
istruewing@chilla.local
ba177535f5 Post-merge fixes 
Disabled test cases that produce errors in a "server log".
 2007-07-17 09:25:01 +02:00
joerg@trift-lap.fambruehe
125bc0ad54 Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2007-07-16 19:21:09 +02:00
istruewing@chilla.local
7f6bf17bab Post-merge fix 
Disabled a test that reports Slave SQL error in warnings file.
 2007-07-16 16:12:05 +02:00
istruewing@chilla.local
e819c326ed Post-merge fixes 
Disabled tests which break automatic merging due to
non-empty warnings file.
 2007-07-15 18:47:57 +02:00
istruewing@chilla.local
e307a089a9 Merge chilla.local:/home/mydev/mysql-5.1-amain 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-07-14 19:35:43 +02:00
igor@olga.mysql.com
bec9500ec0 Merge olga.mysql.com:/home/igor/mysql-5.1-rpl 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-merge
 2007-07-13 23:54:41 -07:00
tomas@whalegate.ndb.mysql.com
b0aabc7940 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
 2007-07-13 22:22:02 +02:00
mleich@three.local.lan
f1a6ad4dde Additional tests checking for symptoms observed within 
Bug28309 First insert violates unique constraint - was "memory" table empty ?
---
Add missing phony targets
 2007-07-13 18:32:22 +02:00
tomas@whalegate.ndb.mysql.com
6ecee9d5da update bug dependency on failing test 2007-07-13 16:06:12 +02:00
tnurnberg@mysql.com/sin.intern.azundris.com
3a9e84826e Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
Streamlining test for RBR
 2007-07-11 04:33:19 +02:00
tnurnberg@sin.intern.azundris.com
f1b5fa93ac Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/tnurnberg/22540/51-22540
 2007-07-10 18:38:14 +02:00
tnurnberg@mysql.com/sin.intern.azundris.com
bef7899334 Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
streamlining the test
 2007-07-10 18:31:50 +02:00
tnurnberg@sin.intern.azundris.com
9310ad5f48 Merge mysql.com:/home/tnurnberg/22540/50-22540 
into  mysql.com:/home/tnurnberg/22540/51-22540
 2007-07-10 18:21:06 +02:00
tomas@whalegate.ndb.mysql.com
810db44e4f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
 2007-07-10 09:03:21 +02:00
tomas@whalegate.ndb.mysql.com
503f86f3ba Bug #29570 
- correct result files
 2007-07-10 09:00:15 +02:00
tsmith@sita.local
59c570ba78 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  sita.local:/Users/tsmith/m/bk/maint/51
 2007-07-09 10:33:33 -06:00
tomas@whalegate.ndb.mysql.com
b66fac4fc1 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
 2007-07-09 12:07:33 +02:00
tsmith@sita.local
5cba44239a disabled.def: 
post-merge fix: re-enable rpl_udf test
 2007-07-09 03:31:27 -06: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
ramil/ram@ramil.myoffice.izhnet.ru
f38158f401 Merge mysql.com:/home/ram/work/b29420/b29420.5.0 
into  mysql.com:/home/ram/work/b29420/b29420.5.1
 2007-07-07 12:04:11 +05:00
tsmith@maint1.mysql.com
624f20da9f Many tests have been moved to suite/*. Some tests have been removed. 
Update the disabled.def files to reflect actual contents of the t/* directories.

Also, move a few more tests into suite/*.
 2007-07-04 23:41:15 +02: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
tsmith@sita.local
3bcf0039a6 rpl_misc_functions.result, rpl_misc_functions.test: 
Remove indeterministic behavior from a test
 2007-07-04 12:26:39 -06:00
tsmith@sita.local
4f49d804cf rpl_misc_functions.result, rpl_misc_functions.test: 
work around bug 29537, which was revealed by patch for bug 28356: move DROP TABLE before DROP PROCEDURE in cleanup
 2007-07-03 19:51:32 -06:00
skozlov/ksm@virtop.localdomain
4f62ba081a 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-07-02 22:09:02 +04:00
tnurnberg@sin.intern.azundris.com
a403815e3d Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
minor fixes to appease pushbuild.
---
Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540
 2007-07-02 07:34:42 +02:00
tnurnberg@sin.intern.azundris.com
95b8b0285d Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540
 2007-06-30 03:43:21 +02:00
skozlov/ksm@mysql.com/virtop.localdomain
d1ac082527 Bug#29363 2007-06-29 21:09:00 +04:00
msvensson@pilot.(none)
d84f91ebe8 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-29 10:45:12 +02:00
msvensson@pilot.(none)
68c7cc2af4 Bug#22540 Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
- Update test results for --binlog-format=row
 2007-06-29 09:28:51 +02:00