Commit graph

41663 commits

Author SHA1 Message Date
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
kent@kent-amd64.(none)
a805413c51 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 08:54:51 +01:00
kent@mysql.com/kent-amd64.(none)
fd833d7037 configure.in:
Build "mysqld_error.h" even if configured --withouth-server (bug#21265)
2007-01-01 08:49:17 +01:00
kent@mysql.com/kent-amd64.(none)
1febd444a2 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-01-01 07:23:43 +01:00
kent@mysql.com/kent-amd64.(none)
473b0c7287 configure.in:
Don't build server when configured --without-server (bug#23973)
2007-01-01 07:22:57 +01:00
kent@kent-amd64.(none)
4b2067f324 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 05:37:55 +01:00
kent@kent-amd64.(none)
204fcc66a2 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-01-01 05:36:41 +01:00
kent@mysql.com/kent-amd64.(none)
21c7eca2bf Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-01-01 05:35:10 +01:00
kent@mysql.com/kent-amd64.(none)
efd16938ce Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-01-01 05:34:17 +01:00
kent@mysql.com/kent-amd64.(none)
88b3c4f03a Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-01-01 05:31:23 +01:00
kent@mysql.com/kent-amd64.(none)
0255a1c9c2 mysql_secure_installation.sh:
Portable handling of "echo" without newline (bug#24605)
check-cpu:
  In developer script safe to use "printf", not "echo -n"
2007-01-01 05:30:31 +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
holyfoot/hf@hfmain.(none)
4e5b3baf74 Merge mysql.com:/d2/hf/common/my50-common
into  mysql.com:/d2/hf/common/my51-common
2006-12-31 12:36:36 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
2ab15de7cd Merge mysql.com:/d2/hf/common/my41-common
into  mysql.com:/d2/hf/common/my50-common
2006-12-31 12:36:06 +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
joerg@trift2.
cb5e2b3004 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2006-12-28 18:22:43 +01:00
joerg@trift2.
4e7118c70b Merge trift2.:/MySQL/M50/clone-5.0
into  trift2.:/MySQL/M50/push-5.0
2006-12-28 18:10:21 +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
joerg@trift2.
9617568c7b Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2006-12-28 10:56:23 +01:00
df@kahlann.erinye.com
3a538d1877 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
2006-12-28 10:01:03 +01:00
df@kahlann.erinye.com
ec5331593d fix breakage on qnx 2006-12-28 10:00:16 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
feff4a5ec4 bdb_notembedded.test gone 2006-12-28 10:03:25 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
c90a426993 WL (add embedded server to pushbuild)
innodb.test fix
2006-12-28 09:44:56 +04: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.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
holyfoot/hf@hfmain.(none)
52e716971f Merge hf@192.168.21.12:work/embt/my50-embt
into  mysql.com:/d2/hf/my51-embt
2006-12-26 20:22:17 +04:00
holyfoot/hf@mysql.com/deer.(none)
7254ed10e8 lock_multi disabled 2006-12-26 20:22:16 +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
gluh@mysql.com/eagle.(none)
24a4d9d3f5 Merge mysql.com:/home/gluh/MySQL/Merge/4.1
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
2006-12-25 12:58:44 +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
evgen@moonbone.local
09054bff1d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt
2006-12-23 19:56:46 +03: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