jimw@mysql.com
5bd3294887
Merge mysql.com:/home/jwinstead2/mysql-4.1-5878
...
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-04 17:37:14 +01:00
jimw@mysql.com
254f89e9f8
Merge
2005-01-04 17:36:16 +01:00
paul@kite-hub.kitebird.com
913f505769
client.c:
...
Make multi-statements the preferred option name (to coincide
with the renaming of the CLIENT_MULTI_RESULTS symbol to
CLIENT_MULTI_STATEMENTS). Continue to allow multi-queries
for backward compatibility.
2005-01-04 10:32:42 -06:00
jimw@mysql.com
954d0181ec
Make query_cache_wlock_invalidate visible in SHOW VARIABLES (Bug #7594 )
2005-01-04 02:45:01 +01:00
jimw@mysql.com
663396653a
Use 'ps xaww' in mysqld_safe (on Linux) so whole command-line is searched
...
for port and/or pid-file parameters. (Bug #5878 )
2005-01-04 01:49:29 +01:00
lenz@mysql.com
5a568a13da
Merge mysql.com:/space/my/mysql-4.0
...
into mysql.com:/space/my/mysql-4.1-build
2005-01-03 21:37:41 +01:00
lenz@mysql.com
2e95c0f49a
- Updated Bootstrap to include merge ChangeSets in the source distribution's
...
ChangeLog, too (to be more exact when tagging a release that's based on a
merge ChangeSet)
2005-01-03 21:28:14 +01:00
joreland@mysql.com
875af1330b
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-03 20:12:42 +01:00
joreland@mysql.com
18920d4831
bug#7626 - post review version
2005-01-03 20:10:23 +01:00
joreland@mysql.com
b852147b5d
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-03 19:42:38 +01:00
joreland@mysql.com
7d0d191999
bug#7626 - ndb UintPtr handling
2005-01-03 19:39:09 +01:00
kent@mysql.com
c725e09089
mtr_process.pl:
...
Added missing stop_reap_all() if returns early from function
mysql-test-run.pl:
Improved output from --script-debug
Initial Cygwin support
Improved mysqld process termination
2005-01-03 16:54:08 +01:00
kent@mysql.com
dd19a613bc
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-03 16:49:55 +01:00
serg@sergbook.mysql.com
a606a7d16f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-01-03 15:36:00 +02:00
serg@sergbook.mysql.com
b425811d6e
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-01-03 15:35:59 +02:00
wax@mysql.com
e2ba3a1118
Merge mysql.com:/home/wax/mysql/mysql-4.1
...
into mysql.com:/home/wax/mysql/mysql-4.1test2
2005-01-03 18:35:58 +05:00
serg@sergbook.mysql.com
5e18c54646
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-01-03 15:35:58 +02:00
hf@deer.(none)
75f6c8ad1c
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.7545
2005-01-03 17:35:57 +04:00
hf@deer.(none)
27eff9f700
Fix for bug #7545 (Undefined symbols if --without-geometry)
2005-01-03 17:33:04 +04:00
kent@mysql.com
f098575122
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-03 11:41:24 +01:00
paul@snake-hub.snake.net
fc0d550bad
set_var.cc:
...
Silence compiler warning.
2005-01-02 15:10:08 -06:00
kent@mysql.com
97f5cac93c
mysql-test-run.pl:
...
Added initial support for multiple test suites
Added usage information, i.e. --help
2005-01-02 16:57:21 +01:00
wax@mysql.com
36edf8297a
Merge mysql.com:/home/wax/mysql/mysql-4.1
...
into mysql.com:/home/wax/mysql/mysql-4.1test2
2005-01-02 20:01:08 +05:00
wax@kishkin.ru
9d5fc07494
WL#964
...
move my_end() after free_used_memory()
2005-01-02 19:58:49 +05:00
serg@sergbook.mysql.com
2c6bc59307
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-01-02 12:33:42 +02:00
mskold@mysql.com
3d50cc0457
Fixed failed merge
2005-01-01 22:47:50 +01:00
mskold@mysql.com
94845764ca
Fixed failed merge
2005-01-01 22:40:40 +01:00
mskold@mysql.com
efbf87be07
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-01-01 21:57:41 +01:00
kent@mysql.com
27a2ba89c1
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-01 19:31:55 +01:00
kent@mysql.com
dc175d4665
mysql-test-run.pl:
...
Added --ps-protocol and --embedded-server
2005-01-01 19:27:41 +01:00
heikki@hundin.mysql.fi
637e643233
log0recv.c:
...
Fix a wrong memset in InnoDB Hot Backup code; the bug probably did not affect anything since we do not assume that the header of a log file is filled with zeros before writing the header info there; the bug found by Felix von Leitner
2005-01-01 13:49:53 +02:00
serg@sergbook.mysql.com
203cc19e48
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2004-12-31 18:00:49 +01:00
heikki@hundin.mysql.fi
7c31f2ff43
row0upd.c:
...
Fix a little bug in InnoDB: we looked at the physical size of a stored SQL NULL value from a wrong field in the index; this has probably caused no bugs visible to the user, only caused some extra space usage in some rare cases; we may later backport the fix to 4.0
2004-12-31 15:05:41 +02:00
mskold@mysql.com
20c89180fa
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2004-12-31 13:50:04 +01:00
lenz@mysql.com
8f499239e3
- updated compile-dist to include NDB cluster
2004-12-31 13:12:36 +01:00
lenz@mysql.com
bd5e4d81e7
Merge mysql.com:/space/my/mysql-4.0
...
into mysql.com:/space/my/mysql-4.1-build
2004-12-31 12:57:05 +01:00
serg@sergbook.mysql.com
b8cbe63bfe
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2004-12-31 12:55:42 +01:00
lenz@mysql.com
24af30e951
- Bootrap now uses "compile-dist" by default to create the source distribution
2004-12-31 12:46:18 +01:00
serg@sergbook.mysql.com
45ce994e5d
post-merge
2004-12-31 11:52:14 +01:00
lenz@mysql.com
f455778fc1
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2004-12-31 10:52:19 +01:00
lenz@mysql.com
12527e5c47
- added the "Archive", "CSV" and "Example" storage engines to the Linux
...
"Max" RPM
2004-12-31 10:38:51 +01:00
mronstrom@mysql.com
c6491a6873
Checking size to no of free + 1 was not correct when
...
entry was released before check. Thus empty it is when
size == no of free
This caused a memory leak which inserted a hard limit of
max 64 unique indexes in the cluster.
2004-12-31 02:18:21 +01:00
dlenev@brandersnatch.localdomain
cd98fcf4e9
Merged fixes for bug #7297 "Two digit year should be interpreted
...
correctly even with zero month and day" and bug #7515 "from_unixtime(0)
now returns NULL instead of the Epoch" into 4.1 tree.
2004-12-30 23:44:42 +03:00
mskold@mysql.com
76b2df6043
Merged bugfix
2004-12-30 21:36:16 +01:00
serg@sergbook.mysql.com
c7e756f959
merged
2004-12-30 21:11:40 +01:00
serg@sergbook.mysql.com
12bf7dcd04
unsufficient privilege checks in GRANT, when a grantor has column-level privileges
2004-12-30 21:01:11 +01:00
marty@linux.site
1ddb554b8b
Fix for bug #7480 Mysqld crash in ha_ndbcluster using Query Browser
2004-12-30 19:56:09 +01:00
dlenev@mysql.com
4ef7ac5c09
Manual merge of fix for bugs of #7297 and #7515 into 4.1 tree.
2004-12-30 21:37:32 +03:00
dlenev@mysql.com
2600fb3bdf
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/dlenev/src/mysql-4.0-bg7297
2004-12-30 21:18:45 +03:00
dlenev@mysql.com
2878395ab1
Fix for bug #7515 "from_unixtime(0) now returns NULL instead of
...
the Epoch". (With after review fixes).
2004-12-30 21:18:10 +03:00