mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
49436 commits 2790 branches 343 tags 1.7 GiB
Commit graph

49436 commits

This branch
This branch
All branches
Author SHA1 Message Date
kent@mysql.com/kent-amd64.(none)
1b53e4a547 Makefile.am: 
Always include all sub directories in "make dist"
  Removed incorrect comment
configure.in:
  Unconditionally list make files in AC_CONFIG_FILES
  Removed 'thread_dirs', it is not used
  Minor cleanup
compile-dist:
  Simplified the configure line needed for "make dist" to get it all
zlib.m4, ssl.m4:
  Unconditionally list make files in AC_CONFIG_FILES
Makefile.am:
  Removed DIST_SUBDIRS not needed
  Don't copy soft links as files into source package
 2007-09-26 18:47:55 +02:00
kent@kent-amd64.(none)
3978bf9946 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-08-30 00:06:29 +02:00
kent@mysql.com/kent-amd64.(none)
a7d6c46494 libmysqld/sql_tablespace.cc 
libmysqld/scheduler.cc
libmysqld/sql_connect.cc
  Deleted BitKeeper soft links not needed
 2007-08-30 00:02:53 +02:00
kent@kent-amd64.(none)
b763295354 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-08-30 00:01:51 +02:00
kent@mysql.com/kent-amd64.(none)
f3436e512f server-tools/instance-manager/sql_state.c 
server-tools/instance-manager/pack.c
server-tools/instance-manager/password.c
server-tools/instance-manager/net_serv.cc
  Deleted BitKeeper soft links not needed
 2007-08-30 00:01:02 +02:00
kent@kent-amd64.(none)
46a3913ebd Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-08-29 23:59:19 +02:00
kent@mysql.com/kent-amd64.(none)
57dd7bc875 libmysql_r/client_settings.h libmysqld/ha_blackhole.cc 
Deleted BitKeeper soft links not needed
 2007-08-29 23:58:15 +02:00
kent@kent-amd64.(none)
ecbff12457 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-08-29 22:29:58 +02:00
kent@mysql.com/kent-amd64.(none)
edf772aef1 CMakeLists.txt: 
Link with library "udf_example" depends on, needed for nmake
libmysql.c:
  DBUG_ENTER need to be in declaration section
 2007-08-29 22:29:07 +02:00
kent@kent-amd64.(none)
515d654e80 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-08-29 22:24:51 +02:00
kent@mysql.com/kent-amd64.(none)
cf285315eb mysql_config.sh: 
Flag changed name in icc 10
 2007-08-29 22:24:11 +02:00
mleich@four.local.lan
032a4a45d0 Post merge fix 2 for 
ChangeSet@1.2509, 2007-08-28
     http://lists.mysql.com/commits/33239
  Fixes for the funcs_1 datadict test bugs
  #30418 "datadict" tests (all engines) fail:
         Dependency on the host name for ordering
  #30420 "datadict" tests (all engines) fail:
         Release build has help tables loaded
  #30438 "{memory,myisam,ndb}__datadict" tests fail:
         Use "InnoDB" without checking
  #30440 "datadict" tests (all engines) fail:
         Character sets depend on
                   configuration
 2007-08-29 21:36:45 +02:00
mleich@four.local.lan
04114a8b68 Post merge fix 1 for 
ChangeSet@1.2509, 2007-08-28
   http://lists.mysql.com/commits/33239
Fixes for the funcs_1 datadict test bugs
#30418 "datadict" tests (all engines) fail:
       Dependency on the host name for ordering
#30420 "datadict" tests (all engines) fail:
       Release build has help tables loaded
#30438 "{memory,myisam,ndb}__datadict" tests fail:
       Use "InnoDB" without checking
#30440 "datadict" tests (all engines) fail:
       Character sets depend on
                 configuration
There are more post merge fixes needed.
 2007-08-28 20:59:40 +02:00
mleich@four.local.lan
0b1ae04237 Merge four.local.lan:/WORK2/merge/mysql-5.0-build-datadict 
into  four.local.lan:/WORK2/merge/mysql-5.1-build-datadict

It is to be expected that a post merge fix is needed.
 2007-08-28 19:41:14 +02:00
mleich@four.local.lan
9fa2f3c6b6 Fixes for 
Bug#30418 "datadict" tests (all engines) fail: Dependency on the host name
                for ordering
     Bug#30420 "datadict" tests (all engines) fail: Release build has help tables loaded
     Bug#30438 "{memory,myisam,ndb}__datadict" tests fail: Use "InnoDB" without checking
     Bug#30440 "datadict" tests (all engines) fail: Character sets depend on configuration
