mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
16088 commits 2781 branches 343 tags 1.6 GiB
Commit graph

16088 commits

This branch
This branch
All branches
Author SHA1 Message Date
ram@gw.mysql.r18.ru
0ca8fd2ee9 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6101
 2004-11-30 12:27:17 +04:00
joreland@mysql.com
4ba04a3d6e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-11-30 07:44:11 +01:00
joreland@mysql.com
e86ce67ea5 Merge mysql.com:/home/jonas/src/mysql-4.1-fix 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-11-30 07:43:19 +01:00
joreland@mysql.com
474f23a402 ndb - fixed long overdue problems with unique indexes and null values 2004-11-30 07:41:26 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
b09068f8a4 Applied some Netware related patches. 2004-11-29 17:41:47 +02:00
mats@mysql.com
fed6019856 Merge mysql.com:/space/bkroot/mysql-4.1 
into mysql.com:/space/bk/b6148-mysql-4.1
 2004-11-29 10:25:58 +01:00
mats@mysql.com
05d38dfcd8 rpl_start_stop_slave.result: 
Syntax change between 4.0 and 4.1.
 2004-11-29 10:24:40 +01:00
joreland@mysql.com
23c5feeeb4 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-11-29 09:24:20 +01:00
joreland@mysql.com
208050f63f Merge mysql.com:/home/jonas/src/mysql-4.1-fix 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-11-29 09:17:45 +01:00
tomas@poseidon.ndb.mysql.com
5e799e4a3b ndb_grant.later: 
Rename: mysql-test/t/ndb_grant.test -> mysql-test/t/ndb_grant.later
 2004-11-29 08:06:53 +00:00
joreland@mysql.com
74bfe72d3d ndb - scan bug fix + more test cases 2004-11-29 09:00:39 +01:00
serg@serg.mylan
cb538e45f5 post-merge fix 2004-11-28 19:48:41 +01:00
serg@serg.mylan
96729c62be merged 2004-11-28 18:19:01 +01:00
serg@serg.mylan
989721d12f bad merge fixed 2004-11-28 17:06:40 +01:00
serg@serg.mylan
1a32157950 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-11-28 16:32:01 +01:00
serg@serg.mylan
7eccc3107f skip last compress test if we're short of RAM 2004-11-28 16:31:14 +01:00
kent@mysql.com
77c32ac173 configure.in: 
A work-around for SCO, disable use of clock_gettime
 2004-11-28 15:45:12 +01:00
tomas@poseidon.ndb.mysql.com
19dab11881 added error code message for 897 2004-11-26 13:20:48 +00:00
marko@hundin.mysql.fi
d58c186759 srv0srv.c: 
srv_lock_timeout_and_monitor_thread(): write to srv_monitor_file
  only if --innodb_status_file=1
 2004-11-26 13:16:37 +02:00
joreland@mysql.com
0a52053b5c Merge mysql.com:/home/jonas/src/mysql-4.1-fix 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-11-26 10:46:15 +01:00
tomas@poseidon.ndb.mysql.com
facaf4f7a0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
 2004-11-26 09:46:13 +00:00
tomas@poseidon.ndb.mysql.com
8c3144c133 cleaned up code a bit 
added command CONNECT in management client
    added some verbose printouts
    removed prompt printout on !isatty(0)
 2004-11-26 09:44:57 +00:00
joreland@mysql.com
4d52d9e50f ndb - bugfix testScanPerf 2004-11-26 10:00:33 +01:00
monty@mysql.com
eb304bd49f Fixes while reviewing code 
(Cleanups and better bug fixes)
 2004-11-26 02:31:22 +02:00
heikki@hundin.mysql.fi
14b60dfce4 ha_innodb.cc: 
Add conversion of the InnoDB error DB_LOCK_TABLE_FULL to the corresponding MySQL error
 2004-11-26 00:26:35 +02:00
heikki@hundin.mysql.fi
ccec75f9af Many files: 
Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
 2004-11-26 00:12:50 +02:00
