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

48987 commits

This branch
This branch
All branches
Author SHA1 Message Date
skozlov/ksm@mysql.com/virtop.localdomain
6a58417c09 fixed diff 2007-08-15 18:41:18 +04:00
skozlov/ksm@mysql.com/virtop.localdomain
32ede8aa52 disabled rpl_innodb_mixed_dml 2007-08-15 15:51:27 +04:00
skozlov/ksm@mysql.com/virtop.localdomain
54e5802e5d Fixed path to tmp directory for rpl_mixed_dml.inc 2007-08-15 14:53:14 +04:00
skozlov/ksm@virtop.localdomain
866aa75617 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-13 13:03:33 +04:00
jmiller/ndbdev@ndb08.mysql.com
57df03de46 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql.com:/data2/mysql-5.1-new-rpl-30128-30209
 2007-08-11 00:08:00 +02:00
jmiller/ndbdev@mysql.com/ndb08.mysql.com
cc5c5bed9c rpl_packet.test: 
Changed patch to Mats suggestion from review. Patch is for Bug#30209
.del-wait_for_slave_running_off.inc:
  Delete: mysql-test/include/wait_for_slave_running_off.inc
 2007-08-11 00:07:11 +02:00
cbell/Chuck@mysql_cab_desk.
6497bd2f9e Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
 2007-08-10 15:15:20 -04:00
cbell/Chuck@mysql_cab_desk.
08282643ab Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1_BUG_22086
 2007-08-10 14:58:46 -04:00
cbell/Chuck@mysql_cab_desk.
e8ea4b84c0 BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
This patch adds functionality to row-based replication to ensure the
slave's column sizes are >= to that of the master.

It also includes some refactoring for the code from WL#3228.
 2007-08-10 12:48:01 -04:00
jmiller/ndbdev@mysql.com/ndb08.mysql.com
2ba264d812 rpl_packet.test: 
Updated test to use new include function
wait_for_slave_running_off.inc:
  Created new include to resolve the timing issue recorded by Bug#30209
rpl_events.inc:
  The issue shown in Bug#30128 is that 'from er' shows up in a part of the test that it should not show up in. This event really is not created until later in the test, yet since the test runs row and then turns around and runs statement, I am guessing that the first run may not have cleaned up like it should, so I am adding a sync with master after the drop of table t1 to ensure that both master and slave are clean.
 2007-08-09 23:18:44 +02:00
skozlov/ksm@virtop.localdomain
271178ce70 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-08 21:27:58 +04:00
bar@bar.myoffice.izhnet.ru
2be7a90a9a Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875v2 
into  mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl
 2007-08-07 19:30:23 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
7269c6cc6c Reversing additional change suggested by Serg 
under terms of bug#28875 for better performance.
The change appeared to require more changes in item_cmpfunc.cc,
which is dangerous in 5.0.
    
Conversion between a latin1 column and an ascii string constant
stopped to work.
 2007-08-07 19:25:45 +05:00
skozlov/ksm@virtop.localdomain
48c5305808 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-06 21:41:13 +04:00
mkindahl@dl145h.mysql.com
92d4958eb7 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-2team
 2007-08-03 19:04:59 +02:00
mkindahl@dl145h.mysql.com
ea9848094a Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team
 2007-08-03 18:59:16 +02:00
mkindahl@dl145h.mysql.com
efb82b3aac Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-2team
 2007-08-03 18:56:06 +02:00
mkindahl@dl145h.mysql.com
6cc184aa1b Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
 2007-08-03 17:14:46 +02:00
mkindahl@dl145h.mysql.com
008d2b2537 Fixes to eliminate valgrind warnings. 2007-08-03 17:12:00 +02:00
bar@bar.myoffice.izhnet.ru
fb8dff9721 Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875 
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b28875
 2007-08-03 17:16:02 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
