brian@zim.(none)
4e8d92e5dd
Final cleanup for new archive internal format. All new headers work.
2007-01-12 20:05:55 -08:00
brian@zim.(none)
ab1a97f5ef
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/archive-format-5.1
2007-01-11 00:28:22 -08:00
brian@zim.(none)
9879f4363f
New azio which keeps meta data in its own header.
2007-01-10 23:53:08 -08:00
brian@zim.(none)
05d05c776f
Fix for when shell version of mysql-test-run is called.
2007-01-05 22:28:53 -08:00
brian@zim.(none)
77004aabf2
Cleaning up warning for windows. Innodb is compiled but disable on Windows, so it should be fine. NDB wasn't compiled in, which is what caused the issue.
2007-01-05 20:20:53 -08:00
brian@zim.(none)
c578350e05
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/merge-5.1
2007-01-04 12:06:40 -08:00
brian@zim.(none)
452a1331b2
The CSV format has always relied on numbers being quoted, which doesn't always happen. This fixes that so that numbers can now be unquoted (and the output does this as well so that the log takes up less space).
2007-01-04 11:41:17 -08:00
baker@bk-internal.mysql.com
9ffaf185f0
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-01-04 19:54:52 +01:00
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
joerg@trift2.
60a3f102a4
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into trift2.:/MySQL/M51/mysql-5.1
2007-01-02 17:13:42 +01:00
joerg@trift2.
c445abef91
server-tools/instance-manager/Makefile.am
...
Delete compiler-specific flag setting - it makes builds break.
2007-01-02 17:11:15 +01:00
kent@kent-amd64.(none)
7281ab80c8
Merge mysql.com:/home/kent/bk/main/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2007-01-02 11:06:16 +01:00
kent@mysql.com/kent-amd64.(none)
499eb4d8ba
view.result:
...
Temporary work around for bug#25359
2007-01-02 11:01:48 +01: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
stewart@willster.(none)
344d78a563
Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
...
into willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-mgm-work
2006-12-28 22:53:21 +11:00
tomas@poseidon.mysql.com
4333bcabd7
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2006-12-27 19:36:41 +01: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@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