mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
18980 commits 2793 branches 343 tags 1.5 GiB
Commit graph

18980 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
c11e42c066 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl3 
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl4


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
 2005-01-20 13:51:32 +11:00
unknown
e4862d91cd Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb 
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl3


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
 2005-01-20 13:01:24 +11:00
unknown
9226d1408c Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/include/kernel/AttributeHeader.hpp:
  Auto merged
 2005-01-19 18:35:41 +01:00
unknown
5af0ea4315 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
 2005-01-19 18:33:35 +01:00
unknown
4bd96dd11d ndb - make sure scan recevier pointers are aligned 
ndb/src/ndbapi/NdbScanOperation.cpp:
  align pointers
 2005-01-19 18:32:34 +01:00
unknown
1c5dbc670b ndb - HugoCalculator, faster string generation 
ndb/test/src/HugoCalculator.cpp:
  Better handling of strings
 2005-01-19 18:28:04 +01:00
unknown
2b165500c4 Merge build.mysql.com:/users/tulin/mysql-5.0 
into build.mysql.com:/users/tulin/mysql-5.0-ndb


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
 2005-01-19 15:08:56 +01:00
unknown
6ed3ff49fc MgmtSrvr.cpp: 
corrected erroneous comparison boolean < 0


ndb/src/mgmsrv/MgmtSrvr.cpp:
  corrected erroneous comparison boolean < 0
 2005-01-19 15:03:34 +01:00
unknown
58d7968665 removed compiler warnings 2005-01-19 14:56:40 +01:00
unknown
117e6b603a Merge build.mysql.com:/users/tulin/mysql-5.0 
into build.mysql.com:/users/tulin/mysql-5.0-ndb
 2005-01-19 14:20:28 +01:00
unknown
3234eb5687 added configure option to set extra ndb cc-flags 2005-01-19 14:20:26 +01:00
unknown
ff99f5925d Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-01-19 16:20:25 +03:00
unknown
6130a3ad7c View field names should be case insensitive 2005-01-19 16:19:10 +03:00
unknown
1af9c13851 Merge build.mysql.com:/users/tulin/mysql-5.0 
into build.mysql.com:/users/tulin/mysql-5.0-ndb
 2005-01-19 10:31:09 +01:00
unknown
69d7cf6756 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
 2005-01-19 10:07:18 +01:00
unknown
da8a9e2f20 ndb compiler warning, c++ style comment in c-file 
ndb/include/ndb_constants.h:
  remove // from .h-file
 2005-01-19 10:07:15 +01:00
unknown
21d24f34a6 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0


ndb/include/kernel/AttributeHeader.hpp:
  Auto merged
ndb/include/ndb_global.h.in:
  Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
 2005-01-19 10:07:14 +01:00
unknown
7893b8dfaa Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-01-19 10:07:13 +01:00
unknown
628804d934 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into build.mysql.com:/users/tulin/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
 2005-01-19 10:07:13 +01:00
unknown
49ab428c8d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-01-19 10:07:12 +01:00
unknown
d374ed9c04 added possibility to add extra opts to ndbd and ndb_mgmd in mysql-test-run 2005-01-19 10:00:41 +01:00
unknown
ed327104b6 bug#7777 - ndb compile on qnx 
remove usage of compiler supplied <new> and instead
  impl. own inlined placement new


ndb/include/kernel/AttributeHeader.hpp:
  remove usage <new>
ndb/include/ndb_global.h.in:
  remove usage <new>
  instead impl. own
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  remove usage <new>
ndb/src/kernel/blocks/grep/GrepInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/suma/SumaInit.cpp:
  remove usage <new>
ndb/src/kernel/vm/Emulator.cpp:
  remove usage <new>
ndb/src/kernel/vm/SimulatedBlock.hpp:
  remove usage <new>
ndb/src/mgmapi/mgmapi_configuration.cpp:
  remove usage <new>
 2005-01-19 09:15:34 +01:00
unknown
7cbe4d19e4 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
 2005-01-19 07:37:42 +01:00
unknown
bfe74e6990 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0


configure.in:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
 2005-01-19 07:34:57 +01:00
unknown
153160d1ff bug#7693 - ndb 
when using shm transporter, set sigmask on each thread using pthread_sigmask


configure.in:
  Add more functions needed for SHM
ndb/src/common/portlib/NdbThread.c:
  1) Create thread wrapper function
  2) block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER
ndb/src/common/transporter/TransporterRegistry.cpp:
  (un)block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER
