tsmith@siva.hindu.god
bc0e0ba7cc
Merge siva.hindu.god:/home/tsmith/m/bk/mysql-5.0-build
...
into siva.hindu.god:/home/tsmith/m/bk/mysql-5.1-build
2007-01-11 13:50:48 -07:00
joerg@trift2.
759b66479c
Merge trift2.:/MySQL/M50/tmp1-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-01-11 20:20:43 +01:00
kent@mysql.com/kent-amd64.(none)
ba7b6e86f2
configure.in:
...
Corrected default for --disable-grant-options
2007-01-10 18:19:51 +01:00
kent@mysql.com/kent-amd64.(none)
1768b21a14
configure.in:
...
Removed line accidently inserted when correcting bug#18526
2007-01-10 14:50:09 +01:00
tsmith@siva.hindu.god
bac65ee90a
WL #3670 : Compile-time option to remove GRANT-related startup options
...
- configure --disable-grant-options defines DISABLE_GRANT_OPTIONS
- configure.js/cmake also updated
- if DISABLE_GRANT_OPTIONS is defined, mysqld no longer recognizes:
--bootstrap
--init-file
--skip-grant-tables
Scripts which rely on those three options are modified to check the environment for MYSQLD_BOOTSTRAP; it should be set to the full path of a mysqld which does handle those options.
For example:
$ export MYSQLD_BOOTSTRAP
$ MYSQLD_BOOTSTRAP=/path/to/full/MySQL/bin/mysqld
$ mysql_install_db
$ make test
2007-01-09 19:22:01 -07:00
joerg@trift2.
cca28699c8
configure.in : Fix a wrong comment.
2007-01-09 12:21:06 +01: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
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
joerg@trift2.
51fcec6a20
configure.in : Update of the NDB version number was missing, do it.
2006-12-21 13:35:41 +01:00
bteam/mysqldev@mysql.com/production.mysql.com
1d6ff3a203
Raise version number after cloning 5.0.32
2006-12-15 13:18:16 +01:00
msvensson@neptunus.(none)
3ad4878385
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-05 18:52:58 +01:00
bteam/mysqldev@mysql.com/production.mysql.com
21435418cb
Raise version number after cloning 5.1.14-beta
2006-12-05 17:20:47 +01:00
msvensson@neptunus.(none)
971c783f7d
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-04 19:11:55 +01:00
mskold/marty@linux.site
6f0e7a2631
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-12-01 21:12:13 +01:00
monty@narttu.mysql.fi
693b906f6e
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-11-30 23:27:16 +02:00
mskold/marty@linux.site
d7e375680a
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-11-30 15:31:20 +01:00
monty@mysql.com/narttu.mysql.fi
23263db66e
Added back sql-bench directory, so that one can more easily run benchmarks on a server and add new benchmarks for new optimizations
...
Fixed memory leak in _db_set() (Bug#24497 Valgrind warning: get_one_option)
Don't call net_clear() on COM_QUIT. This avoids a warning from net_clear() after shutdown: "skipped ## bytes from file"
BUG#21428: skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
2006-11-29 22:51:09 +02:00
msvensson@shellback.(none)
284413154d
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-11-29 07:55:22 +01:00
kent@mysql.com/kent-amd64.(none)
6c85ba399d
gen_rec.awk:
...
Fix undefined behaviour.
Many files:
Reenabled build outside ource tree
2006-11-27 18:29:50 +01:00
msvensson@neptunus.(none)
0e4d97edf0
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-23 18:38:27 +01:00
baker@bk-internal.mysql.com
098571df33
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-11-22 05:54:30 +01:00
msvensson@shellback.(none)
71767fc952
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-11-21 12:00:19 +01:00
msvensson@shellback.(none)
0b89340a0b
Updates for gethostname and gethostbyname_r usage
2006-11-21 11:59:25 +01:00
lars@black.(none)
0791f80865
Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge
...
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-11-15 13:17:43 +01:00
msvensson@neptunus.(none)
460e90a1c1
Fix spelling error
2006-11-15 10:26:14 +01:00
baker@bk-internal.mysql.com
10dc80259b
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-11-14 19:47:33 +01:00
joerg/mysqldev@mysql.com/production.mysql.com
2ddb61eb93
Raise version number after cloning 5.0.30
2006-11-14 13:37:10 +01:00
bteam/mysqldev@mysql.com/production.mysql.com
d615edba34
configure.in:
...
Raise version number after cloning 5.1.13
2006-11-13 14:50:38 +01:00
mskold/marty@linux.site
e7a356a99d
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-11-13 13:01:31 +01:00
baker@bk-internal.mysql.com
52e03bac84
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-11-11 02:25:40 +01:00
brian@zim.(none)
b46c727a66
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/merge-5.1
2006-11-10 17:25:39 -08:00
brian@zim.(none)
739f2c27d0
This patch fixes the example engine, the example parser, and the example daemon to compile. AKA You can now test that the interface is actually working :)
2006-11-10 17:21:59 -08:00
petr/cps@outpost.site
e06f74f9f9
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191
2006-11-10 15:05:38 +03:00
stewart@willster.(none)
2f20405ebc
BUG#24143 Heavy file fragmentation with multiple ndbd on single fs
...
If we have the XFS headers (at build time) we can use XFS specific ioctls
(once testing the file is on XFS) to better allocate space.
This dramatically improves performance of mysql-test-run cases as well:
e.g.
number of extents for ndb_dd_basic tablespaces and log files
BEFORE this patch: 57, 13, 212, 95, 17, 113
WITH this patch : ALL 1 or 2 extents
(results are consistent over multiple runs. BEFORE always has several files
with lots of extents).
As for timing of test run:
BEFORE
ndb_dd_basic [ pass ] 107727
real 3m2.683s
user 0m1.360s
sys 0m1.192s
AFTER
ndb_dd_basic [ pass ] 70060
real 2m30.822s
user 0m1.220s
sys 0m1.404s
(results are again consistent over various runs)
similar for other tests (BEFORE and AFTER):
ndb_dd_alter [ pass ] 245360
ndb_dd_alter [ pass ] 211632
2006-11-10 01:08:35 +11:00
msvensson@neptunus.(none)
1717e280e0
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-11-08 11:40:33 +01:00
msvensson@neptunus.(none)
f28c36d079
Bump version to 5.0.30
2006-11-07 18:21:52 +01:00
anozdrin/alik@alik.
ee15c11b7c
Merge alik.:/mnt/raid/alik/MySQL/devel/5.1
...
into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-2
2006-11-07 16:24:35 +03:00
anozdrin/alik@alik.
7cf65fd309
Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-rt
...
into alik.:/mnt/raid/alik/MySQL/devel/5.0-merged-5.0-rt
2006-11-07 13:45:56 +03:00
petr/cps@outpost.site
b28b07f09f
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into outpost.site:/home/cps/mysql/trees/5.1-runtime-bug9191
2006-11-06 00:19:55 +03:00
petr/cps@outpost.site
bfbf1cdee9
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into outpost.site:/home/cps/mysql/trees/5.0-runtime-bug9191
2006-11-06 00:11:34 +03:00
cmiller@zippy.cornsilk.net
b074e13483
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-02 17:51:59 -05:00
cmiller@zippy.cornsilk.net
c34f3219b3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-11-02 17:27:42 -05:00
kent/mysqldev@mysql.com/production.mysql.com
27f3bb1065
configure.in:
...
Raise version number to 4.1.23
2006-11-02 21:58:42 +01:00
petr/cps@owlet.local
3df8165cf9
Merge mysql.com:/home/cps/mysql/trees/5.0-runtime-bug9191
...
into mysql.com:/home/cps/mysql/trees/5.1-runtime-bug9191
2006-11-01 18:18:01 +03:00
petr/cps@mysql.com/owlet.local
7974bf90aa
Merge mysql.com:/home/cps/mysql/trees/4.1-runtime-bug9191
...
into mysql.com:/home/cps/mysql/trees/5.0-runtime-bug9191
2006-11-01 17:35:35 +03:00
petr/cps@mysql.com/owlet.local
3ec542dfbd
Fix Bug #9191 "TIMESTAMP/from_unixtime() no longer accepts 2^31-1"
...
(4.1 version, with post-review fixes)
The fix for another Bug (6439) limited FROM_UNIXTIME() to
TIMESTAMP_MAX_VALUE which is 2145916799 or 2037-12-01 23:59:59 GMT,
however unix timestamp in general is not considered to be limited
by this value. All dates up to power(2,31)-1 are valid.
This patch extends allowed TIMESTAMP range so, that max
TIMESTAMP value is power(2,31)-1. It also corrects
FROM_UNIXTIME() and UNIX_TIMESTAMP() functions, so that
max allowed UNIX_TIMESTAMP() is power(2,31)-1. FROM_UNIXTIME()
is fixed accordingly to allow conversion of dates up to
2038-01-19 03:14:07 UTC. The patch also fixes CONVERT_TZ()
function to allow extended range of dates.
The main problem solved in the patch is possible overflows
of variables, used in broken-time representation to time_t
conversion (required for UNIX_TIMESTAMP).
2006-11-01 16:47:40 +03:00