mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
48626 commits 2790 branches 343 tags 1.7 GiB
Commit graph

21904 commits

Author SHA1 Message Date
cbell/Chuck@mysql_cab_desk.
ac1767df09 WL#3228 (NDB) : RBR using different table defs on slave/master 
Minor refactoring to remove compile warnings and possibly fix the
Solaris test failures.
 2007-07-30 17:39:54 -04: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
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
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)
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
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)
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
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
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
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
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
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
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
kostja@bodhi.(none)
f4cf4cbd36 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-19 19:42:24 +04:00
kostja@bodhi.(none)
c4bcce64a4 Rename all references to 'Delayed_insert' instances from 'tmp' to 'di' 
for consistency.
 2007-07-19 19:36:52 +04:00
kostja@bodhi.(none)
1aae30060e A fix for Bug#29431 killing an insert delayed thread causes crash 
No test case, since the bug requires a stress case with 30 INSERT DELAYED
threads and 1 killer thread to repeat. The patch is verified
manually.
Review fixes.

The server that is running DELAYED inserts would deadlock itself
or crash under high load if some of the delayed threads were KILLed
in the meanwhile.

The fix is to change internal lock acquisition order of delayed inserts
subsystem and to ensure that
Delayed_insert::table_list::db does not point to volatile memory in some 
cases.
For details, please see a comment for sql_insert.cc.
 2007-07-19 19:28:00 +04: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
gshchepa/uchum@gleb.loc
d5f2133bc3 Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-07-19 19:57:53 +05:00
joerg@trift-lap.none
7b703eaa12 Merge trift-lap.none:/MySQL/M50/bug14151-5.0 
into  trift-lap.none:/MySQL/M51/bug14151-5.1
 2007-07-19 15:11:01 +02:00
joerg@trift-lap.none
af3c675bc1 Avoid the name conflict between the system-provided "md5.h" and the MySQL one 
by renaming "include/md5.h" to "include/my_md5.h".

Fixes bug#14151.
 2007-07-19 14:14:03 +02:00
cmiller@zippy.cornsilk.net
4463163c11 Re-set the plugin name so that we can be sure the plugin init() 
function doesn't set it to something else.
 2007-07-18 13:37:56 -04:00
cmiller@zippy.cornsilk.net
5d0b7dea04 Move the filling of the table_name column above the initialization, 
so that the init function has access to the name.
 2007-07-18 12:27:54 -04:00
kent@mysql.com/kent-amd64.(none)
4ca632bfc3 CMakeLists.txt, configure.js: 
Allow to set mysqld exe suffix
 2007-07-18 15:53:10 +02:00
gkodinov/kgeorge@magare.gmz
f6225e2048 Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-5.1-opt
 2007-07-18 15:56:29 +03:00
kostja@bodhi.(none)
9bac763cc1 A fix and a test case for Bug#26104 Bug on foreign key class constructor. 
Fix the typo in the constructor. Cover a semantic check that previously
never worked with a test.
 2007-07-18 16:22:05 +04:00
sergefp@mysql.com
4f579b8d0e Mark deadcode for gcov 2007-07-18 11:12:15 +04:00
sergefp@mysql.com
2e21c6e771 Mark deadcode for gcov 2007-07-18 00:29:25 +04:00
joerg@trift2.
1c19f191a4 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-07-17 21:40:36 +02:00
sergefp@mysql.com
b38206978d Small comments fix 2007-07-17 22:46:51 +04: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
tsmith@ramayana.hindu.god
e84e86c156 Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-07-17 11:32:50 -06:00
sergefp@pylon64.mylan
82973c72ae Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/psergey/mysql-5.0-bug29740
 2007-07-17 19:53:33 +04:00
sergefp@mysql.com
651e6ffa66 [pb problem]: ha_heap->clone() fails on windows because of mess with 
'/' and '\' in path delimiters:
- Fix this by creating new handler with exactly the same path line as
  was passed to ha_create/ha_open.
 2007-07-17 19:51:50 +04:00
kostja@bodhi.(none)
6b3784870c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-17 13:10:02 +04:00
kostja@bodhi.(none)
948ba7b7fb Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
 2007-07-17 13:08:23 +04:00
tnurnberg@sin.intern.azundris.com
c01fe97165 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  sin.intern.azundris.com:/home/tnurnberg/27198/51-27198
 2007-07-17 09:39:44 +02:00
tnurnberg@sin.intern.azundris.com
bc3b442998 Merge sin.intern.azundris.com:/home/tnurnberg/27198/50-27198 
into  sin.intern.azundris.com:/home/tnurnberg/27198/51-27198
 2007-07-17 08:23:43 +02:00
tnurnberg@sin.intern.azundris.com
261acdbbea Merge sin.intern.azundris.com:/home/tnurnberg/27198/41-27198 
into  sin.intern.azundris.com:/home/tnurnberg/27198/50-27198
 2007-07-17 06:59:24 +02:00