sql/ha_ndbcluster.cc:
  cast pointer to UintPtr before printout
 2005-01-19 07:23:20 +01:00
unknown
22ae0e897a Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl3 
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl4


ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
 2005-01-19 15:20:57 +11:00
unknown
d357a5a058 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb 
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl3


ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
 2005-01-19 15:16:13 +11:00
unknown
a8e5250060 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-19 04:44:45 +01:00
unknown
982e0b8cfb changed "formatting" after sergs comments on prev chanset 2005-01-19 04:43:54 +01:00
unknown
05422852c0 Fixes of client_test on Solaris 64 bit 
tests/client_test.c:
  Fixes for Solaris: 
  a) no truncation in one place (ulonglong -> double)
  b) fix a glitch with byte order and passing int * instead of char *
     as a statement attribute
 2005-01-19 03:01:34 +03:00
unknown
e54bd24326 Fix test results from merge, and fix the symlink test which had an 
out-of-sync test and result.


mysql-test/r/type_float.result:
  Warning message text changed
mysql-test/t/symlink.test:
  Re-enable part of test
mysql-test/r/symlink.result:
  Update results to match test
 2005-01-18 15:05:16 -08:00
unknown
2c41e5924e Merge from 4.1. 
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/table.cc:
  Merge warning of multi-byte charset being applied
  to table of unknown charset.
 2005-01-18 13:59:55 -08:00
unknown
d2778647ae Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-18 13:34:22 -08:00
unknown
dabd01935c after merge fixes 
mysql-test/t/union.test:
  Auto merged
 2005-01-18 23:34:15 +02:00
unknown
b697b6c0e0 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2005-01-18 23:29:47 +02:00
unknown
e07b3d46e4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-18 22:25:19 +01:00
unknown
59ef5bede9 fixing wrong value for "examined rows" when UNION's are used. 
mysql-test/r/union.result:
  result for a test case for the wrong examined rows with UNION's
mysql-test/t/union.test:
  test case for the wrong examined rows with UNION's
sql/sql_union.cc:
  a patch for the wrong examined rows with UNION's
 2005-01-18 23:13:29 +02:00
unknown
08ea4df60b Update type_float test results after merge. 
mysql-test/r/type_float.result:
  Update test results (4.1 produces a warning that 4.0 did not,
  and they were merged into the wrong position).
 2005-01-18 13:12:40 -08:00
unknown
a66d80d17e removed default usage of shared memory transporter as it is not verified on enough platforms 2005-01-18 22:09:15 +01:00
unknown
34eff3c453 Merge mysql.com:/home/jimw/my/mysql-4.1-6913 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-18 12:27:00 -08:00
unknown
8e5a74a6b6 Merge changed tests 
sql/field_conv.cc:
  Auto merged
mysql-test/r/type_float.result:
  Merge
mysql-test/t/type_float.test:
  Merge
 2005-01-18 12:25:56 -08:00
unknown
803774958c Merge mysql.com:/home/jimw/my/mysql-4.0-7700 
into mysql.com:/home/jimw/my/mysql-4.0-clean
 2005-01-18 11:39:10 -08:00
unknown
09aa1e0763 After merge fix. 
client/Makefile.am:
  Don't use relative paths.
 2005-01-18 22:24:22 +03:00
unknown
491ee3dc45 Merge mysql.com:/home/dlenev/src/mysql-4.1-merges 
into mysql.com:/home/dlenev/src/mysql-5.0-merges


client/Makefile.am:
  Auto merged
strings/Makefile.am:
  Auto merged
 2005-01-18 22:13:05 +03:00
unknown
c2ce32bd09 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-01-18 21:52:15 +03:00
unknown
ca252acbcd Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-merges
 2005-01-18 21:49:33 +03:00
unknown
0fb69c751a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-01-18 22:30:28 +04:00
unknown
efb92cb67c ps_7ndb.result, ps_6bdb.result: 
after merge clean-up


mysql-test/r/ps_6bdb.result:
  after merge clean-up
mysql-test/r/ps_7ndb.result:
  after merge clean-up
 2005-01-18 22:29:21 +04:00
unknown
7f49d1e6f5 Merge mysql.com:/home/dlenev/src/mysql-4.1-merges 
into mysql.com:/home/dlenev/src/mysql-5.0-merges


mysql-test/r/alter_table.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
sql/field.h:
  Auto merged
 2005-01-18 21:27:09 +03:00
unknown
b5064f14eb Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2005-01-18 20:17:24 +02:00