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

34915 commits

This branch
This branch
All branches
Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
eed7775dff Bug #18483 Cannot create table with FK constraint 
- remove error set for auto partitioned tables
 2006-06-01 14:51:58 +02:00
jonas@perch.ndb.mysql.com
ee0b2615f3 ndb - acc - 
add assertion
 2006-06-01 14:36:53 +02:00
jonas@perch.ndb.mysql.com
6e19ba3ac6 ndb - bug#20197 
also close scan which are in "delivered" state, as it's impossible to release locks afterwards
 2006-06-01 14:34:46 +02:00
msvensson@shellback.(none)
3df7afbdc0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-06-01 13:35:27 +02:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
19ef4bd6f6 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
 2006-06-01 07:23:08 -04:00
serg@serg.mylan
65f57c3df1 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-06-01 12:59:40 +02:00
tomas@poseidon.ndb.mysql.com
8195bfd7d2 this should not occur now after some other fixes w.r.t LOCK_open handeling in ndb and binlog 2006-06-01 12:59:39 +02:00
jonas@perch.ndb.mysql.com
91b557eb90 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-06-01 12:57:12 +02:00
msvensson@shellback.(none)
6044b5a1f2 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-06-01 12:33:52 +02:00
msvensson@shellback.(none)
b52141a8bd Add define YASSL_PREFIX when compiling yassl 2006-06-01 12:32:35 +02:00
serg@serg.mylan
5409997d49 unittest: 
rename *.t* to *-t* to be automake-friendly
  simplify Makefiles
test_atomic.c:
  move to unittest, add GPL comment, fix warnings, convert to tap framework.
configure:
  remove custom tests for available types, use AC_CHECK_TYPE instead
x86-gcc.h:
  fix gcc -ansi errors while maintaining readability
ignore:
  added *-t
 2006-06-01 12:25:47 +02:00
anjuta@arthur.local
5459ebc572 Fixed Bug#19479:mysqldump creates invalid dump. 
Only check for FN_DEVCHAR in filenames if FN_DEVCHAR is defined.
This allows to use table names with ":" on non windows platforms.
On Windows platform get an error if you use table name that contains FN_DEVCHAR
 2006-06-01 12:34:44 +03:00
tomas@poseidon.ndb.mysql.com
a48167cb9e Merge jonas@perch:src/mysql-5.1-new-ndb 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-01 10:42:03 +02:00
jonas@perch.ndb.mysql.com
7729205c9b ndb - dbacc 
store new op when converting WRITE to UPDATE so that ACCKEYCONF gets correct
 2006-06-01 09:42:49 +02:00
jonas@perch.ndb.mysql.com
1829e60565 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
 2006-06-01 09:08:01 +02:00
jonas@perch.ndb.mysql.com
a143136b4c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-06-01 08:51:57 +02:00
jonas@perch.ndb.mysql.com
c7939ee558 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-06-01 08:50:58 +02:00
jonas@perch.ndb.mysql.com
2a01de31ef Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-06-01 08:49:14 +02:00
jonas@perch.ndb.mysql.com
b216a0281d Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-06-01 08:47:21 +02:00
tomas@poseidon.ndb.mysql.com
3ab132bdeb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-01 08:46:23 +02:00
mskold@mysql.com
fbe1319c28 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/marty/MySQL/mysql-5.0
 2006-06-01 08:43:47 +02:00
jonas@perch.ndb.mysql.com
96f31a67ac Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-06-01 08:34:57 +02:00
jonas@perch.ndb.mysql.com
1848c50b9b Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-06-01 08:28:59 +02:00
jonas@perch.ndb.mysql.com
1a6c83f04d ndb - bug#20185 
Dont be too aggressive in Dbtc::nodeFailCheckTransaction
  let it timeout by 1, so that it does not assert that it has waited too long
  old impl. set timeotu value to 0, making timeout = (ctcTimer - 0) which could be quite big.
 2006-06-01 08:24:05 +02:00
igor@rurik.mysql.com
d350bd9050 Post-merge fixes 2006-05-31 22:55:45 -07:00
igor@rurik.mysql.com
2fca3df452 Manual merge 2006-05-31 18:12:13 -07:00
igor@rurik.mysql.com
0585e50599 Merge rurik.mysql.com:/home/igor/tmp_merge 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-05-31 18:10:02 -07:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
31665cb561 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
 2006-05-31 18:24:34 -04:00
