mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 20:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
46897 commits 2794 branches 343 tags 1.5 GiB
Commit graph

46897 commits

This branch
This branch
All branches
Author SHA1 Message Date
stewart@willster.(none)
67510ed258 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
 2007-08-15 10:45:53 +10:00
mskold/marty@mysql.com/linux.site
72155c0966 bug#30337 DELETE ... WHERE PK IN (..) and AFTER DELETE trigger crashes API node: Regenerated result 2007-08-14 10:29:00 +02:00
stewart@willster.(none)
9ee419227c Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
 2007-08-14 15:08:09 +10:00
stewart@willster.(none)
ac9abcf2d4 Backport Magnus' fix from 5.1 
ChangeSet@1.2575, 2007-08-07 19:16:06+02:00, msvensson@pilot.(none) +2 -0
  Bug#26793 mysqld crashes when doing specific query on information_schema
   - Drop the newly created user user1@localhost
   - Cleanup testcase
 2007-08-14 15:07:17 +10:00
mskold/marty@linux.site
e688303f87 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-08-13 17:52:30 +02:00
mskold/marty@mysql.com/linux.site
06b3c9a8b8 bug#30337 DELETE ... WHERE PK IN (..) and AFTER DELETE trigger crashes API node: Added testcase 2007-08-13 15:59:08 +02:00
mskold/marty@mysql.com/linux.site
8dd40ef670 bug#30337 DELETE ... WHERE PK IN (..) and AFTER DELETE trigger crashes API node: Disable multi_read_range if there are after delete/update triggers 2007-08-13 11:36:30 +02:00
msvensson@pilot.(none)
59bebf2904 Bug#26793 mysqld crashes when doing specific query on information_schema 
- Drop the newly created user user1@localhost
 - Cleanup testcase
 2007-08-07 19:16:06 +02:00
cbell/Chuck@mysql_cab_desk.
c3b445304c WL#3228 (NDB) : RBR using different table defs on slave/master 
This patch corrects a incorrect type conversion during encoding and
decoding the length for VARCHAR fields.
 2007-07-29 14:06:11 -04:00
cbell/Chuck@mysql_cab_desk.
04d37af2bc WL#3228 (NDB) : RBR using different table defs on slave/master 
This patch changes the code to comply with different word order on Solaris
 2007-07-28 18:46:21 -04:00
cbell/Chuck@mysql_cab_desk.
93f766ddeb WL#3228 (NDB) : RBR using different table defs on slave/master 
Patch for PB testing errors.
 2007-07-28 11:30:50 -04:00
cbell/Chuck@mysql_cab_desk.
06df6fc137 WL#3915 : (NDB) master's cols > slave 
Patch corrects minor test anomolies and build warnings.
 2007-07-27 23:11:36 -04:00
cbell/Chuck@mysql_cab_desk.
b87fc5c5d4 WL#3915 : (NDB) master's cols > slave 
Minor change to fix compile problems on 64-bit.
 2007-07-27 16:58:23 -04:00
cbell/Chuck@mysql_cab_desk.
b373c3e987 Merge mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3228_ndb 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-ndb-push
 2007-07-27 15:19:05 -04:00
cbell/Chuck@mysql_cab_desk.
b02302f849 Merge mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3228_ndb 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3915_ndb
 2007-07-27 15:05:29 -04:00
cbell/Chuck@mysql_cab_desk.
6509b5b48a 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.

To solve that issue this WL adopts results of WL#3228 which introduces an addon to
table_map event that carries the necessary part of information about sizes of data of columns.

mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@stripped, 2007-07-26 21:31:54-04:00, cbell@mysql_cab_desk. +393 -0
WL#3915  master's cols > slave

basic tests checking altering and skipping extra fields by slave.
The fields can be of any possible types.
 2007-07-27 14:45:57 -04:00
cbell/Chuck@mysql_cab_desk.
17c2da8c2b 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.
 2007-07-27 14:38:36 -04:00
cbell/Chuck@mysql_cab_desk.
74e4da489e 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.
 2007-07-27 13:58:37 -04:00
stewart@willster.(none)
5b992bf8a7 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-merge
 2007-07-27 17:14:07 +10:00
stewart@willster.(none)
3afa32dc2b save the data from mysql.db that we delete (side effect that made read_only fail) 2007-07-27 17:12:53 +10:00
stewart@willster.(none)
a7610f1aa0 point to bugs needing to be addressed before rpl_ndb_ctype_ucs2_def can be enabled 2007-07-27 15:08:51 +10:00
stewart@willster.(none)
7defacf8d2 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-merge 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-merge
 2007-07-26 20:26:06 +10:00
