mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41544 commits 2778 branches 343 tags 1.6 GiB
Commit graph

19083 commits

Author SHA1 Message Date
joerg@trift2.
05d161e04c Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-01-11 19:40:05 +01:00
holyfoot/hf@hfmain.(none)
e6b3a71cc0 Merge mysql.com:/d2/hf/common/my50-common 
into  mysql.com:/d2/hf/common/my51-common
 2007-01-02 17:55:18 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
726a51bc77 Merge mysql.com:/d2/hf/common/my41-common 
into  mysql.com:/d2/hf/common/my50-common
 2007-01-02 17:50:55 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
998167acce embedded-server related fixes 2007-01-02 17:46:20 +04:00
kent@kent-amd64.(none)
7e94389684 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-01-01 09:55:35 +01:00
kent@mysql.com/kent-amd64.(none)
344599948d mysqld.cc, configure.in: 
Don't use thread priority by default on Mac OS X (bug#18526)
 2007-01-01 09:54:41 +01:00
holyfoot/hf@hfmain.(none)
b4c0867df1 Merge mysql.com:/d2/hf/clean/my51-clean 
into  mysql.com:/d2/hf/common/my51-common
 2006-12-31 12:41:42 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
874d366500 Merge mysql.com:/d2/hf/clean/my50-clean 
into  mysql.com:/d2/hf/common/my50-common
 2006-12-31 12:39:20 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
0831699f5c Merge mysql.com:/d2/hf/clean/my41-clean 
into  mysql.com:/d2/hf/common/my41-common
 2006-12-31 12:37:42 +04:00
kent@mysql.com/kent-amd64.(none)
67868597bb Many files: 
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
  Added GPL copyright text
my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc:
  Changed copyright header formatting some
plugin_example.c, daemon_example.c:
  Added "Copyright (C) 2006 MySQL AB" to GPL header
 2006-12-31 02:29:11 +01:00
kent@kent-amd64.(none)
58763e383e Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-31 01:32:21 +01:00
kent@kent-amd64.(none)
895e442dbf Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-31 01:04:59 +01:00
kent@mysql.com/kent-amd64.(none)
1b8bd0d246 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.0
 2006-12-31 01:04:07 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729 my_strtoll10-x86.s: 
Corrected spelling in copyright text
Makefile.am:
  Don't update the files from BitKeeper
Many files:
  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
Many files:
  Added GPL copyright text
Removed files:
  Docs/Support/colspec-fix.pl
  Docs/Support/docbook-fixup.pl
  Docs/Support/docbook-prefix.pl
  Docs/Support/docbook-split
  Docs/Support/make-docbook
  Docs/Support/make-makefile
  Docs/Support/test-make-manual
  Docs/Support/test-make-manual-de
  Docs/Support/xwf
 2006-12-31 01:02:27 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
842b23a8fc WL#3630 (add embedded server to pushbuild) 
5.1-related fixes
libmysqld/Makefile.am fixed to recompile and link ha_*.cc files that
keep dependance on THD structure.
Minor fixes to make tests working.
 2006-12-28 09:42:04 +04:00
tomas@poseidon.
7b9a5f6de2 ndb: remove compiler warnings 2006-12-27 14:16:34 +01:00
tomas@poseidon.
044c410968 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.:/home/tomas/mysql-5.1-new-ndb
 2006-12-27 11:01:54 +01:00
kent@kent-amd64.(none)
2a10b99907 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-27 02:24:40 +01:00
kent@mysql.com/kent-amd64.(none)
1e3237fefa Many files: 
Changed header to GPL version 2 only
 2006-12-27 02:23:51 +01:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
82b03f29ac Merge xiphis.org:/home/antony/work2/mysql-5.0-engines 
into  xiphis.org:/home/antony/work2/mysql-5.0-engines-merge
 2006-12-26 16:23:05 -08:00
acurtis/antony@ltamd64.xiphis.org
54133c7e38 Merge xiphis.org:/home/antony/work2/mysql-5.1-engines 
into  xiphis.org:/home/antony/work2/mysql-5.1-engines-merge
 2006-12-26 12:33:21 -08:00
svoj@mysql.com/june.mysql.com
28d3ee656d After merge fix. 2006-12-26 22:10:02 +04:00
svoj@mysql.com/june.mysql.com
591712f53f BUG#25048 - ERROR 126 : Incorrect key file for table '.XXXX.MYI'; try to 
repair it

Multi-table delete that is optimized with QUICK_RANGE reports table
corruption.

DELETE statement must not use KEYREAD optimization, and sets
table->no_keyread to 1. This was ignored in QUICK_RANGE optimization.

With this fix QUICK_RANGE optimization honors table->no_keyread
value and does not enable KEYREAD when it is requested.
 2006-12-26 17:47:30 +04:00
kent@kent-amd64.(none)
be15e3bc15 Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-23 20:20:40 +01:00
kent@mysql.com/kent-amd64.(none)
226a5c833f Many files: 
Changed header to GPL version 2 only
 2006-12-23 20:17:15 +01:00
