mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
60048 commits 2778 branches 343 tags 1.6 GiB
Commit graph

1555 commits

Author SHA1 Message Date
omer@linux.site
6e06cb855f Updated to result files for cluster tests for version 5.1.21 
Updared to 'views' test - forcing sort order
Updateds included masked results as a result of bug 30322
 2007-08-08 17:16:26 -07:00
omer@linux.site
36ff199535 Updated funcs_1 test and result files (not including cluster) for 5.1.21 2007-08-06 18:46:00 -07:00
gkodinov/kgeorge@magare.gmz
0ac8d08959 Bug 29536 : error message changed 5.0-opt -> 5.1-opt 2007-08-06 06:55:50 -07:00
gkodinov/kgeorge@magare.gmz
5af5954ab5 Merge magare.gmz:/home/kgeorge/mysql/work/B29536-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B29536-5.1-opt
 2007-08-06 06:34:21 -07:00
gkodinov/kgeorge@magare.gmz
e53af13d1e rpl_row_tabledefs_2myisam.result: 
merged 5.1-main to 5.1-opt : error numbers changed.
Many files:
   merged 5.1-main to 5.1-opt : error numbers changed
rpl_extraCol_innodb.result:
  merged 5.1-main to 5.1-opt : error numbers changed
 2007-08-05 14:02:33 +03:00
igor@olga.mysql.com
a5e4e70100 Merge olga.mysql.com:/home/igor/mysql-5.1 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-merge
 2007-08-04 22:36:54 -07:00
df@pippilotta.erinye.com
f0f9652988 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-08-04 11:08:11 +02:00
gkodinov/kgeorge@magare.gmz
b2661dd379 Merge magare.gmz:/home/kgeorge/mysql/work/B25228-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B25228-5.1-opt
 2007-08-03 15:44:40 +03:00
skozlov/ksm@virtop.localdomain
ba2e666e6c 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-08-03 14:45:26 +04:00
gshchepa@dl145s.mysql.com
c342712b35 Many files: 
Post-merge fix.
 2007-08-03 12:37:00 +02:00
gluh@mysql.com/eagle.(none)
27ab885525 WL#3732 Information schema optimization 2007-08-03 03:14:05 +05:00
cbell/Chuck@mysql_cab_desk.
e8aff50790 WL#3228 (NDB) : RBR using different table defs on slave/master 
This patch corrects a problem found during testing on Solaris. The code
changes how length values are retrieved on big endian machines. The
patch allows the rpl_extraColmaster tests to run on these machines.
 2007-08-02 16:15:52 -04: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
tsmith@ramayana.hindu.god
a52a078f75 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-01 18:40:02 -06:00
skozlov/ksm@mysql.com/virtop.localdomain
03411dff65 Fix for Bug#28744, bug#29363 2007-08-01 14:52:10 +04:00
gkodinov/kgeorge@magare.gmz
d4329ea783 Addendum to bug 27417: poor test results fixes. 2007-07-31 18:04:05 +03:00
gkodinov/kgeorge@magare.gmz
992698ce5f merge of the fix for bug 17417 5.0-opt->5.1-opt 2007-07-31 14:58:04 +03:00
omer@linux.site
ce5044072e Merge obarnir@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  linux.site:/home/omer/source/jrg51
 2007-07-30 11:09:37 -07:00
cbell/Chuck@mysql_cab_desk.
11fc097e8d WL#3915 : (NDB) master's cols > slave 
Corrective patch to fix test failures in pushbuild and add assertions
to help debug rpl_extraColmaster test failures.
 2007-07-30 12:55:26 -04:00
gkodinov/kgeorge@magare.gmz
cfbfb8bae8 (Pushing for Andrei) 
Merge magare.gmz:/home/kgeorge/mysql/work/B27417-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/B27417-5.1-opt
 2007-07-30 19:02:21 +03:00
cbell/Chuck@mysql_cab_desk.
0950f6435c WL#3915 : (NDB) master's cols > slave 
Changed test to enable easier debugging.
 2007-07-30 11:59:05 -04:00
omer@linux.site
971bc31dea Merge linux.site:/home/omer/source/bld50_0724 
into  linux.site:/home/omer/source/jrg51
 2007-07-30 08:37:33 -07:00
cbell/Chuck@mysql_cab_desk.
aa36211b28 WL#3228 (NDB) : RBR using different table defs on slave/master 
This patch includes changes to result files for tests issuing BINLOG
queries. The values have changed due to a size difference in the
table map.
 2007-07-30 10:22:42 -04:00
mats@kindahl-laptop.dnsalias.net
23857a5804 WL#3228 (RBR using different table defs on slave/master): 
Fixing tests and results to work when replicating to fewer columns on
slave than on master. One test that previously should fail, now works,
and some log positions have changed as a result of adding metadata to
the events.
 2007-07-30 13:32:15 +02:00
joerg@trift2.
315ece5d8f Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-07-30 11:15:14 +02:00
cbell/Chuck@mysql_cab_desk.
537c23e833 WL#3228 (NDB) : RBR using different table defs on slave/master 
This patch adds the ability to store extra field metadata in the table
map event. This data can include pack_length() or field_lenght() for
fields such as CHAR or VARCHAR enabling developers to add code that
can check for compatibilty between master and slave columns. More 
importantly, the extra field metadata can be used to store data from the
master correctly should a VARCHAR field on the master be <= 255 bytes 
while the same field on the slave is > 255 bytes. 

The patch also includes the needed changes to unpack to ensure that data
which is smaller on the master can be unpacked correctly on the slave.

WL#3915 : (NDB) master's cols > slave

Slave starts accepting and handling rows of master's tables which have more columns.
The most important part of implementation is how to caclulate the amount of bytes to
skip for unknown by slave column.
 2007-07-29 18:10:42 -04:00
mats@kindahl-laptop.dnsalias.net
8f01f9d02c Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b27972-mysql-5.1-rpl
 2007-07-29 20:04:07 +02:00
gshchepa/uchum@gleb.loc
557c52ea47 Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-28 21:26:01 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
ce2410dd1e rpl_session_var.test fixed to not depend on mysql_test_run parameters 2007-07-28 14:10:56 +05:00
holyfoot/hf@hfmain.(none)
642b0c00ed Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/29878/my51-29878
 2007-07-28 00:50:17 +05:00
holyfoot/hf@hfmain.(none)
37dece087e Merge mysql.com:/home/hf/work/29878/my50-29878 
into  mysql.com:/home/hf/work/29878/my51-29878
 2007-07-27 22:43:33 +05:00
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