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

46121 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@pilot.blaudden
ffd0d33fd2 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-24 11:18:52 +02:00
mskold/marty@mysql.com/linux.site
25ecc73891 Moved method definition to ease merge to 5.1 2007-04-24 11:17:27 +02:00
msvensson@pilot.blaudden
f028e17ab7 Merge pilot.blaudden:/home/msvensson/mysql/bug14862/my50-bug14862 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-24 11:16:56 +02:00
msvensson@pilot.blaudden
d4cb37e84b Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-24 11:13:38 +02:00
msvensson@pilot.blaudden
a4ee7302e6 Merge pilot.blaudden:/home/msvensson/mysql/my51-m-mysql_upgrade 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-24 11:11:45 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
49b187034d Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b27515/b27515.5.0
 2007-04-24 14:08:03 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
244c192347 after-merge fix 2007-04-24 13:53:12 +05:00
mskold/marty@linux.site
b4b9a326b5 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-04-24 10:39:21 +02:00
mskold/marty@mysql.com/linux.site
c68a4c9c6f Back-ported compiler warning fixes from 5.1 to ease merging 2007-04-24 10:25:15 +02:00
jonas@perch.ndb.mysql.com
da8931cb98 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-04-24 09:53:32 +02:00
knielsen@ymer.(none)
ae8f9ac9f3 Merge ymer.(none):/usr/local/mysql/mysql-5.0-ndb-bug27370 
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
 2007-04-24 09:00:13 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
3935e22459 Merge mysql.com:/home/ram/work/b27515/b27515.5.0 
into  mysql.com:/home/ram/work/b27515/b27515.5.1
 2007-04-24 11:28:18 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
d13861546e after-merge fix 2007-04-24 11:26:40 +05:00
jonas@perch.ndb.mysql.com
542c9e9b5d 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-04-24 08:24:34 +02:00
jonas@perch.ndb.mysql.com
dfa2008911 ndb - bug#21755 
table/index (es) need special treatment...
 2007-04-24 08:22:30 +02:00
knielsen@ymer.(none)
56cf7a53b6 BUG#27370: Potential inconsistent blob reads for ReadCommitted reads. 
The old blob implementation had code that attempted to upgrade the lock mode for
LM_CommittedRead operations, but it did not work properly as it did not recompute
the operation flags.

As a consequence, reading a blob with LM_CommittedRead could return inconsistent
data, with different part of the read data being from different commits done by
other transactions.

The fix is to correctly recompute all necessary flags when upgrading lock mode.
 2007-04-24 08:15:31 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
bb3b6ae72c Merge mysql.com:/home/ram/work/b27515/b27515.4.1 
into  mysql.com:/home/ram/work/b27515/b27515.5.0
 2007-04-24 10:27:59 +05:00
iggy@alf.
2c955476f8 Merge alf.:D:/src/mysql-5.1-maint 
into  alf.:D:/src/mysql-5.1-maint_pt
 2007-04-23 23:24:24 -04:00
iggy@recycle.(none)
45400e5ca3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  recycle.(none):/src/bug24732/my50-bug24732
 2007-04-23 21:49:26 -04:00
iggy@recycle.(none)
f4569bd50c Post Merge Correction 2007-04-23 21:47:21 -04:00
iggy@recycle.(none)
b118b4127b Merge recycle.(none):/src/bug24732/my50-bug24732 
into  recycle.(none):/src/bug24732/my51-bug24732
 2007-04-23 21:44:50 -04:00
iggy@recycle.(none)
5cf930719f Bug#24732 Executables do not include Vista manifests 
- Correct PushBuild failure.
 2007-04-23 21:43:36 -04:00
iggy@recycle.(none)
e251139c80 Merge recycle.(none):/src/mysql-5.1-maint 
into  recycle.(none):/src/mysql-5.1-maint_25141
 2007-04-23 17:04:24 -04:00
iggy@recycle.(none)
ba01167cec Merge recycle.(none):/src/mysql-5.1-maint 
into  recycle.(none):/src/mysql-5.1-maint_27691
 2007-04-23 16:46:17 -04:00
iggy@recycle.(none)
4bde20d175 Bug #27691 bk compilation with VC++ 2005 fails 
- Added appropiate casts.
 2007-04-23 16:42:57 -04:00
iggy@recycle.(none)
4a50d613df Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  recycle.(none):/src/bug24732/my50-bug24732
 2007-04-23 16:36:40 -04:00