stewart@flamingspork.com[stewart]
f9d977f980 [PATCH] Bug#26793 I_S query crashes in NDB 
If ::exteral_lock hadn't been called, we'd have no NDB object,
so need to check/get one here.

It looks like sql_show.cc is the only place that does this....
or at least the other places will be well hidden.

Index: ndb-work/sql/ha_ndbcluster.cc
===================================================================
 2007-07-26 20:25:05 +10:00
stewart@flamingspork.com[stewart]
76f7cdba81 [PATCH] BUG#26793 test: mysqld crashes in NDB on I_S query 
Reduce case and formalise into something we should be
able to use in mysql-test-run.

Index: ndb-work/mysql-test/t/ndb_bug26793.test
===================================================================
 2007-07-26 20:24:54 +10:00
tomas@whalegate.ndb.mysql.com
81bc79a711 BUG#30017 log-slave-updates incorrect behavior for cluster 
- let the receiving injector thread decide what to do
 2007-07-25 07:24:25 +02:00
tomas@whalegate.ndb.mysql.com
483555d323 wait_until_ready may return greater that 1 since wait time for second node to connect is 0 2007-07-25 07:22:28 +02:00
tomas@whalegate.ndb.mysql.com
d00282ae36 avoid multiple defines of server1/2 2007-07-13 22:21:19 +02:00
tomas@whalegate.ndb.mysql.com
19312c4b43 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-07-13 15:55:59 +02:00
tomas@whalegate.ndb.mysql.com
9d1d7b8f61 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-07-13 15:54:57 +02:00
tomas@whalegate.ndb.mysql.com
af75c3eeec Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-07-13 15:53:58 +02:00
tomas@whalegate.ndb.mysql.com
b46bb155d6 Bug #29762 The ndbapi-examples don't work as expected due to api changes in MySQL 5.1.16] 2007-07-13 15:30:36 +02:00
tomas@whalegate.ndb.mysql.com
a11153663d avoid some sporadic startup issues 2007-07-13 14:31:40 +02:00
tomas@whalegate.ndb.mysql.com
e22ba29c2b fix ndb_version.h so that it is usable and make some functions public to handle ndb version 2007-07-11 14:36:44 +02:00
tomas@whalegate.ndb.mysql.com
658d12aea8 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-07-09 12:15:52 +02:00
tomas@whalegate.ndb.mysql.com
7dd1f323a8 Bug #29570 
- correct result files
 2007-07-09 09:35:27 +02:00
tomas@whalegate.ndb.mysql.com
dc4a4edb8d Bug #29570 original error lost in write_event on slave 
- make sure error gets propagated to thd->net by calling print_error
- also print the full error message
 2007-07-06 12:39:03 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
403c0b35a6 update some description in t/disable.def for testcase rpl_ndb_innodb2ndb and rpl_ndb_myisam2ndb 2007-07-06 16:58:56 +08:00
jonas@perch.ndb.mysql.com
5659314a93 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-07-04 22:45:24 +02:00
jonas@perch.ndb.mysql.com
21da0d2111 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-07-04 22:42:31 +02:00
jonas@perch.ndb.mysql.com
6a6e87fd2e Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-07-04 22:41:41 +02:00
jonas@perch.ndb.mysql.com
42000d3fbe Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-07-04 22:40:39 +02:00
jonas@perch.ndb.mysql.com
dfcfd6afc4 ndb - bug#29354 - fix bug in bug fix, 
dont assert if 2 LCP's are being run during a node recovery
 2007-07-04 22:39:55 +02:00
tomas@whalegate.ndb.mysql.com
8ab2c73d3a backport compute hash 2007-07-04 20:16:42 +02:00
lzhou/zhl@dev3-63.(none)
6f935a3db8 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj 
into  dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug25941
 2007-07-04 17:59:12 +00:00
lzhou/zhl@dev3-63.(none)
1c52e967c1 Merge dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug25941 
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug25941
 2007-07-04 16:32:26 +00:00
jonas@perch.ndb.mysql.com
6d10d4592a Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-07-03 17:23:39 +02:00
jonas@perch.ndb.mysql.com
d46ff21f4f ndb - bug#28720 
fix also undo files
 2007-07-03 17:22:57 +02:00
jonas@perch.ndb.mysql.com
16c184811f Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-07-03 16:57:25 +02:00
jonas@perch.ndb.mysql.com
381b11cefe ndb - bug#28720 - "Disk data meta information is not visible in mysqld but exists in ndbd" 
continue on unknown result (no contact)
 2007-07-03 16:56:35 +02:00
jonas@perch.ndb.mysql.com
2ed75f25ae Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-07-03 16:37:15 +02:00