7754da28f9 After merge fix 2007-08-03 15:57:14 +05: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
bar@bar.myoffice.izhnet.ru
c01ce7b1e3 Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875 
into  mysql.com:/home/bar/mysql-work/mysql-5.0-rpl
 2007-08-03 15:30:31 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
4eebfd09c2 Bug#28875 Conversion between ASCII and LATIN1 charsets does not function 
(Regression, caused by a patch for the bug 22646).
Problem: when result type of date_format() was changed from
binary string to character string, mixing date_format()
with a ascii column in CONCAT() stopped to work.
Fix:
- adding "repertoire" flag into DTCollation class,
to mark items which can return only pure ASCII strings.
- allow character set conversion from pure ASCII to other character sets.
 2007-08-03 15:25:23 +05:00
cbell/Chuck@mysql_cab_desk.
f42cf05ad4 WL#3228 (NDB) : RBR using different table defs on slave/master 
This patch removes a portion of the last patch to Field_blob::copy
after problems found during testing of tests using distinct operations.
 2007-08-02 21:18:41 -04: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
cbell/Chuck@mysql_cab_desk.
62f8d8c64a Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1
 2007-08-02 15:15:48 -04:00
ramil/ram@ramil.myoffice.izhnet.ru
0d9301585b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b30088/b30088.5.0
 2007-08-02 18:23:23 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e8eaca54a3 After-merge fix: result adjusted. 2007-08-02 17:14:48 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
7512856c31 Merge mysql.com:/home/ram/work/b30088/b30088.5.0 
into  mysql.com:/home/ram/work/b30088/b30088.5.1
 2007-08-02 16:56:32 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
54ddf93240 Merge mysql.com:/home/ram/work/b30200/b30200.5.0 
into  mysql.com:/home/ram/work/b30200/b30200.5.1
 2007-08-02 15:26:52 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
dc84a5fd52 Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol 
Problem: thd->thread_specific_used flag is not set executing a statement
containig connection_id() function using PS protocol, that leads to 
improper binlog event creation.

Fix: set the flag in the Item_func_connection_id::fix_fields().
 2007-08-02 14:51:03 +05:00
tsmith@ramayana.hindu.god
0f6f44424f Post-merge fix. Update some test results, and add an InnoDB-only 
compatibility hook, thd_mark_transaction_to_rollback().
 2007-08-02 02:22:31 -06:00
tsmith@ramayana.hindu.god
b13de9343f Merge 50 -> 51 (-opt changesets) 2007-08-01 18:59:41 -06:00
tsmith@ramayana.hindu.god
d66b4bd4be Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-01 18:41:02 -06: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
tsmith@ramayana.hindu.god
534c3f325d Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-01 18:39:13 -06:00
tsmith@ramayana.hindu.god
9d09389ccb Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
 2007-08-01 18:38:43 -06:00
tsmith@ramayana.hindu.god
76366d7931 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-01 18:33:07 -06:00
tsmith@ramayana.hindu.god
181da56554 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-01 18:32:39 -06:00
tsmith@ramayana.hindu.god
7509e1ed24 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-01 18:32:01 -06:00
tsmith@ramayana.hindu.god
33c4cdaa66 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-01 18:30:55 -06:00
tsmith@ramayana.hindu.god
c2399f04d0 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-build 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
 2007-08-01 18:30:28 -06:00
tsmith@ramayana.hindu.god
c215bd28c1 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-01 18:19:28 -06:00
tsmith@ramayana.hindu.god
4e20ec041c Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-01 18:16:23 -06:00
tsmith@ramayana.hindu.god
9ce717b0fe Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-01 18:15:24 -06:00
tsmith@ramayana.hindu.god
8575227571 Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-01 18:14:50 -06:00
tsmith@ramayana.hindu.god
ffc2f3ab99 Merge ramayana.hindu.god:/home/tsmith/m/bk/41 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
 2007-08-01 18:12:44 -06:00
tsmith@ramayana.hindu.god
54254530ad Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/jul31/51
 2007-08-01 17:34:20 -06:00