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
41437 commits 2793 branches 343 tags 1.7 GiB
Commit graph

41437 commits

This branch
This branch
All branches
Author SHA1 Message Date
brian@zim.(none)
6ff7092698 Split out the hidden class from the ha_tina file (probably should have just deleted it...) but this is a bit better. 2007-01-03 17:26:45 -08: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
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@june.mysql.com
838fe3a04e Merge mysql.com:/home/svoj/devel/mysql/BUG25048/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG25048/mysql-5.1-engines
 2006-12-26 18:04:31 +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
kent@kent-amd64.(none)
3368730535 Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1
 2006-12-23 20:07:31 +01:00
patg@radha.patg.net
edc6cfa2c3 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-merge
 2006-12-22 12:23:24 -05:00
baker@bk-internal.mysql.com
abef375178 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-12-22 18:04:33 +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
bd929199b3 Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-12-21 19:04:31 +01: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
joerg@trift2.
51fcec6a20 configure.in : Update of the NDB version number was missing, do it. 2006-12-21 13:35:41 +01:00
joerg@trift2.
1341cf1827 Merge trift2.:/MySQL/M50/clone-5.0 
into  trift2.:/MySQL/M51/tmp-5.1
 2006-12-21 12:18:28 +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
joerg@trift2.
2d1292ce7d Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2006-12-21 11:58:03 +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
tsmith/tim@siva.hindu.god
aee48b346f 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:12:42 -07:00
msvensson@neptunus.(none)
7e7a0e95d3 Improve ndb thread shutdown handling 2006-12-20 22:57:23 +01:00
joerg/mysqldev@bk-internal.mysql.com
a420981f74 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-build
 2006-12-20 22:29:03 +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
istruewing@chilla.local
80b97a6b54 Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-12-20 20:14:28 +01:00
patg@radha.patg.net
b2008230ef WL #3031 
fixing pushbuild warnings and errors
 2006-12-20 13:40:58 -05:00
joerg@trift2.
7f0cb242bc Merge trift2.:/MySQL/M50/upward-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2006-12-20 19:24:04 +01: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
istruewing@chilla.local
33b96c3036 Merge chilla.local:/home/mydev/mysql-4.1-axmrg 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2006-12-20 18:22:26 +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
istruewing@chilla.local
d9b9778e53 Bug#25213 - Compiler warnings in MyISAM code 
Compiler warnings due to non-matching conversion
specifications in format strings in DBUG_PRINT calls,
due to non-used parameters (in non-debug mode), and
due to seemingly uninitialized variables.

Initialized variables, declared parameters unused, and
casted DBUG_PRINT arguments to get rid of warnings.
 2006-12-20 15:32:02 +01:00
istruewing@chilla.local
1d69857c4d Bug#25208 - Warnings in mi_packrec.c 
Compiler warnings due to non-matching conversion
specifications in format strings in DBUG_PRINT calls.

Fixed DBUG_PRINT format specifiactions.
 2006-12-20 15:18:09 +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
mskold/marty@linux.site
226e2be1b1 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 13:36:40 +01:00
joerg@trift2.
d9ff6ef3fa Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M50/clone-5.0
 2006-12-20 11:17:31 +01:00
joerg@trift2.
90fc044fc2 Fix silly typos in the disabling of "im_daemon_life_cycle" (bug#24415). 2006-12-20 11:13:16 +01:00
joerg@trift2.
c9572a10c4 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/build-200612151202-5.0.32/mysql-5.0-release 
into  trift2.:/MySQL/M50/clone-5.0
 2006-12-20 10:58:16 +01:00
joerg@trift2.
eb7dfa032c Merge trift2.:/MySQL/M50/clone-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-12-20 10:56:43 +01:00