serg@serg.mylan
2b9b84460a mention new files in Makefile 2006-06-01 00:03:05 +02:00
msvensson@devsrv-b.mysql.com
e5963d6a17 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0
 2006-06-01 00:01:52 +02:00
msvensson@shellback.(none)
b33466d3dc Import patch from yaSSL 
- avoid allocating memory for each call to 'EVP_md5' and 
   'EVP_des_ede3_cbc' which were not released until server was stopped
 - Those functions are used from the SQL function 'des_encrypt' and
   'des_decrypt'.
 2006-05-31 23:36:50 +02:00
tomas@poseidon.ndb.mysql.com
586f00b279 Bug #18947 CRBR: order in binlog of create table and insert (on different table) not determ 
- move clear of slock until after completion of data events on the binlog
 2006-05-31 23:24:25 +02:00
msvensson@shellback.(none)
8adf77b953 Add define YASLSL_PREFIX 2006-05-31 23:06:56 +02:00
msvensson@shellback.(none)
50ff56d4fc Add new define YASSL_PREFIX beforee including ssl.h to activate inclusion of prefix_*.h files 2006-05-31 22:21:40 +02:00
msvensson@shellback.(none)
589c94eba5 Import from yaSSL 2006-05-31 22:19:17 +02:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
ff3d79bc7e Merge c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17310 
into  c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
 2006-05-31 14:08:58 -04:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
f1337d3ef1 Merge c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20161 
into  c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
 2006-05-31 14:07:43 -04:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
02b3293592 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
 2006-05-31 13:51:01 -04:00
aelkin@dl145k.mysql.com
5d8d38ee4c Bug#14157: utf8 encoding in binlog without set character_set_client 
adapting to pushbuild's custom to switch from default pathes. The name for
var directory must be set with MYSQLTEST_VARDIR.
 2006-05-31 19:49:38 +02:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
fbd7a258e2 BUG#18198: Many strange partition functions were allowed, now only strictly allowed functions are ok 2006-05-31 13:32:14 -04:00
serg@serg.mylan
3679f433d4 correct type for federated_db_init() 2006-05-31 19:12:17 +02:00
serg@serg.mylan
5d5b9fedfe Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-05-31 18:49:12 +02:00
serg@serg.mylan
efdf221d49 WL#2595 - atomic operations 2006-05-31 18:44:09 +02:00
serg@serg.mylan
d976a5d558 classes that are compiled conditionally in log_event.cc must be defined conditionally in log_event.h 2006-05-31 18:37:16 +02:00
serg@sergbook.mysql.com
2e16f1eccc after review fixes 2006-05-31 18:07:32 +02:00
msvensson@shellback.(none)
c542aa8701 Merge shellback.(none):/home/msvensson/mysql/bug19575/my50-bug19575 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-05-31 16:32:08 +02:00
msvensson@shellback.(none)
fe0e91d501 Bug#20022 mysql-test-run can't be run with secure connections turned on for all testcases 
- Part 1, fixes rpl- and federated-tests where connection is made to 127.0.0.1
 2006-05-31 16:28:03 +02:00
msvensson@shellback.(none)
20217ba36f Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_init 
- Include prefix files that renames all public functions in yaSSLs
   OpenSSL API to ya<function_name>. They will otherwise conflict
   with OpenSSL functions if loaded by an application that uses OpenSSL
   as well as libmysqlclient with yaSSL support.
 2006-05-31 16:19:06 +02:00
mskold@mysql.com
07189b3845 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  mysql.com:/home/marty/MySQL/mysql-5.1-new
 2006-05-31 16:16:04 +02:00
tomas@poseidon.ndb.mysql.com
b6f54a737a Bug #18947 CRBR: order in binlog of create table and insert (on different table) not determ 
- wait for schema event also if mysqld is a single one in cluster to ensure serialization with data events
+ some current_thd removals
+ enabling kill of sql thread during shema sync wait
 2006-05-31 16:16:03 +02:00