mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41253 commits 2785 branches 343 tags 1.6 GiB
Commit graph

41253 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kristofer.Pettersson@naruto.
70c450a18a Merge naruto.:C:/cpp/bug17733/my50-bug17733 
into  naruto.:C:/cpp/bug17733/my51-bug17733
 2006-12-01 11:17:34 +01:00
jonas@perch.ndb.mysql.com
13c44a9197 ndb - bug#24717 
fixes to testprogram to test new impl. in 5.1
 2006-12-01 11:08:53 +01:00
df@kahlann.erinye.com
6dc7e55e9c 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:39:48 +01:00
df@kahlann.erinye.com
e6a2d18421 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
 2006-12-01 10:36:42 +01:00
jonas@perch.ndb.mysql.com
75467cc9f1 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-12-01 10:33:28 +01:00
gkodinov@dl145s.mysql.com
68b63d176e Merge bk-internal:/home/bk/mysql-5.1 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-12-01 10:31:07 +01:00
jonas@perch.ndb.mysql.com
f1722c76a0 ndb - 
fix merge error
 2006-12-01 10:29:45 +01:00
df@kahlann.erinye.com
feb70084d3 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
 2006-12-01 10:27:19 +01:00
jonas@perch.ndb.mysql.com
61c6f532d2 ndb - 
add testcase for bug#24717
 + fix typo
 2006-12-01 10:25:11 +01:00
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
Kristofer.Pettersson@naruto.
6c8d7ea894 Bug#17733 Flushing logs causes daily server crash 
Server crashes if a flush commmand is issued and binlog is closed.
- added check to prevent binlog access when binlog file isn't opened.
 2006-12-01 09:49:19 +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
gni/root@ts3-168.ts.cn.tlan
3be47fe431 Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bj 
into  ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb
 2006-12-01 11:13:43 +08:00
iggy@rolltop.ignatz42.dyndns.org
b457572385 Bug#17951: myisampack --force --silent : abnormal end in Windows XP 
-myisampack wrote to a block on the heap that it did not allocate.
 2006-11-30 21:04:02 -05: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
2311316962 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-11-30 23:12:33 +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
iggy@rolltop.ignatz42.dyndns.org
3add79dd11 Bug#20836 Selecting into variables results in wrong results being returned 
- Post-merge cleanup.
- Disabled this bug's test for 5.x until 16861 is resolved.
 2006-11-30 13:09:48 -05: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
andrey@example.com
dec1ebf6e3 Merge example.com:/work/bug24395-v2/my41 
into  example.com:/work/bug24395-v2/my50

fix for bug#24395 merged into 5.0
 2006-11-30 18:36:15 +01: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
msvensson@neptunus.(none)
5f7f1329ee Merge bk-internal:/home/bk/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-11-30 17:15:05 +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@mysql.com/linux.site
a172df24a9 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-11-30 16:04:12 +01:00
mskold/marty@mysql.com/linux.site
638c294b7f Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-11-30 15:57:43 +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