patg@radha.patg.net
2e538b4192 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-merge
 2006-12-22 08:57:32 -05:00
msvensson@pilot.mysql.com
fa33971252 Potential use of NULL pointer in 'plugin_for_each_with_mask', check pointer 
before referencing it.
 2006-12-22 12:27:26 +01:00
msvensson@pilot.mysql.com
791a5cf75e Merge pilot.mysql.com:/home/msvensson/mysql/my51-ndb-gca-my51-m 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-ndb
 2006-12-22 12:14:37 +01:00
msvensson@pilot.mysql.com
eb7500f44a Cset exclude: msvensson@neptunus.(none)|ChangeSet|20061220175325|03033 2006-12-22 12:14:12 +01:00
msvensson@pilot.mysql.com
abe43135b1 Bug#22694 "function plugin_foreach_with_mask() uses an uninitialized pointer" 
Fix uninitialized memory.
 2006-12-22 12:12:58 +01:00
patg@radha.patg.net
efefea6a5e WL #3031 
* Various windows errors fixed
* Increased max key length for federated
 2006-12-21 22:38:54 -05:00
istruewing@chilla.local
dee46f9100 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-12-21 18:41:01 +01:00
msvensson@pilot.mysql.com
045a953909 Merge bk-internal:/home/bk/mysql-5.1-ndb 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-ndb
 2006-12-21 17:38:44 +01:00
istruewing@chilla.local
ea353c72a6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2006-12-21 17:13:38 +01:00
msvensson@pilot.mysql.com
fe89182899 Add call to 'thd::clean_up' before deleting THD 2006-12-21 16:43:11 +01:00
mskold/marty@linux.site
7993c76c10 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-12-21 16:30:07 +01:00
msvensson@pilot.mysql.com
a498886d74 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.1 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-ndb
 2006-12-21 15:12:15 +01:00
msvensson@pilot.mysql.com
a44f076061 Merge neptunus:mysql/my51-ndb-valgrind 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-ndb
 2006-12-21 12:08:39 +01:00
tsmith/tim@siva.hindu.god
c2de802e9c Post-merge fix (related to bug 24200 changes) 2006-12-20 17:11:47 -07:00
tsmith/tim@siva.hindu.god
ab4c0f3b81 Merge siva.hindu.god:/usr/home/tim/m/bk/50-build 
into  siva.hindu.god:/usr/home/tim/m/bk/51-build
 2006-12-20 15:46:36 -07:00
msvensson@neptunus.(none)
7e7a0e95d3 Improve ndb thread shutdown handling 2006-12-20 22:57:23 +01:00
msvensson@neptunus.(none)
d7be1b7cbb Merge bk-internal:/home/bk/mysql-5.1-ndb 
into  neptunus.(none):/home/msvensson/mysql/my51-ndb-valgrind2
 2006-12-20 21:19:21 +01:00
patg@radha.patg.net
b2008230ef WL #3031 
fixing pushbuild warnings and errors
 2006-12-20 13:40:58 -05:00
msvensson@neptunus.(none)
168c5f1424 Fix valgrind warning from deinitializing ha_ndbcluster, referencing 
another handler from 'plugin_foreach'
 2006-12-20 18:53:25 +01:00
mskold/marty@linux.site
753f661bc4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-12-20 17:08:05 +01:00
tomas@poseidon.
dd2c9ea102 Bug #21806: wrong ndb binlog behaviour when cluster disconnects/restarts 
- latest gci is reinitialized to 0 at reconnect, ndb binlog thread needs to wait until valid gci is retrieved
 2006-12-20 15:34:45 +01:00
mskold/marty@mysql.com/linux.site
f55af1eade ndb_dd_ddl.test, ndb_dd_ddl.result, ha_ndbcluster.cc: 
bug#24667  After ALTER TABLE operation ndb_dd table becomes regular ndb: disallowed TABLESPACE declaration for STORAGE MEMORY
Makefile:
  Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/Makefile -> storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile
mgmapi_logevent2.cpp:
  Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent_dual.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent2.cpp
Makefile:
  Rename mgmapi_logevent_dual to mgmapi_logevent2
mgmapi_logevent2.cpp:
  Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent2.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp
 2006-12-20 15:15:26 +01:00
tsmith/tim@siva.hindu.god
7c82a06dcf Remove warnings by casting 2006-12-19 20:17:33 -07:00
tsmith/tim@siva.hindu.god
84a0873d05 Merge siva.hindu.god:/usr/home/tim/m/bk/50-24200 
into  siva.hindu.god:/usr/home/tim/m/bk/50-release
 2006-12-19 17:43:56 -07:00
tsmith/tim@siva.hindu.god
0d5dc51438 Added innodb_rollback_on_timeout option to restore the 4.1 
InnoDB timeout behavior (Bug #24200)
 2006-12-19 16:57:51 -07:00