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

32996 commits

This branch
This branch
All branches
Author SHA1 Message Date
monty@mysql.com
adb59d9284 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/my/mysql-5.1
 2006-04-19 08:56:19 +03:00
jimw@mysql.com
a3a4ba937e Merge mysql.com:/home/jimw/my/mysql-5.1-ndb-cleanup 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-18 13:00:48 -07:00
jimw@mysql.com
0302bb4fdd Nuke all of the old_* directories in the ndb tree. 2006-04-18 12:12:46 -07:00
kent@mysql.com
64295d82d1 Merge 2006-04-18 17:16:27 +02:00
kent@mysql.com
de430a149e Merge 2006-04-18 16:58:21 +02:00
kent@mysql.com
8c420e29eb configure.in: 
Stepped up version to 5.0.20a
 2006-04-18 13:26:41 +02:00
msvensson@neptunus.(none)
1ea71459df Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-release
 2006-04-18 13:08:16 +02:00
msvensson@neptunus.(none)
c53f2320e4 Bug#18815 libmysql using yassl can't be linked with c program 
- Apply patch to remove dependency on C++ libs when linking "libmysql" from c
 2006-04-18 12:08:06 +02:00
kent@mysql.com
58c153c629 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
 2006-04-18 10:34:56 +02:00
serg@mysql.com
98ea03931e mysql.cc: 
revert bug#16855 "fix" per Monty's request
 2006-04-18 10:16:06 +02:00
monty@mysql.com
6043a95b5d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/my/mysql-5.1
 2006-04-18 11:06:12 +03:00
monty@mysql.com
f3e902ac2a Remove warnings about missing DBUG_RETURN's 2006-04-18 10:46:28 +03:00
petr@mysql.com
423119d214 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
 2006-04-18 08:47:22 +04:00
petr@mysql.com
de97f94a49 fix for Bug#18848 "SIGHUP crashes the server" (v2) 2006-04-18 08:43:13 +04:00
elliot@mysql.com
ac6450b858 BUG#19158 Fixing rpl_row_log_innodb test for pushbuild. 2006-04-18 00:30:55 -04:00
cmiller@zippy.(none)
ac6ae8f1f5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new
 2006-04-17 18:57:02 -04:00
jimw@mysql.com
50bb7cc5f3 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-17 15:57:01 -07:00
cmiller@zippy.(none)
61552172df Fixing a merge from a few days ago. 
Without a flush this test is nondeterministic for "row" binlog-format.
 2006-04-17 18:57:01 -04:00
brian@zim.(none)
e4f70bc137 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-04-17 15:57:00 -07:00
pekka@mysql.com
9f355db66e Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-04-18 00:56:59 +02:00
brian@zim.(none)
6f986a344b UNIXWARE removal 2006-04-17 15:56:59 -07:00
mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se
9c6aef5b4e BUG#18752 
Fixed forgotten merge fix
 2006-04-17 18:56:58 -04:00
pekka@mysql.com
4d1e38744d ndb - bug#16796 2006-04-17 20:24:41 +02:00
jimw@mysql.com
7e573aa5d0 Merge mysql.com:/home/jimw/my/mysql-5.1-19059 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-17 10:06:17 -07:00
jimw@mysql.com
80b8563690 Bug #19059: Failure to get version information when running from source tree 
Fix the way that instance manager finds the version number of instances,
  so that it works properly when the executable name isn't the same as what
  the instance-manager launched, such as when wrapping a libtool-wrapped
  executable from the source tree.

  This removes the 'Ver ' reported in the version column output by
  'SHOW INSTANCE STATUS ...', but the format of this column is not
  documented (and is pretty free-form to begin with).
 2006-04-17 09:38:50 -07:00
brian@zim.(none)
93f965d1fe Found one piece I missed when I removed HAVE_mit (just broke on windows and I don't have windows locally). This I believe should fix it. 2006-04-16 22:10:56 -07:00
brian@zim.(none)
98f2cd4468 Fixed a few pieces around support for data directory. 2006-04-16 21:55:02 -07:00
brian@zim.(none)
79a50551cb Adding back support for loadable engines. 2006-04-16 13:08:14 -07:00
brian@zim.(none)
3831083b15 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-04-16 08:03:15 -07:00
petr@mysql.com
d99cbca22f fix broken compile 2006-04-16 14:38:52 +04:00
brian@zim.(none)
f6f03576c6 This completes the work done in 5.0 to remove mit_pthread support (most was pulled in 5.0, but there were some pieces left in the tree) 2006-04-16 01:50:25 -07:00
brian@zim.(none)
5d1d27c016 Final patch to remove the last of the OS2 support. 2006-04-15 18:17:32 -07:00
brian@zim.(none)
53dce52086 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-04-15 08:50:56 -07:00
brian@zim.(none)
ba2502b9c3 Another long patch to remove the rest of the OS2 support. 2006-04-15 08:49:00 -07:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
5dc6310712 Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
 2006-04-15 09:47:33 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
d73e985ac1 Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
 2006-04-14 17:50:32 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
bd868aecbb Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
 2006-04-14 17:48:27 -04:00
kent@mysql.com
8732caf2eb Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-04-14 19:54:46 +02:00
kent@mysql.com
80fd0b3dd9 libmysqld.vcproj, mysqld.vcproj: 
Include "." in header search, to find #include <lex_hash.h>
 2006-04-14 19:36:06 +02:00
cmiller@zippy.(none)
c7513d482f Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
 2006-04-14 13:33:02 -04:00
cmiller@zippy.(none)
1d1040e1ea Hand-merged test. 2006-04-14 11:39:36 -04:00
cmiller@zippy.(none)
4671650387 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new

(With hand-merged tests.)
 2006-04-14 11:38:09 -04:00
elliot@mysql.com
b532fca034 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/Users/emurphy/src/mysql/bk-clean/mysql-5.1-new
 2006-04-14 10:44:36 -04:00
elliot@mysql.com
24e8ea98d6 Fixing HP-UX and AIX builds. 2006-04-14 10:36:36 -04:00
kent@mysql.com
e1926a14ea Makefile.am: 
Move -lmystrings after -ldbug, to define strmov() on HP-UX
 2006-04-14 15:34:04 +02:00
kent@mysql.com
34842dd295 base64.t.c: 
Moved declarations to beginning of block
 2006-04-14 14:59:21 +02:00
petr@mysql.com
db9cabea7d add a file to EXTRA_DIST. Should fix broken bootstrap. 2006-04-14 13:53:02 +04:00
jimw@mysql.com
6f5999e9b5 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-13 18:59:13 -07:00
jimw@mysql.com
b047dbbb1d Remove ancient version of Debian packaging files. 2006-04-13 17:18:43 -07:00
jimw@mysql.com
b1302af0d2 Merge mysql.com:/home/jimw/my/mysql-5.1-kill-sql-bench 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-13 13:28:54 -07:00