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

463 commits

Author SHA1 Message Date
ingo/mydev@chilla.local
8bb8069653 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.1-amerge
 2006-07-24 10:05:17 +02:00
kostja@bodhi.local
d7845b74db Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
 2006-07-13 22:09:36 +04:00
joerg@trift2.
6ec62524b3 support-files/mysql.spec.sh : Fix a typing error. 2006-07-10 12:03:44 +02:00
joerg@mysql.com
be5f48268c When building RPMs, use the Perl script to run the tests, to automatically check SSL. 2006-07-04 12:30:08 +02:00
kent@mysql.com
593b359d92 mysql.spec.sh: 
Disable old RPM strip
my_global.h:
  Fixed wrong cast, which caused problems with gcc 4.0 and
  floats in prepared statements (Bug #19694)
mysqlmanager.vcproj:
  Place output files in common release/debug directory
 2006-06-30 02:49:28 +02:00
joerg@mysql.com
dcc67c0080 Manual merge from 5.0 to 5.1 (bug#20216 + bug#18516). 2006-06-29 11:59:05 +02:00
evgen@moonbone.local
82369c4e65 Manual merge 2006-06-28 19:34:04 +04:00
joerg@mysql.com
0320bae069 Manual merge for bug#20216. 2006-06-27 20:32:08 +02:00
joerg@mysql.com
44653eed3b Revert all previous attempts to call "mysql_upgrade" during RPM upgrade. 
This finishes bug#18516, as far as "generic RPMs" are concerned.
 2006-06-27 20:18:03 +02:00
joerg@mysql.com
3300c79b07 Merge mysql.com:/M50/bug19353-5.0-2 into mysql.com:/M50/bug20216-5.0 2006-06-27 20:04:44 +02:00
joerg@mysql.com
f789b87a1b Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216), 
manual merge from 4.0.
 2006-06-27 18:36:41 +02:00
joerg@mysql.com
46ee3ac19d Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216). 2006-06-27 18:17:53 +02:00
evgen@moonbone.local
9a9224da68 Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql 
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-06-23 14:53:41 +04:00
kent@mysql.com
ef2860e8ff mysql.spec.sh: 
Disable the simplistic auto dependency scan for test/bench (bug#20078)
 2006-06-23 00:37:31 +02:00
joerg@mysql.com
7d83b7e48a Improved fix for bug#18516 (also 19353): 
1) Rename the old shell tool "mysql_upgrade", to avoid a name collision.
2) Improve the spec file, to explicitly use a temporary socket.
 2006-06-22 14:28:05 +02:00
joerg@trift2.
5eea972046 Merge mysql.com:/M50/bug19353-5.0 into mysql.com:/M51/bug19353-5.1 2006-06-22 12:22:52 +02:00
joerg@mysql.com
27df8b07b7 Fix for bug#18516 (also #19353, reported for 5.1): 
In addition to include "mysql_upgrade" in a RPM, it should also be called
when the RPM is upgraded.
 2006-06-20 22:40:46 +02:00
kent@mysql.com
34d82f0bc6 make_win_src_distribution.sh: 
Removed reference to missing "tools" directory
mysql.spec.sh:
  Changed flag --with-yassl => --with-ssl
  Reverted accidental removal of the "make" call :-)
  Configure --with-embedded-server
  Corrected path to "libtool" command
  Corrected path to "libmysqld.a"
  Removed references to "safe_mysqld"
 2006-06-20 12:24:12 +02:00
joerg@mysql.com
950b6c8dfa Merge mysql.com:/M41/bug18810-4.1 into mysql.com:/M41/mysql-4.1 2006-06-14 18:28:49 +02:00
joerg@mysql.com
1592670959 Merge mysql.com:/M50/bug18810-5.0 into mysql.com:/M50/mysql-5.0 2006-06-14 18:25:09 +02:00
joerg@trift2.
075bb7faf2 Merge mysql.com:/M50/bug18810-5.0 into mysql.com:/M51/bug18810-5.1 2006-06-14 18:16:35 +02:00
joerg@mysql.com
6448fca67a Merge mysql.com:/M41/bug18810-4.1 into mysql.com:/M50/bug18810-5.0 2006-06-14 18:13:36 +02:00
joerg@mysql.com
054cc44ede support-files/mysql.server.sh : Fix the startup sequence. bug#18810 + bug#20118 2006-06-14 16:54:54 +02:00
brian@zim.(none)
ca63edc88b Removing mysql_explain_log from 5.1 2006-05-23 17:26:56 -07:00
anozdrin@mysql.com
4a43bd1a3a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/mnt/raid/MySQL/devel/5.1-rt-wl3158-merged
 2006-05-22 14:22:58 +04:00