tomas@poseidon.ndb.mysql.com
a3d2aaf99f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
 2004-11-25 21:32:04 +00:00
tomas@poseidon.ndb.mysql.com
106f124eec moved default setting to config.ini to MgmtSrvr 
only try to connect to other ndb_mgmd if connect_string explicitly given or config_file not given
 2004-11-25 21:29:59 +00:00
mats@mysql.com
4ac392fa45 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/bkroot/mysql-4.1
 2004-11-25 13:35:53 +01:00
ram@gw.mysql.r18.ru
886d54bb37 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6441
 2004-11-25 16:18:48 +04:00
bar@mysql.com
3d6e811ed5 table.cc: 
Bug #6802 MySQL 4.0's VARCHAR(NN) BINARY is interpreted as VARBINARY(NN) in 4.1
 2004-11-25 16:18:47 +04:00
serg@serg.mylan
895376998f Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-11-25 13:18:46 +01:00
ram@gw.mysql.r18.ru
511eb626bf Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6441
 2004-11-25 16:18:46 +04:00
tomas@poseidon.ndb.mysql.com
870c718b03 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
 2004-11-25 12:18:45 +00:00
tomas@poseidon.ndb.mysql.com
5a09289bd1 ndb/src/common/logger/LogHandler.cpp 
changed so that error is returned if format is wrong in logger param parsing
ndb/src/common/logger/Logger.cpp
    some debuf printout added
ndb/src/mgmsrv/InitConfigFileParser.cpp
    rewrote parsing on parseNameValuePair, was buggy
 2004-11-25 12:14:15 +00:00
timour@mysql.com
f1e86036ee Merge mysql.com:/home/timka/mysql/src/4.0-virgin 
into mysql.com:/home/timka/mysql/src/4.0-master
 2004-11-25 13:25:35 +02:00
mats@mysql.com
9ffb3fd39c Merge 2004-11-25 12:23:41 +01:00
joreland@mysql.com
5d70a4895f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-11-25 10:40:56 +01:00
joreland@mysql.com
64bc875228 Merge mysql.com:/home/jonas/src/mysql-4.1-fix 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-11-25 10:39:34 +01:00
joreland@mysql.com
a9e5e7de88 bug#6775 - ndb - fix bug introduced by bug fix 2004-11-25 10:38:46 +01:00
timour@mysql.com
38ab93c6be Merge for BUG#3759 which was missing from the main tree for some reason. 2004-11-25 11:37:28 +02:00
mats@mysql.com
fe0911e95e Merge mysql.com:/space/bkroot/mysql-4.0 
into mysql.com:/space/bk/b6148-mysql-4.0
 2004-11-25 09:38:52 +01:00
mats@mysql.com
c06cae0f55 Fix for Bug#6148. Only rewind read position in binary log when the 
slave SQL thread is started.
 2004-11-25 09:26:45 +01:00
serg@serg.mylan
e80bd82e83 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-11-24 23:47:14 +01:00
serg@serg.mylan
e8203e437a bug#6784 
mi_flush_bulk_insert (on dup key error in mi_write)
was mangling info->dupp_key_pos
 2004-11-24 23:16:16 +01:00
heikki@hundin.mysql.fi
bd6ccd46fc configure.in: 
Fix linking error in 5.0: the build system for Linux/S390 does not have inlining working in the compiler; remove inlining on that system
 2004-11-24 19:41:38 +02:00
tomas@poseidon.ndb.mysql.com
c22266886c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
 2004-11-24 17:41:37 +00:00
tomas@poseidon.ndb.mysql.com
489b411640 added explanation of error code 4335 2004-11-24 17:40:40 +00:00
bar@mysql.com
0f79f61480 Bug#6787 LIKE not working properly with _ and utf8 data 2004-11-24 20:09:54 +04:00
joreland@mysql.com
de031d0e5a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-11-24 17:09:53 +01:00