mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 21:42:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
33479 commits 2784 branches 343 tags 1.6 GiB
Commit graph

33479 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
88b597fc22 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


sql/sql_parse.cc:
  Auto merged
 2006-04-27 08:44:42 +02:00
unknown
3ada0dd96f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
 2006-04-27 08:25:55 +02:00
unknown
13b1f47df8 Merge mysql.com:/home/psergey/bk-trees/mysql-5.0 
into  mysql.com:/home/psergey/mysql-5.1-merge


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
 2006-04-27 01:41:27 +04:00
unknown
ec8be6d4f2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-26 23:10:32 +02:00
unknown
a98ae9143f Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-04-26 17:01:01 +02:00
unknown
6fe40f76e2 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/r/view.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
  Auto merged
configure.in:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
sql/share/errmsg.txt:
  manual merge
storage/ndb/src/mgmsrv/Services.cpp:
  manual merge
 2006-04-26 17:01:00 +02:00
unknown
0959264abd Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  three.local.lan:/home/matthias/Arbeit/mysql-5.1/src-Bug
 2006-04-26 17:01:00 +02:00
unknown
25a0e7b3fd Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-04-26 17:01:00 +02:00
unknown
f94b1db442 Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug18129
 2006-04-26 17:00:59 +02:00
unknown
adad4df2ec Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/matthias/Arbeit/mysql-5.1/src-Bug
 2006-04-26 17:00:59 +02:00
unknown
2a89d99da4 Added test for violation of uniqueness constraint at create index 2006-04-26 17:00:59 +02:00
unknown
ab64e9b3df Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/rpl_openssl.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/rpl_openssl.result:
  Merge
mysql-test/r/trigger.result:
  Merge
mysql-test/t/trigger.test:
  Merge
 2006-04-26 17:00:58 +02:00
unknown
09999bc21f Corrected include path to work under Windows 2006-04-26 17:00:58 +02:00
unknown
14fd0720e5 Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug18129
 2006-04-26 17:00:58 +02:00
unknown
4b49959d12 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/matthias/Arbeit/mysql-5.1/src-Bug


mysql-test/t/disabled.def:
  Auto merged
 2006-04-26 17:00:58 +02:00
unknown
fb0f88aac8 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
 2006-04-26 19:00:57 +04:00
unknown
2f955d19a6 Bug #18550 ndbd getting "node failure handling not complete..." after graceful restart 
- addded more retries to wait for nodefailure to complete
Bug #19039 multi node failure causes node failure handling not to complete
- patch to avoid this scenario when the management server is used to perform the stop
- wait for NF_COMPLETE_REP in management server before returning
ndb: allocate nodeid
- only retry on retryable error
 2006-04-26 16:57:45 +02:00
unknown
51ddd6ff31 Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error 
- added retry handling of temporary transaction errors
 2006-04-26 16:57:44 +02:00
unknown
c0c6461a11 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-04-26 16:57:43 +02:00
unknown
1a11f57a95 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-04-26 16:57:42 +02:00
unknown
2a04d49e77 ndb: added timeout handling to alloc node id to avoid the usage of purge stale sessions 2006-04-26 16:57:41 +02:00
unknown
101e3703d9 fixed error message text 2006-04-26 17:57:41 +03:00
unknown
e1e3a93f73 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-04-26 16:57:41 +02:00
unknown
2ce6146b77 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492
 2006-04-26 18:57:40 +04:00
unknown
074cdd6277 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
 2006-04-26 12:48:12 +04:00
unknown
115100c743 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492
 2006-04-26 12:45:29 +04:00
unknown
c2e1ba6405 Merge mysql.com:/home/alexi/mysql-5.0 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492
 2006-04-26 12:43:38 +04:00
unknown
173f164bfc Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492 
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
 2006-04-26 11:27:15 +04:00
unknown
0fc093fa19 Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
 2006-04-26 11:23:43 +04:00
unknown
c2e6c898ac Make innodb_mysql produce a non-empty output. 
mysql-test/r/innodb_mysql.result:
  Fix result.
 2006-04-26 11:15:09 +04:00
unknown
65d9e36fa6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
 2006-04-26 08:38:50 +02:00
unknown
23e98e0783 configure.in: 
clone-off for 5.0.21


configure.in:
  clone-off for 5.0.21
 2006-04-26 08:26:33 +02:00
unknown
8ea292209f Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work 
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492-work


mysql-test/t/innodb.test:
  Auto merged
 2006-04-26 09:59:05 +04:00
