mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34940 commits 2785 branches 343 tags 1.6 GiB
Commit graph

34940 commits

This branch
This branch
All branches
Author SHA1 Message Date
monty@mysql.com/narttu.mysql.fi
8f4fef291d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2007-02-22 20:32:19 +02:00
monty@mysql.com/narttu.mysql.fi
510c1238ac Portability fix 
Suppress compiler warnings from bdb and (for the moment) warnings from ndb
 2007-02-22 20:20:49 +02:00
monty@mysql.com/narttu.mysql.fi
e5cc397f33 Fixed compiler warnings (for linux and win32 and win64) 
Fixed a couple of usage of not initialized warnings (unlikely cases)
 2007-02-22 16:59:57 +02:00
monty@mysql.com/narttu.mysql.fi
6946fa682f After merge fixes 
This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
 2007-02-21 19:38:40 +02:00
joerg@trift2.
683a478669 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-02-21 16:21:12 +01:00
tomas@poseidon.mysql.com
9cae1fd7ee Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.mysql.com:/home/tomas/mysql-5.0
 2007-02-21 21:50:43 +07:00
monty@mysql.com/narttu.mysql.fi
26aa385bc5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2007-02-21 14:07:08 +02:00
monty@mysql.com/narttu.mysql.fi
222e128b34 Fixed unsafe define of uint4korr() 
Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups
 2007-02-21 13:02:57 +02:00
tomas@poseidon.mysql.com
7e9ec9a1f0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-02-21 14:00:28 +07:00
joerg@trift2.
4cb11ae425 Merge trift2.:/MySQL/M41/merge-4.1 
into  trift2.:/MySQL/M50/merge-5.0
 2007-02-20 20:18:29 +01:00
istruewing@bk-internal.mysql.com
37cedb7efa Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-engines
 2007-02-20 18:53:41 +01:00
bteam/mysqldev@mysql.com/production.mysql.com
724a3b33ee Raise version number after cloning 5.0.36 2007-02-20 16:50:54 +01:00
joerg@trift2.
74fed0c305 After-merge fix: 
The declaration of "thr_client_alarm" had got lost, keep it in "mysys/thr_alarm.c".
 2007-02-20 13:10:27 +01:00
joerg@trift2.
0daf91a62a Merge trift2.:/MySQL/M40/clone-4.0 
into  trift2.:/MySQL/M41/merge-4.1
 2007-02-20 13:02:39 +01:00
istruewing@chilla.local
0f4a84f002 Fixed a bad merge. Got a duplicate symbol on OSX. 2007-02-20 10:01:54 +01:00
jonas@perch.ndb.mysql.com
a7aed14bc9 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-02-20 01:05:11 +01:00
jonas@perch.ndb.mysql.com
8801e8e7af fix compile error in testBitfield 2007-02-20 00:55:33 +01:00
jonas@perch.ndb.mysql.com
b4b35f9603 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-02-19 22:58:35 +01:00
jonas@perch.ndb.mysql.com
a51d58e641 ndb - fix correct argv/argc handling in testBitfield 2007-02-19 22:51:04 +01:00
jonas@perch.ndb.mysql.com
2ec6d9e2db Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-02-19 22:32:24 +01:00
jonas@perch.ndb.mysql.com
f0253235b8 ndb - 
forgott to add testcase for bug#26481
 2007-02-19 22:30:54 +01:00
jonas@perch.ndb.mysql.com
d6a08d0573 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-02-19 20:33:37 +01:00
jonas@perch.ndb.mysql.com
4c3fef3ae8 ndb - bug#26481 
fix for killed node during initial node restart
 2007-02-19 20:13:08 +01:00
jonas@perch.ndb.mysql.com
8dd23d39e7 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-02-18 00:25:43 +01:00
jonas@perch.ndb.mysql.com
2cff674c1d ndb - bug#26457 
master failure during master take over
 2007-02-17 23:52:17 +01:00
tomas@poseidon.mysql.com
491017b15e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-02-17 16:09:32 +07:00
jonas@perch.ndb.mysql.com
676647ad86 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-02-16 18:22:52 +01:00
jonas@perch.ndb.mysql.com
80b82d2bbd ndb - bug in my.cnf handling on resize of vector 
backport fix from 5.1
 2007-02-16 18:20:24 +01:00