iggy@recycle.(none)
7c68e6893c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  recycle.(none):/src/bug24732/my51-bug24732
 2007-04-23 16:35:20 -04:00
iggy@recycle.(none)
13b54aa963 Bug#24732 Executables do not include Vista manifests 
- Post merge cleanup.
 2007-04-23 16:23:32 -04:00
iggy@recycle.(none)
658d2127e5 Merge recycle.(none):/src/bug24732/my50-bug24732 
into  recycle.(none):/src/bug24732/my51-bug24732
 2007-04-23 15:47:26 -04:00
iggy@recycle.(none)
7a358c4b5c Bug#24732 Executables do not include Vista manifests 
- Added script to generate application specific manifest.
- Added new CMake MACRO to add customer build events which will first
generate a manifest and then embeds that manifest into an executable.
 2007-04-23 15:41:24 -04:00
tsmith@quadxeon.mysql.com
12147d9553 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
 2007-04-23 21:36:46 +02:00
tsmith@quadxeon.mysql.com
53985105f9 mysql_upgrade.test: 
Fix minor merge "oopsie"
 2007-04-23 21:27:43 +02:00
iggy@recycle.(none)
193e154ed4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  recycle.(none):/src/bug25621/my50-bug25621
 2007-04-23 14:38:43 -04:00
iggy@recycle.(none)
0b88f8c74c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  recycle.(none):/src/bug25621/my51-bug25621
 2007-04-23 14:37:32 -04:00
iggy@recycle.(none)
b8ac729f9d Merge recycle.(none):/src/bug25621/my50-bug25621 
into  recycle.(none):/src/bug25621/my51-bug25621
 2007-04-23 14:34:10 -04:00
tomas@whalegate.ndb.mysql.com
cf8ef29ca0 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-23 20:30:26 +02:00
iggy@recycle.(none)
30d6cf311a Bug#25621 Error in my_thread_global_end(): 1 threads didn't exit 
- On Windows, connection handlers while exiting properly did not 
decrement the server's thread count.
 2007-04-23 14:28:33 -04:00
tomas@whalegate.ndb.mysql.com
aca5ac19ed new ndb tool to measure replication latency 2007-04-23 20:27:43 +02:00
iggy@recycle.(none)
2a54abd582 Bug#25141 Crash Server on Partitioning command 
- The function build_table_filename() builds up a string unconditionally 
using the forward slash as a path separator. Later, when the string is 
searched for FN_LIBCHAR by the set_up_table_before_create() function, a 
null pointer is returned that is finally used by strlen in the 
append_file_to_dir() function which causes the crash.
 2007-04-23 13:50:34 -04:00
tomas@whalegate.ndb.mysql.com
f24ada7fe6 simple extend of listen_event to do apply on remote cluster 2007-04-23 19:18:46 +02:00
tomas@whalegate.ndb.mysql.com
2029c3c26f Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-23 19:03:08 +02:00
joerg@debian.(none)
08132c7fd7 Merge debian.(none):/M50/push-5.0 
into  debian.(none):/M51/push-5.1
 2007-04-23 18:53:12 +02:00
joerg@debian.(none)
fd409818f6 Merge debian.(none):/M41/push-4.1 
into  debian.(none):/M50/push-5.0
 2007-04-23 18:46:10 +02:00
joerg@debian.(none)
b3398fbbcf Merge debian.(none):/M50/push-5.0 
into  debian.(none):/M51/push-5.1
 2007-04-23 18:39:09 +02:00
joerg@debian.(none)
6ffe87d02c Merge debian.(none):/M50/bug14685-5.0 
into  debian.(none):/M50/push-5.0
 2007-04-23 18:19:03 +02:00
msvensson@pilot.blaudden
4a1fd222ce Don't copy any subdirs in scripts/ 2007-04-23 18:16:57 +02:00
joerg@debian.(none)
3f3e8e90f7 Merge debian.(none):/M51/bug14685-5.1 
into  debian.(none):/M51/push-5.1
 2007-04-23 18:16:48 +02:00
joerg@debian.(none)
c201a6351b Merge debian.(none):/M50/bug14685-5.0 
into  debian.(none):/M51/bug14685-5.1
 2007-04-23 18:12:23 +02:00
gkodinov/kgeorge@magare.gmz
58320dfe42 Merge magare.gmz:/home/kgeorge/mysql/work/B27811-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B27811-5.0-opt
 2007-04-23 19:02:40 +03:00
msvensson@pilot.blaudden
2ac94c30f4 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-23 17:01:02 +02:00