mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 07:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
15208 commits 2776 branches 343 tags 1.6 GiB
Commit graph

7388 commits

Author SHA1 Message Date
marko@hundin.mysql.fi
c03049dfd9 InnoDB: Corrected typos in DBUG_ statements 2004-09-17 17:16:02 +03:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
0b6dc49388 Bug#5553 - Multi table UPDATE IGNORE fails on dup key 
We don't want the update to abort when IGNORE is specified
 2004-09-17 12:07:59 +01:00
bell@sanja.is.com.ua
d2474ee2e5 Do not try use fields examples is expression and fiend used or SET/ENUM field used in types merging procedure (BUG#5618) 2004-09-17 13:23:57 +03:00
tomas@poseidon.(none)
4bfe7efeb0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
 2004-09-17 00:14:40 +00:00
tomas@poseidon.(none)
87ba45e99b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
 2004-09-16 23:36:48 +00:00
igor@rurik.mysql.com
c12c9af224 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2004-09-16 13:53:22 -07:00
jan@hundin.mysql.fi
762c24f29a Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2004-09-16 21:32:05 +03:00
marko@hundin.mysql.fi
a660499cd9 Merge marko@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/j/mysql-4.1
 2004-09-16 19:09:38 +03:00
bell@sanja.is.com.ua
b1374836b3 wording fixed 2004-09-16 18:37:26 +03:00
bell@sanja.is.com.ua
97a1418d16 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-update-4.1
 2004-09-16 17:47:53 +03:00
bell@sanja.is.com.ua
f6dba131eb Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-sum-4.1
 2004-09-16 16:24:46 +03:00
jani@rhols221.adsl.netsonic.fi
ac55486644 A fix for MetroWerks compiler. 2004-09-16 16:24:45 +03:00
vva@eagle.mysql.r18.ru
e58c9579fe Fixed Bug #5492 "set @@session.read_rnd_buffer_size=33554432" 
crashes server on query

incremented size of allocated buffer in the init_rr_cache(sql/records.cc)
(
We are going to read the last three bytes of the buffer via uint3korr
This macro reads actually 4 bytes (for speed)
So, we have to allocate one more byte at the end of the buffer 
to avoid memory assertion fault
)
 2004-09-16 16:10:14 +05:00
bar@mysql.com
7c4ab566d2 Return character strings in table, type, possible_keys, key fields 
of EXPLAIN SELECT, rather than binary strings.
 2004-09-16 14:47:39 +05:00
igor@rurik.mysql.com
c9265171dc Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2004-09-16 01:23:38 -07:00
mysql@mc04.(none)
d905188230 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mc04.(none):/space/mysql/mysql-4.1-ndb
 2004-09-16 09:21:49 +02:00
igor@rurik.mysql.com
cfbd2b7f7a opt_sum.cc: 
Slightly improved the fix for bug #5406.
 2004-09-15 23:52:46 -07:00
bar@mysql.com
e39a5033f2 item.cc: 
Bug #5561 No BINARY_FLAG in metadata
 2004-09-16 11:12:49 +05:00
mskold@mysql.com
251fe25bf8 Optimzed handling of NO_AUTO_VALUE_ON_ZERO 2004-09-16 04:55:22 +02:00
mikael@mc04.(none)
72017f8dd2 logging_ok: 
Logging to logging@openlogging.org accepted
SCI_Transporter.hpp, SCI_Transporter.cpp:
  Major fix-up of SCI Transporter, fixed so that it works with single card, fixed wrap around, added lots of DBUG statements, merged with new transporter handling
TransporterRegistry.cpp:
  Some fixes for wrap around needed plus DBUG handling
TCP_Transporter.hpp, TCP_Transporter.cpp:
  Added DBUG statements
SHM_Transporter.hpp, SHM_Transporter.cpp:
  Fixed SHM Transporter
SHM_Buffer.hpp:
  Fixed SHM Buffer to handle wrap around properly
IPCConfig.cpp:
  Fixed up config of SCI
SocketServer.cpp:
  Added DBUG support for SocketServer threads
ConfigInfo.cpp:
  Config changes for SCI
TransporterDefinitions.hpp, mgmapi_config_parameters.h:
  SCI fixes
Makefile.am, type_ndbapitools.mk.am, type_ndbapitest.mk.am:
  Added SCI library path to Makefiles
configure.in:
  Fixed small bug with shared mem and sci together in configure
acinclude.m4:
  Added possibility of providing SCI library path in confgure
 2004-09-15 20:41:49 +02:00
pekka@mysql.com
083e4f475a Merge 2004-09-15 19:26:00 +02:00
mskold@mysql.com
9cf8385540 Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-09-15 19:01:00 +02:00
mskold@mysql.com
4a9805679e Fixed handling of NO_AUTO_VALUE_ON_ZERO 2004-09-15 18:44:18 +02:00
pekka@mysql.com
0caba84b46 ndb charsets: DICT 2004-09-15 17:44:13 +02:00
mskold@mysql.com
089e0565d1 Added support for auto_increment of partial key 2004-09-15 17:31:15 +02:00
magnus@neptunus.(none)
013486701c BUG#4775 "Duplicate key requires rollback of transaction" - Improved error message telling that transaction is aborted 
BUG#4312 "wrong behaviour on insert .. on duplicate key" functionality disabled
 2004-09-15 14:44:21 +02:00
ram@gw.mysql.r18.ru
b3dc9f65b0 A fix (bug #5540: CONCAT function and 'double' type). 2004-09-15 15:13:17 +05:00
ram@gw.mysql.r18.ru
b5da3c1997 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5546
 2004-09-15 13:45:44 +05:00
mskold@mysql.com
be9742d43e Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-09-14 18:17:04 +02:00
ingo@mysql.com
89b29aa1b3 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug5318
 2004-09-14 18:17:03 +02:00
mskold@mysql.com
9311c81a55 Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-09-14 18:17:03 +02:00
paul@kite-hub.kitebird.com
d10383d6df Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
 2004-09-14 11:17:02 -05:00
tomas@poseidon.(none)
db1604a7c7 fix to make transaction failure also affect select count() on other tables in thread 2004-09-14 16:17:01 +00:00
tomas@poseidon.(none)
457dfbe779 Added testcase for select count() during transaction with failures 
added fix for keeping "records" up to date when execute() fails
 2004-09-14 15:51:57 +00:00
ram@gw.mysql.r18.ru
4a2cc99d3f code clean-up 2004-09-14 18:57:22 +05:00
tomas@poseidon.(none)
f896a690f8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
 2004-09-14 12:48:42 +00:00
tomas@poseidon.(none)
fc174af248 new method to set size of local table data 
clearer configure description texts
changed Ndb_local_table_info to use create, destroy metods and hidden constructor/destructor
move definition if Thd_ndb to .h file and changes seize/release to operate on Thd_ndb instead of Ndb objects
moved allocation/deletion of Ndb objects to Thd_ndb
 2004-09-14 12:47:34 +00:00
ram@gw.mysql.r18.ru
998504d715 A fix (bug #5546: mysqld crash on PURGE MASTER LOGS BEFORE '...' with log-bin off). 2004-09-14 17:30:57 +05:00
ingo@mysql.com
38767cadba Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug5318
 2004-09-14 13:50:30 +02:00
ingo@mysql.com
ce8db2bfb7 BUG#5318 - failure: 'IGNORE_SPACE' affects numeric values after DEFAULT. 
Added a check to recover from IGNORE_SPACE in this situation: 
<ident-character(s)><space><dot><ident-character(s)>
The ignored space led to the false identification of the dot
as an ident separator (like "db.table").
 2004-09-14 13:49:08 +02:00
tomas@poseidon.(none)
24ceb26d4d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
 2004-09-14 09:15:43 +00:00
tomas@poseidon.(none)
aecd1e5d7f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
 2004-09-14 08:55:09 +00:00
tomas@poseidon.(none)
21a4b1b4e6 moved all ndb thread specific data into new placeholder 
new methods to keep "records" up to date
unset flag HA_NOT_EXACT_COUNT to make handler read "records" field, for count() optim and join optimization
new methods to keep "records" up to datecorrect record field in ndbcluster handler
new method for ndbcluster handler to store/retrieve table and thread specific data
changed local hash to store new table_info object, with placeholders for local data, instead of TableImpl
hanged deleteKey to return ponter to deleted object
moved heavy global cache fetch from inline to separate method
 2004-09-14 08:52:21 +00:00
ram@gw.mysql.r18.ru
beb5d60a6b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5497
 2004-09-14 13:09:51 +05:00
ram@gw.mysql.r18.ru
e5a0524fe6 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b5498
 2004-09-14 13:08:54 +05:00
magnus@neptunus.(none)
619b8a0beb Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into neptunus.(none):/home/magnus/mysql/wl/wl1424_discover_2
 2004-09-14 10:03:56 +02:00
hf@deer.(none)
118669b418 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.4815
 2004-09-14 10:07:17 +05:00
hf@deer.(none)
7ec92d572c Merging 2004-09-14 10:04:35 +05:00
joerg@mysql.com
481f8d5b1c Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2004-09-13 23:31:15 +02:00
mskold@mysql.com
6370af0bb2 Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-09-13 22:31:16 +02:00