mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 23:34:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
40732 commits 2778 branches 343 tags 1.6 GiB
Commit graph

40732 commits

This branch
This branch
All branches
Author SHA1 Message Date
df@kahlann.erinye.com
4e76f699b2 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
 2006-12-01 10:20:23 +01:00
df@kahlann.erinye.com
b70cdee8ab Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
 2006-12-01 10:17:27 +01:00
pekka@orca.ndb.mysql.com
b304b3f8e1 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-12-01 10:10:22 +01:00
jonas@perch.ndb.mysql.com
b20c6e69ad ndb - bug#24717 
5.1 version
  remove 5.0 version
  add general routing signal
  send tckeyref routed if needed...
 2006-12-01 09:37:17 +01:00
jonas@perch.ndb.mysql.com
8f4dc87d98 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-12-01 09:14:12 +01:00
jonas@perch.ndb.mysql.com
9d1ff70e85 ndb - bug#24717 
5.0 version
  Add some extra state to try to prevent sending committedread to node too early
 2006-12-01 09:06:01 +01:00
jonas@perch.ndb.mysql.com
3bf0a9d311 ndb - bug#24476 
Fix typo that yeilded rare crash in ACC
 2006-12-01 08:54:28 +01:00
gni/root@ts3-168.ts.cn.tlan
dfd2c8f4fb For merging mysql-5.1-new-ndb-bj tree into mysql-5.1-new-ndb tree 2006-12-01 12:16:25 +08:00
gni/root@ts3-168.ts.cn.tlan
24b1feea03 Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 
into  ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
 2006-12-01 11:35:05 +08:00
pekka@orca.ndb.mysql.com
6758c1679c ndb - bug#21690: fix typo which changed blob parts distribution 2006-12-01 02:06:37 +01:00
mskold/marty@mysql.com/linux.site
4b7e0b5fd9 bug#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: only check pk if it is updated 2006-11-30 23:10:11 +01:00
mskold/marty@linux.site
d0a4d0c5b1 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-11-30 23:00:05 +01:00
mskold/marty@linux.site
5f84f3f428 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-11-30 22:55:06 +01:00
mskold/marty@mysql.com/linux.site
aa03fbcac9 bug#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: only check pk if it is updated 2006-11-30 22:52:23 +01:00
df@kahlann.erinye.com
f1ccd9cb30 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
 2006-11-30 22:47:50 +01:00
df@kahlann.erinye.com
9a6f9c8c44 late after-merge fix 2006-11-30 22:45:55 +01:00
monty@hasky.mysql.fi
425096372f Merge monty@192.168.0.9:/home/my/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-11-30 23:43:33 +02:00
monty@narttu.mysql.fi
693b906f6e Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-11-30 23:27:16 +02:00
monty@mysql.com/narttu.mysql.fi
908ff4b1d1 After merge fixes 
Marked some functions as noreturn
 2006-11-30 23:23:23 +02:00
monty@narttu.mysql.fi
430d215c58 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-11-30 22:38:12 +02:00
monty@mysql.com/narttu.mysql.fi
0a673596a2 Don't abort if we call my_thread_end() multiple times 
Fixed new introduced bug in my_time.c
 2006-11-30 22:00:05 +02:00
monty@mysql.com/narttu.mysql.fi
601e6f4b2a Fixed compiler warnings 
Don't assert if my_thread_end() is called twice (common case)
 2006-11-30 21:56:03 +02:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
45b6bafe4f Bug #24487 Valgrind: uninited byte in table->record[1] in binlog code for rbr + inno db 
The reason of this valgrind's compaint is not a bug but rather a feature of bitwise ops:
for any value of the byte x
x | 1 -> 1,  and x & 0 -> 0.
x, being a null_byte part of record[1] can be left unassigned even after
ha_innobase::index_read_idx because the above and still be correct.
Addding a check memory upon the invocation of the function can detect this fact
long before record[1], old record, is eventually passed to my_write.

Fixed with initialization of record[1]'s null_bytes part in open_table_from_share.
 2006-11-30 19:56:34 +02:00