Attention: Only the build team can check if Bug#30440 is really fixed.
 2007-08-28 18:37:17 +02:00
joerg@trift2.
783411911a Merge trift2.:/MySQL/M51/netware3-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-27 14:02:45 +02:00
joerg@trift2.
e42afa010d More cleanup / fixing for NetWare: 
1) "test_db.sql" is a plaintext file, no binary;
2) do not try to strip the binaries, it will not work.
 2007-08-27 13:30:22 +02:00
tomas@whalegate.ndb.mysql.com
1cc38f8305 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
 2007-08-27 12:03:17 +02:00
df@pippilotta.erinye.com
0c66cf7bbc Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-08-27 11:40:38 +02:00
df@pippilotta.erinye.com
0670af9479 adjust version number 2007-08-27 11:38:32 +02:00
dfischer/mysqldev@mysql.com/production.mysql.com
ba419bdc8c Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release
 2007-08-27 11:24:54 +02:00
tomas@whalegate.ndb.mysql.com
3365b2a439 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
 2007-08-27 10:38:01 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
b82525ecfa Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-08-25 12:33:23 +03:00
jani@a88-113-38-195.elisa-laajakaista.fi
b7231ad5d9 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-08-25 12:08:18 +03:00
jani@a88-113-38-195.elisa-laajakaista.fi
516cafdc79 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel
 2007-08-25 11:39:56 +03:00
joerg@trift2.
b30fbfd3ca Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 23:47:31 +02:00
joerg@trift2.
d7c1a81136 Merge trift2.:/MySQL/M50/netware2-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-24 23:40:36 +02:00
joerg@trift2.
ae77f187f5 Merge trift2.:/MySQL/M51/netware2-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 23:29:19 +02:00
joerg@trift2.
4d375e46e3 Merge trift2.:/MySQL/M50/netware2-5.0 
into  trift2.:/MySQL/M51/netware2-5.1
 2007-08-24 23:12:19 +02:00
joerg@trift2.
2fd45aaee6 Fixes for the NetWare builds, discovered during 5.1.21-beta and backported to 5.0: 
1) Ensure "init_db.sql" and "test_db-sql" really get built.

2) Ensure the "*.def" files with NetWare linker options get distributed to the proper directories.
 2007-08-24 23:07:59 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
76835dbaae Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-08-24 15:26:48 +03:00
jani@a88-113-38-195.elisa-laajakaista.fi
b25dacbdee Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-08-24 15:25:02 +03:00
dfischer/mysqldev@production.mysql.com
81528c1a00 Merge bk-internal:/home/bk/mysql-5.0-build 
into  mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release
 2007-08-24 13:47:11 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
b356018839 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel
 2007-08-24 14:43:33 +03:00
dfischer/mysqldev@mysql.com/production.mysql.com
74afbb4b7b Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release
 2007-08-24 13:30:16 +02:00
joerg@trift2.
9e33d39aeb Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 13:03:22 +02:00
joerg@trift2.
08d0b2ba9b Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 12:41:09 +02:00
joerg@trift2.
c5b1ad99e4 Merge trift2.:/MySQL/M51/target-5.1.22 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 12:38:26 +02:00
joerg@trift2.
e8aa23fae4 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-24 12:34:45 +02:00
joerg@trift2.
268ce5eb7e Merge trift2.:/MySQL/M51/tmp-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 12:28:47 +02:00
joerg@trift2.
30433c29eb Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 11:09:18 +02:00
joerg@trift2.
17c6d765a5 Merge trift2.:/MySQL/pushed/netware-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 11:02:34 +02:00
joerg@trift2.
76a05d26d5 Merge trift2.:/MySQL/pushed/netware-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-24 10:58:14 +02:00
joerg@trift2.
e9b971610f Merge trift2.:/MySQL/pushed/netware-5.0 
into  trift2.:/MySQL/pushed/netware-5.1
 2007-08-24 10:50:11 +02:00
joerg@trift2.
aa588114a2 NetWare packages were missing the scripts to initialize the database: add them. 2007-08-24 10:47:13 +02:00
df@pippilotta.erinye.com
66158ad912 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-08-24 10:14:08 +02:00
df@pippilotta.erinye.com
6d068a5ac7 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-08-24 10:13:03 +02:00
df@pippilotta.erinye.com
30435b43f2 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-08-24 09:55:47 +02:00
holyfoot/hf@hfmain.(none)
c4811d67f7 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/28430/my51-28430
 2007-08-24 07:51:58 +05:00
gshchepa@bk-internal.mysql.com
64bcb0daaf Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-08-23 23:27:30 +02:00