unknown
47a0479811 Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work


mysql-test/t/innodb.test:
  Auto merged
 2006-04-26 09:56:06 +04:00
unknown
a4c62dbb8a Files innodb.[test|result] are to be used by Innobase only. 
Use files innodb_mysql.[test|result] instead.


mysql-test/t/innodb.test:
  This file is to be used by Innobase only.
mysql-test/r/innodb_mysql.result:
  New BitKeeper file ``mysql-test/r/innodb_mysql.result''
   Use this file instead of innodb.result.
mysql-test/t/innodb_mysql.test:
  New BitKeeper file ``mysql-test/t/innodb_mysql.test''
   Use this file instead of innodb.test.
 2006-04-26 09:51:57 +04:00
unknown
36a87d0c0c after merge 2006-04-25 22:39:59 -07:00
unknown
4836c27d47 Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0


sql/sql_parse.cc:
  Auto merged
 2006-04-25 21:32:30 -07:00
unknown
67d23360d7 Applied innodb-5.1-ss492 snapshot. 
* Fix BUG#19217 "dict_load_indexes() may read the delete-mark incorrectly".
 * Remove obsolete and unused variables from srv0srv.c.
 * Remove srv_sys->operational since it is unused.
 * Make thread_id parameter in os_thread_create() optional.
 * Add platform-specific os_thread_ret_t and OS_THREAD_DUMMY_RETURN,
   and convert thread start functions to use them.


storage/innobase/dict/dict0dict.c:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/dict/dict0load.c:
  Applied innodb-5.1-ss492 snapshot.
   dict_load_indexes(): pass comp=0 to rec_get_deleted_flag(), because
   SYS_INDEXES always is in ROW_FORMAT=REDUNDANT (Bug #19217).
storage/innobase/include/os0thread.h:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/include/srv0srv.h:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/include/trx0roll.h:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/include/univ.i:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/log/log0recv.c:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/os/os0thread.c:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/que/que0que.c:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/srv/srv0srv.c:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/srv/srv0start.c:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/trx/trx0roll.c:
  Applied innodb-5.1-ss492 snapshot.
 2006-04-26 08:30:37 +04:00
unknown
34f1f0b5fd disable before investigation why test case for 19170 is failing on 
some platforms.
 2006-04-26 07:29:26 +03:00
unknown
f13569a76b Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work 
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492-work
 Null-merge.


storage/innobase/dict/dict0load.c:
  Null-merge.
 2006-04-26 07:53:49 +04:00
unknown
0b64b88257 Applied innodb-5.0-ss492 snapshot. 
Fixed BUG#19217 "dict_load_indexes() may read the delete-mark incorrectly".


innobase/dict/dict0load.c:
  Applied innodb-5.0-ss492 snapshot.
   dict_load_indexes(): pass comp=0 to rec_get_deleted_flag(), because
   SYS_INDEXES always is in ROW_FORMAT=REDUNDANT (Bug #19217).
 2006-04-26 07:50:29 +04:00
unknown
a940b1a744 after merge fix 2006-04-25 17:12:06 -07:00
unknown
f14bb14cb0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
 2006-04-26 01:13:16 +02:00
unknown
261136c090 ndb: break out ndb backup compatability test, so that it can be disabled on mac 
mysql-test/include/have_case_sensitive_file_system.inc:
  New BitKeeper file ``mysql-test/include/have_case_sensitive_file_system.inc''
mysql-test/r/case_sensitive_file_system.require:
  New BitKeeper file ``mysql-test/r/case_sensitive_file_system.require''
mysql-test/r/ndb_restore_compat.result:
  New BitKeeper file ``mysql-test/r/ndb_restore_compat.result''
mysql-test/t/ndb_restore_compat.test:
  New BitKeeper file ``mysql-test/t/ndb_restore_compat.test''
 2006-04-26 01:11:40 +02:00
unknown
23669046c8 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-04-26 00:28:54 +02:00
unknown
3486ba0189 Fix compile failure on Win32 2006-04-26 01:21:33 +04:00
unknown
e262aaa885 merged 2006-04-25 14:06:04 -07:00
unknown
249ff24975 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new


storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
 2006-04-25 22:40:04 +02:00
unknown
b3a7131896 buffer overflow and information exposure bugs fixed 
(reported by Stefano Di Paola)
 2006-04-25 13:37:33 -07:00
unknown
7c018c39bb Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug15827-r2
 2006-04-26 00:30:54 +04:00