kent@mysql.com
49a8f9ee29 Merge 2006-05-21 10:38:59 +02:00
kent@mysql.com
0a778b4ce0 Merge 2006-05-21 00:47:08 +02:00
kent@mysql.com
2419732379 Merge 2006-05-20 23:36:17 +02:00
kent@mysql.com
e09910f91f mysql.spec.sh: 
Always compile position independent
 2006-05-20 22:47:20 +02:00
anozdrin@mysql.com
c1113af15c This is an implementation of two WL items: 
- WL#3158: IM: Instance configuration extensions;
  - WL#3159: IM: --bootstrap and --start-default-instance modes

The following new statements have been added:
  - CREATE INSTANCE;
  - DROP INSTANCE;

The behaviour of the following statements have been changed:
  - SET;
  - UNSET;
  - FLUSH INSTANCES;
  - SHOW INSTANCES;
  - SHOW INSTANCE OPTIONS;
 2006-05-18 18:57:50 +04:00
kent@mysql.com
d48e55eefd Merge 2006-05-17 23:41:56 +02:00
kent@mysql.com
9fca0d766b mysql.spec.sh: 
Removed Berkeley DB
configure.in:
  Adjusted Netware support
basic.t.c:
  Change for Netware
Makefile.am:
  Use thread safe libmysqlclient_r if it was built
valgrind.supp:
  Hide report about strlen/_dl_init_paths
ha_tina.cc:
  Temporarely disable CSV engine on Netware,
  as the engine depends on mmap()
net_serv.cc:
  Include <sys/select.h> for Netware
 2006-05-16 22:47:22 +02:00
tomas@poseidon.ndb.mysql.com
b592d872ec Merge jonas@perch:src/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2006-05-16 11:31:10 +02:00
tomas@poseidon.ndb.mysql.com
9e883ac3d7 Merge jonas@perch:src/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-05-16 11:05:50 +02:00
kent@mysql.com
a31d16abe8 Merge mysql.com:/data0/mysqldev/my/tmp_merge 
into  mysql.com:/data0/mysqldev/my/mysql-5.1-new
 2006-05-16 01:59:09 +02:00
kent@mysql.com
9a93dce158 Merge 2006-05-10 22:15:08 +02:00
kent@mysql.com
237f4a37d8 mysql.spec.sh: 
Compile in all character sets in Max (bug#14918)
 2006-05-10 21:53:01 +02:00
jonas@perch.ndb.mysql.com
fddbcb2bf8 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-05-08 07:56:26 +02:00
jonas@perch.ndb.mysql.com
a5fc03387a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
 2006-05-08 07:48:08 +02:00
tomas@poseidon.ndb.mysql.com
f6ede396c0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-05-04 21:55:12 +02:00
kent@mysql.com
b050f975c4 Merge 2006-05-02 02:45:04 +02:00
kent@mysql.com
e8fb05845b Merge 2006-05-01 20:16:19 +02:00
kent@mysql.com
f45d6d3cc6 mysql.spec.sh: 
Use "./libtool --mode=execute" to find real path to executables
 2006-05-01 19:48:31 +02:00
jimw@mysql.com
f21c110d13 Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-30 13:27:38 -07:00
kent@mysql.com
b714a0cec4 mysql.spec.sh: 
Backport of changes in 5.0 (bug#18294)
 2006-04-29 01:28:04 +02:00
kent@mysql.com
50e8ba04cf mysql.spec.sh: 
Include and run mysql_upgrade if needed (bug#19353)
 2006-04-28 17:03:11 +02:00
jonas@perch.ndb.mysql.com
ec6d198ea0 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-04-26 16:57:43 +02:00
jonas@perch.ndb.mysql.com
59bced7f8a Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-04-26 15:16:21 +02:00
jonas@perch.ndb.mysql.com
5d5a947f4c Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-04-26 15:13:43 +02:00
jonas@perch.ndb.mysql.com
a8f407a7ef Add ndb_config to rpm spec 2006-04-26 14:54:20 +02:00