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

31752 commits

This branch
This branch
All branches
Author SHA1 Message Date
rburnett@bk-internal.mysql.com
b81b102530 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
 2006-08-22 19:01:56 +02:00
rburnett@production.mysql.com
df063e0c93 mysqld.cc: 
var was already defined so had to remove extra one
 2006-08-21 16:36:03 +02:00
rburnett@production.mysql.com
ef58228620 Merge production.mysql.com:/usersnfs/rburnett/tmp_merge 
into  production.mysql.com:/usersnfs/rburnett/mysql-5.0-kt
 2006-08-21 16:14:06 +02:00
rburnett@production.mysql.com
19f93ba4a5 Merge production.mysql.com:/usersnfs/rburnett/tmp_merge 
into  production.mysql.com:/usersnfs/rburnett/mysql-5.0-kt
 2006-08-21 16:08:20 +02:00
rburnett@bk-internal.mysql.com
f669f944e5 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
 2006-08-21 14:41:50 +02:00
jani@hasky.mysql.fi
6dc1122084 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  hasky.mysql.fi:/home/jani/mysql-5.0_bug21537
 2006-08-21 13:06:45 +03:00
holyfoot/hf@mysql.com/deer.(none)
54e28cc90c Merge mysql.com:/home/hf/work/mysql-4.1.15440 
into  mysql.com:/home/hf/work/mysql-5.0-mrg
 2006-08-20 20:47:32 +05:00
holyfoot/hf@mysql.com/deer.(none)
75be244cc7 Merge mysql.com:/home/hf/work/mysql-4.1.13717 
into  mysql.com:/home/hf/work/mysql-5.0-mrg
 2006-08-20 20:46:26 +05:00
holyfoot/hf@mysql.com/deer.(none)
4d8e38a693 bug #16513 (no mysql_set_server_option in libmysqld.dll export) 2006-08-19 15:15:36 +05:00
petr/cps@mysql.com/owlet
30ef47a93c Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
 2006-08-18 16:48:32 +04:00
cmiller@zippy.cornsilk.net
64092ca93b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
 2006-08-17 10:55:57 -04:00
cmiller@zippy.cornsilk.net
6998c5140b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
 2006-08-17 10:53:12 -04:00
cmiller@zippy.cornsilk.net
7d38d61398 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
 2006-08-17 10:49:56 -04:00
cmiller@zippy.cornsilk.net
030ddb48f3 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
 2006-08-17 10:47:23 -04:00
cmiller@zippy.cornsilk.net
c627a6ce84 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
 2006-08-17 10:42:50 -04:00
iggy@rolltop.ignatz42.dyndns.org
00ab7be7b9 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-merge
 2006-08-16 19:31:33 -04:00
iggy@rolltop.ignatz42.dyndns.org
af844dbed6 manual merge 2006-08-16 19:19:49 -04:00
iggy@rolltop.ignatz42.dyndns.org
ca6532af50 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_20328
 2006-08-16 16:16:10 -04:00
iggy@rolltop.ignatz42.dyndns.org
a86f035a08 Bug#20328 - Correction to test/result for broken Windows build. 2006-08-16 13:55:16 -04:00
jani@ua141d10.elisa.omakaista.fi
88b91d1e02 Fix for bug#21537, "Error at startup" 
These variables must be defined for Netware, or it fails
to recognize hard paths starting from the device.
 2006-08-16 19:30:46 +03:00
rburnett@bk-internal.mysql.com
38a36da86d Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
 2006-08-16 17:47:20 +02:00
reggie@big_geek.
55165b2f55 small fix to enable the test suite to find executables and scripts on Windows 2006-08-16 10:19:48 -05:00
msvensson@shellback.(none)
da60a5194c Merge shellback.(none):/home/msvensson/mysql/bug20328/my50-bug20328 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-16 17:14:40 +02:00
msvensson@shellback.(none)
98eaa07600 Bug#20328 mysql client: dumb about trailing spaces on 'help' command 
Fix testcase to also work on windows
 2006-08-16 17:03:41 +02:00
rburnett@bk-internal.mysql.com
8baecf7ed6 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
 2006-08-16 16:04:10 +02:00