jonas@perch.ndb.mysql.com
82d2c91f1f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-02-16 18:15:10 +01:00
jonas@perch.ndb.mysql.com
33e96dc5af Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-02-16 18:11:40 +01:00
jonas@perch.ndb.mysql.com
77b8feb878 ndb - bug#26454 
make lockpages=1 run a bit earlier in startup
 2007-02-16 18:10:27 +01:00
joerg@trift2.
0cdbda1273 include/config-win.h : 
Companion change to this one
   ChangeSet@1.2206, 2007-01-22 02:32:07+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +8 -0
     include/my_pthread.h@1.67, 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +31 -10
which renamed "sigset()" -> "my_sigset()" but forgot to do it for Windows ...
 2007-02-16 16:31:31 +01:00
tomas@poseidon.mysql.com
9defcbbff4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-02-16 20:07:05 +07:00
istruewing@chilla.local
97c6a6c4e8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-02-16 10:39:45 +01:00
joerg@trift2.
8ddb3af50c Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-02-15 13:46:54 +01:00
cmiller@zippy.cornsilk.net
154f7f396e Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-02-14 10:47:39 -05:00
istruewing@chilla.local
f9e9bd9a0c Merge chilla.local:/home/mydev/mysql-4.1-axmrg 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-02-14 12:03:47 +01:00
istruewing@chilla.local
aba12aca0f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-02-14 12:02:58 +01:00
stewart@willster.(none)
836c2ab9ae Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-merge
 2007-02-14 21:36:12 +11:00
tomas@poseidon.mysql.com
92f9a37dc1 ndb_config_4_node.ini, ndb_config_1_node.ini: 
new file
 2007-02-14 15:33:48 +07:00
tomas@poseidon.mysql.com
f92d3b3ab5 backport some mysql-test ndbcluster things from 5.1 
remove compiler warning EventLogger.cpp
    Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
     - partial fix
     - object map to handle failed realloc
 2007-02-14 15:26:06 +07:00
tomas@poseidon.mysql.com
b7c3aeae2c Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-02-14 15:18:15 +07:00
tomas@poseidon.mysql.com
120eaec17c Bug #21033 Error 0 in readAutoIncrementValue() 
- do not call function if table has no autoincrement
 2007-02-14 15:16:26 +07:00
stewart@willster.(none)
6f91941384 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work 
into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-merge
 2007-02-14 17:09:43 +11:00
stewart@willster.(none)
7ed1f6ac01 BUG#26358 remove unused and non-working SET_VAR_REQ/CONF signals 
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing

Remove the dead SET_VAR_REQ,REF,CONF signals.

They:
a) don't currently work
b) will cause confusion with future mgmd updates for
   signal interface to configuration things (e.g. port numbers)
 2007-02-14 16:03:25 +11:00
stewart@willster.(none)
e1b75c1784 BUG#26357 remove unused GSN_STATISTICS_REQ and CONF 
remove GSN_STATISTICS_REQ and CONF

These are unused and have been since BK import. not needed.
 2007-02-14 15:55:08 +11:00
stewart@willster.(none)
5c756c1822 BUG#26356 uninitialised data sent from TAMPER_ORD to DIHNDBTAMPER 
Don't send uninit data in TAMPER_ORD to DIHNDBTAMPER

Even though this data is unused from the CMVMI (mgmd) signal,
we shouldn't be doing stuff with uninited data.
 2007-02-14 15:51:16 +11:00
stewart@willster.(none)
2fb873f371 BUG#26355 FIXME: use constant for max loglevel in ndb_mgmd 2007-02-14 15:47:34 +11:00
stewart@willster.(none)
02c847eb03 BUG#26353 remove GET_CONFIG_BACKWARDS_COMPAT from ndb_mgmd 
there is backwards compatibility for GET CONFIG style configuration requests in
ndb_mgmd. None of the ndbd versions that use this couldn't possibly connect to a
5.0 or 5.1 cluster. remove the backwards compat

remove it
 2007-02-14 15:35:29 +11:00
stewart@willster.(none)
faec3f4fb1 BUG#26352 unused ndb_mgm_rep_command in mgmapi.cpp 2007-02-14 15:28:04 +11:00