gkodinov@dl145s.mysql.com
af74fd07b4 Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-11-30 17:59:14 +01:00
gkodinov/kgeorge@macbook.gmz
8b8e820224 Merge bk-internal:/home/bk/mysql-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B11927-5.0-opt
 2006-11-30 18:49:50 +02:00
gkodinov/kgeorge@macbook.gmz
36e7fbc033 func_group.test, func_group.result, func_gconcat.result, func_gconcat.test: 
merge fix : removed undeterministic warnings
 2006-11-30 18:47:59 +02:00
mskold/marty@linux.site
7ef5479520 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-11-30 17:28:08 +01:00
monty@mysql.com/narttu.mysql.fi
3d40956039 Fixed portability issue in my_thr_init.c (was added in my last push) 
Fixed compiler warnings (detected by VC++):
- Removed not used variables
- Added casts
- Fixed wrong assignments to bool
- Fixed wrong calls with bool arguments
- Added missing argument to store(longlong), which caused wrong store method to be called.
 2006-11-30 18:25:05 +02:00
mskold/marty@linux.site
a6f311750f Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-11-30 17:23:54 +01:00
mskold/marty@mysql.com/linux.site
e71c09b482 bug#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: handle INSERT ... ON DUPLICATE KEY UPDATE 2006-11-30 17:22:04 +01:00
mskold/marty@mysql.com/linux.site
e576bf7fa3 bug#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: updated test result 2006-11-30 16:19:55 +01:00
mskold/marty@linux.site
34cfad6486 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-11-30 15:48:28 +01:00
mskold/marty@mysql.com/linux.site
d4a929d741 bug#24303 Wrong result for UPDATE IGNORE for NDB table: bug fix reverted, fix for bug#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key, solves it a better way 2006-11-30 15:44:30 +01:00
mskold/marty@linux.site
d7e375680a Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-11-30 15:31:20 +01:00
mskold/marty@linux.site
2a4de6fc84 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-11-30 15:05:09 +01:00
mskold/marty@mysql.com/linux.site
af324d9cf0 #18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: call peek_index_rows 2006-11-30 15:02:33 +01:00
mskold/marty@linux.site
6db1610c21 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-11-30 14:45:54 +01:00
df@kahlann.erinye.com
c75d099a0b Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
 2006-11-30 13:32:16 +01:00
mskold/marty@mysql.com/linux.site
9169edf348 Removed return of illegal pointer, changed signatures to ndb_mgm_get_clusterlog_severity_filter and ndb_mgm_get_clusterlog_loglevel 2006-11-30 13:30:59 +01:00
df@kahlann.erinye.com
d92eea8687 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2006-11-30 13:27:26 +01:00
df@kahlann.erinye.com
31d0b4e985 minor fix to mtr_process.pl 2006-11-30 13:16:12 +01:00
gkodinov@dl145s.mysql.com
7c94b8012c Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-11-30 12:29:11 +01:00
gkodinov@dl145s.mysql.com
498791908a Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.1 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-11-30 12:27:04 +01:00
gkodinov@dl145s.mysql.com
5a35274b2b Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-4.1-opt 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-11-30 12:23:30 +01:00
gkodinov@dl145s.mysql.com
03431eb78a Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-11-30 12:22:32 +01:00
gkodinov@dl145s.mysql.com
99444d7253 Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-4.1 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-4.1-opt
 2006-11-30 12:20:24 +01:00
gkodinov/kgeorge@macbook.gmz
7464a20bc8 func_gconcat.result, func_gconcat.test: 
disabled warnings because their order is undeterministic
 2006-11-30 12:58:05 +02:00
joerg@trift2.
645aa69dd3 Merge trift2.:/MySQL/M51/push-5.1 
into  trift2.:/MySQL/M51/bug24182-5.1
 2006-11-30 11:05:12 +01:00
joerg@trift2.
1801033139 support-files/mysql.spec.sh : Call "make install" using "benchdir_root=%{_datadir}" (bug#24182). 2006-11-30 11:03:49 +01:00
joerg@trift2.
c680ab4100 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2006-11-30 10:38:54 +01:00