msvensson@shellback.(none)
27a4154631 Merge shellback.(none):/home/msvensson/mysql/bug20219/my50-bug20219 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-16 15:52:52 +02:00
msvensson@shellback.(none)
b963293595 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-16 15:50:50 +02:00
msvensson@shellback.(none)
ba1ac55acf Bug#20219 make bin-dist produces unportable for testing tarball 
- Setup LD_LIBRARY_PATH to favor local libs
 2006-08-16 15:25:30 +02:00
holyfoot/hf@mysql.com/deer.(none)
c965eea789 Merge bk@192.168.21.1:mysql-5.0-kt 
into  mysql.com:/home/hf/work/mysql-5.0.20910
 2006-08-16 09:57:05 +05:00
ramil/rkalimullin@production.mysql.com
4ef5116425 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  production.mysql.com:/usersnfs/rkalimullin/mysql-5.0
 2006-08-16 06:37:39 +02:00
mskold/marty@mysql.com/linux.site
36042d81e4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
 2006-08-15 22:18:41 +02:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
711b592701 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  xiphis.org:/opt2/tmp/autopush/mysql-5.0-fixbuild
 2006-08-15 10:31:39 -07:00
petr/cps@mysql.com/owlet
472279cec4 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
 2006-08-15 19:11:12 +04:00
rburnett@bk-internal.mysql.com
8d5e2dd644 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
 2006-08-15 17:02:08 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b65bf3b4da Merge mysql.com:/usr/home/ram/work/tmp_merge 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2006-08-15 19:41:23 +05:00
mskold/marty@mysql.com/linux.site
3b42e84c44 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
 2006-08-15 15:57:36 +02:00
holyfoot/hf@mysql.com/deer.(none)
81764f89cf Merge bk@192.168.21.1:mysql-5.0-kt 
into  mysql.com:/home/hf/work/mysql-5.0.20910
 2006-08-15 18:15:12 +05:00
mskold/marty@mysql.com/linux.site
c8b93da355 Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: do not release operation records for on-going read_multi_range 2006-08-15 14:31:21 +02:00
mskold/marty@mysql.com/linux.site
66e8255491 Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
 2006-08-15 13:37:39 +02:00
mskold/marty@mysql.com/linux.site
6a3143e2a0 ndb_lock.test, ndb_lock.result: 
bug #18184  SELECT ... FOR UPDATE does not work..: New test case
ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
 2006-08-15 13:12:27 +02:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
4c57a94b78 fix windows build 2006-08-15 01:54:14 -07:00
bar@mysql.com/bar.intranet.mysql.r18.ru
9f6c76eb20 Merge mysql.com:/usr/home/bar/mysql-4.1.b19741 
into  mysql.com:/usr/home/bar/mysql-5.0.b19741merge
 2006-08-15 12:04:51 +05:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
e2d4aa2ca4 Merge xiphis.org:/home/antony/work2/mysql-5.0-engines 
into  xiphis.org:/home/antony/work2/mysql-5.0-merge
 2006-08-14 21:27:36 -07:00
rburnett@production.mysql.com
0199dda5a6 My previous change of replacing the call to sprintf with some memcpy type routines was not correct. This patch reverts that. 
mysql_client_test.c:
  reverting my previous change
 2006-08-14 20:48:37 +02:00
msvensson@neptunus.(none)
d04ce2df7a Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-14 20:17:46 +02:00
msvensson@neptunus.(none)
91c2e68c2b Bug#21327 OpenSSL-checking in configure 
- Change $d to $libs as suggested.
 - Thanks to Michael Prohm for the patch!
 2006-08-14 20:16:47 +02:00
brian@zim.(none)
c43a332859 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/dep-5.0
 2006-08-14 09:45:41 -07:00
kostja@bodhi.local
d03b39aaab Fix a test case (proper clean up). 2006-08-14 19:18:33 +04:00
rburnett@bk-internal.mysql.com
4bb7715482 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
 2006-08-14 17:13:31 +02:00
svoj@may.pils.ru
91e94d781f Merge may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-5.0
 2006-08-14 18:08:33 +05:00