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

18249 commits

Author SHA1 Message Date
stewart@willster.(none)
8f3ac043e8 Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20839
 2006-10-26 21:29:27 +10:00
mskold/marty@mysql.com/linux.site
bf365af0bd Bug #21072 Duplicate key error in NDB references wrong key: Re-wrote string usage to avoid valgrind warnings 2006-10-25 15:34:47 +02:00
stewart@willster.(none)
1f05ac4ac3 post merge fixes (from merging test fixes from bug 19914) 2006-10-25 20:37:10 +10:00
stewart@willster.(none)
d5810cd067 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
 2006-10-25 18:41:17 +10:00
jonas@perch.ndb.mysql.com
5230dcebcc 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
 2006-10-25 08:45:06 +02:00
jonas@perch.ndb.mysql.com
6e4a0ec042 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-10-25 08:28:30 +02:00
stewart@willster.(none)
dc38d0249a fix ndb_cache_multi2 
util thread wasn't behaving correctly after 241 error due to get_table_statistics
not properly returning an error code
 2006-10-24 23:26:58 +10:00
mskold/marty@mysql.com/linux.site
0067cd8a4a bug#21873 MySQLD Crash on ALTER...ADD..UNIQUE..USING HASH statement for NDB backed table: Use passed key_info to check for nullable fields 2006-10-24 12:24:32 +02:00
mskold/marty@mysql.com/linux.site
8da80dd39d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-10-24 08:29:37 +02:00
stewart@willster.(none)
826628c99b post merge fix 2006-10-24 00:18:57 +10:00
stewart@willster.(none)
3c2eeb2c15 Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2 
into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
 2006-10-23 23:57:28 +10:00
stewart@willster.(none)
5926602aa7 Bug #19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables 
fixes for ndb_* tests broken by previous fix

be more careful in ndb about setting errors on failure of info call (especially
in open)
 2006-10-23 23:46:35 +10:00
stewart@willster.(none)
fc776db8e7 Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2 
into  willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2
 2006-10-23 23:43:48 +10:00
jonas@perch.ndb.mysql.com
11b4ac4733 ndb - bug#22838 
when doing create unique index which mysql will silently converts to PK, ndb is not informed
    so table will be useless.
  
    change so that we never do online add index wo/ primary key.
    this is not good, but it's better than a useless table
 2006-10-20 14:35:59 +02:00
mskold/marty@linux.site
dfa91a4043 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-10-19 15:29:52 +02:00
mskold/marty@mysql.com/linux.site
a1b40c1679 Bug #21072 Duplicate key error in NDB references wrong key: use MAX_KEY to signal unknown key: Added string initialization 2006-10-19 15:22:50 +02:00
mskold/marty@mysql.com/linux.site
6961bd6315 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-10-19 15:08:10 +02:00
mskold/marty@mysql.com/linux.site
b97dff67c9 Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
 2006-10-19 15:00:46 +02:00
mskold/marty@mysql.com/linux.site
240cd87dbf Bug #21072 Duplicate key error in NDB references wrong key: use MAX_KEY to signal unknown key: Added string initialization 2006-10-19 14:57:04 +02:00
jonas@perch.ndb.mysql.com
d82797ec8f Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-19 11:23:34 +02:00
jonas@perch.ndb.mysql.com
e3d84b36db Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-10-19 10:29:52 +02:00
jonas@perch.ndb.mysql.com
470e4daa14 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-10-19 09:38:37 +02:00
jonas@perch.ndb.mysql.com
2b04fb22be ndb - bug#23200 
this changes lock taken during peek, to decrease likelyhood of transaction abort
 2006-10-19 09:27:58 +02:00
mskold/marty@mysql.com/linux.site
0522b11066 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-10-18 16:41:17 +02:00
mskold/marty@linux.site
f56e4579ab Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-10-18 15:17:47 +02:00
stewart@willster.(none)
0783b57bc7 BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables 
update partition engine for handler::info returning int
 2006-10-18 22:31:48 +10:00
mskold/marty@mysql.com/linux.site
b381ed95d9 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-10-18 14:28:18 +02:00
mskold/marty@linux.site
3d8a932029 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-10-18 14:06:32 +02:00
stewart@willster.(none)
71636edc16 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
 2006-10-18 18:51:39 +10:00
mskold/marty@linux.site
ad7f7feea9 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-10-17 15:20:09 +02:00
pekka@orca.ndb.mysql.com
889b3a00b5 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
 2006-10-17 09:43:47 +02:00
stewart@willster.(none)
4de3c4bf1e Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-is_files_refactor
 2006-10-17 14:27:26 +10:00
mikael/pappa@dator5.(none)
4a7cd3a1cb Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug18198
 2006-10-16 15:40:40 -04:00
stewart@willster.(none)
49124e987c BUG#20839 Illegal error code: 155 returned downgrading from 5.1.12-> 5.1.11 
post-review fixes.

Magnus suggested use of DYNAMIC_STRING instead of futzing with c strings.
also making usage of TABLEs clearer in store_schema_partitions_record.
 2006-10-17 01:02:12 +10:00
mskold/marty@mysql.com/linux.site
18d2e733d8 Bug #21072 Duplicate key error in NDB references wrong key: Added new printout for duplicate key error when key is unknown 2006-10-16 12:14:38 +02:00
pekka@orca.ndb.mysql.com
6b6cac0ded Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug21191
 2006-10-16 11:44:53 +02:00
mskold/marty@linux.site
2c0208a44b Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-10-16 10:42:04 +02:00
mskold/marty@mysql.com/linux.site
e7f69b424a Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
 2006-10-16 10:07:19 +02:00
stewart@willster.(none)
fff4559edd BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables 
update federated for fix
 2006-10-16 17:41:29 +10:00
stewart@willster.(none)
c1903d967a Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2 
into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge
 2006-10-16 17:39:38 +10:00
mskold/marty@mysql.com/linux.site
aafe6e4663 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
 2006-10-16 08:33:22 +02:00
pekka@orca.ndb.mysql.com
e52bd4be2b Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug21191
 2006-10-15 12:11:52 +02:00
jonas@perch.ndb.mysql.com
ca4e9be98f Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-10-11 14:02:43 +02:00
msvensson@neptunus.(none)
5b24780877 Merge bk-internal:/home/bk/mysql-5.1-rpl 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-10-11 10:16:46 +02:00
msvensson@neptunus.(none)
ed250c1763 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-10-11 10:01:43 +02:00
lars@black.(none)
0b4e65e12b Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
 2006-10-10 21:59:23 +02:00
mats@romeo.(none)
1023aecb1c Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/b21474-mysql-5.1-new-rpl
 2006-10-10 15:26:02 +02:00
mats@romeo.(none)
6c3b1f6eb0 BUG#21474 (There is a rotation before the last table map): 
Removing code to step the group log position and just stepping
the event log position.  If the group log position were stepped
one time too many, it might be that the group starts at a position
that is not possible, e.g., at a Rows_log_event, or between an
Intvar_log_event and the following associated Query_log_event.
 2006-10-10 15:18:21 +02:00
mats@romeo.(none)
799585c5ac Fixes to make replication team tree build on Windows. 2006-10-10 14:58:40 +02:00
jonas@perch.ndb.mysql.com
e600a3d394 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-10 11:25:24 +02:00