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
48622 commits 2785 branches 343 tags 1.6 GiB
Commit graph

48622 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
kostja@bodhi.(none)
b89f288143 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-24 23:03:33 +04:00
kostja@bodhi.(none)
2b31b6c3e1 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-24 23:01:05 +04:00
kostja@bodhi.(none)
f3ffe963ea Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-24 22:58:05 +04:00
kostja@bodhi.(none)
4c208499a4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
 2007-07-24 22:57:26 +04:00
malff/marcsql@weblab.(none)
2aeab16a65 Bug#29993 (Default value of log_output should be 'FILE', not 'TABLE') 
Changed the default location of the log output to LOG_FILE,
for backward compatibility with MySQL 5.0
 2007-07-23 22:01:22 -06:00
kostja@bodhi.(none)
cbd6e56ffa Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-21 17:57:32 +04:00
kostja@bodhi.(none)
0e728d1463 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-21 17:54:23 +04:00
kostja@bodhi.(none)
2ecd75ef24 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
 2007-07-21 17:52:16 +04:00
joerg@trift2.
8b5f22a0c3 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-07-21 12:36:37 +02:00
kent@kent-amd64.(none)
9d247f296a Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
 2007-07-21 01:53:19 +02: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
27f11688da Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-21 02:25:39 +05:00
evgen@moonbone.local
e50e8c94fc Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/29898-bug-5.0-opt-mysql
 2007-07-20 22:05:20 +04:00
kostja@bodhi.(none)
a6abf20f2e Fix the coding style. 2007-07-20 19:52:25 +04:00
kostja@bodhi.(none)
6352d006a4 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-20 19:50:55 +04:00
kostja@bodhi.(none)
19ae62f3fb Remove obvious comments. 2007-07-20 19:46:13 +04:00
joerg@trift-lap.none
00ab6d84cf Merge trift-lap.none:/MySQL/M50/push-5.0 
into  trift-lap.none:/MySQL/M51/push-5.1
 2007-07-20 13:53:52 +02:00
joerg@trift-lap.none
1a86cbd26f Merge trift-lap.none:/MySQL/M50/bug14151-5.0 
into  trift-lap.none:/MySQL/M50/push-5.0
 2007-07-20 13:35:23 +02:00
joerg@trift-lap.none
62c0418e73 Merge trift-lap.none:/MySQL/M51/bug14151-5.1 
into  trift-lap.none:/MySQL/M51/push-5.1
 2007-07-20 13:32:41 +02:00
df@pippilotta.erinye.com
3c2baf3e66 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-07-20 11:41:25 +02:00
df@pippilotta.erinye.com
a51493a4a0 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.46 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-07-20 09:20:48 +02:00
gshchepa/uchum@gleb.loc
d53374a0ea Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-20 05:23:33 +05: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
gshchepa/uchum@gleb.loc
c06d233d4d Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-07-20 04:15:50 +05:00
gshchepa/uchum@gleb.loc
c404cd7c9c Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-07-20 04:04:57 +05:00
df@pippilotta.erinye.com
9217908ddd Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.44 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.46
 2007-07-19 23:30:26 +02:00
df@pippilotta.erinye.com
cccecb833b BUG#20815 Errno 12 on Windows after 197 connections 2007-07-19 23:06:34 +02:00
evgen@moonbone.local
08b9103d71 Bug#29898: Item_date_typecast::val_int doesn't reset the null_value flag. 
The Item_date_typecast::val_int function doesn't reset null_value flag.
This makes all values that follows the first null value to be treated as nulls
and led to a wrong result.

Now the Item_date_typecast::val_int function correctly sets the null_value flag
for both null and non-null values.
 2007-07-20 00:06:35 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
c4b12955b3 mysql_client_test fixed 2007-07-20 00:04:30 +05:00
joerg@trift2.
960e895d1d Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-07-19 20:22:29 +02: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
joerg@trift2.
f2dee68c3d Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-07-19 20:04:35 +02:00
evgen@moonbone.local
7a2491871d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/29850-bug-5.0-opt-mysql
 2007-07-19 21:40:12 +04:00
kostja@bodhi.(none)
4c7d2df910 A follow-up fix for Bug#29431 "killing an insert delayed thread causes 
crash" in 5.1
 2007-07-19 21:10:19 +04:00
kostja@bodhi.(none)
5e72901c60 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-19 20:27:35 +04:00
evgen@moonbone.local
934089a82b Bug#29850: Wrong charset of GROUP_CONCAT result when the select employs 
a temporary table.

The result string of the Item_func_group_concat wasn't initialized in the 
copying constructor of the Item_func_group_concat class. This led to a
wrong charset of GROUP_CONCAT result when the select employs a temporary
table.

The copying constructor of the Item_func_group_concat class now correctly
initializes the charset of the result string.
 2007-07-19 20:21:23 +04:00
joerg@trift-lap.none
518992b829 After-merge fix for bug#14151. 2007-07-19 18:05:55 +02:00
holyfoot/hf@hfmain.(none)
db2b40b426 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/hf/work/29687/my51-29687
 2007-07-19 21:03:26 +05:00
holyfoot/hf@hfmain.(none)
1657b9e356 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/29687/my51-29687
 2007-07-19 21:02:11 +05:00
holyfoot/hf@hfmain.(none)
cd70db6656 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/hf/work/29687/my50-29687
 2007-07-19 21:01:58 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
d0272fe1d5 test case for memory leak added 2007-07-19 20:59:11 +05:00
holyfoot/hf@hfmain.(none)
02c81671ce Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/29687/my50-29687
 2007-07-19 20:59:08 +05:00
holyfoot/hf@hfmain.(none)
a49bc17fe8 Merge mysql.com:/home/hf/work/29687/my50-29687 
into  mysql.com:/home/hf/work/29687/my51-29687
 2007-07-19 20:58:04 +05:00
kostja@bodhi.(none)
7ca9124d2e A post-merge fix 2007-07-19 19:56:07 +04:00