kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
2faea98324
Makefile.am, configure.in:
...
Man page for mysqld command move to section 8 (bug#21220)
2006-07-28 23:12:40 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
c188a3bf0a
make_binary_distribution.sh:
...
Man page for "mysqld" command move to section 8 (bug#21220)
2006-07-28 23:06:49 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
ef0c9d7588
mysql.spec.sh:
...
Man page for "mysqld" command move to section 8 (bug#21220)
2006-07-28 22:57:57 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
8daec68246
Merge mysql.com:/Users/kent/mysql/bk/tmp_merge
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-07-28 21:35:43 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
50b09967f2
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-07-28 21:29:05 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
345945165a
sql_select.cc:
...
Renamed variable, to avoid name clash with macro "rem_size"
on AIX 5.3 and "/usr/include/sys/xmem.h" (bug#17648)
asn.cpp, asn.hpp:
Avoid name clash with NAME_MAX
2006-07-28 21:26:46 +02:00
tsmith@maint1.mysql.com
28df542a7a
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into maint1.mysql.com:/data/localhome/tsmith/bk/global-50
2006-07-28 17:40:33 +02:00
aivanov/alexi@mysql.com/mysqld.localdomain
221004a892
Removing temporary changes.
2006-07-28 05:34:59 +04:00
aivanov/alexi@mysql.com/mysqld.localdomain
ef5acd5748
Temporary changes just to check some points (will be restored).
2006-07-28 03:32:39 +04:00
kroki/tomash@moonlight.intranet
13f2b26453
Revert the change after null-merge.
2006-07-27 14:43:28 +04:00
kroki/tomash@moonlight.intranet
0f1e1f826f
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-release
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-main
2006-07-27 14:38:32 +04:00
kroki/tomash@moonlight.intranet
1917a99270
BUG#21206: memory corruption when too many cursors are opened at once
...
Too many cursors (more than 1024) could lead to memory corruption.
This affects both, stored routines and C API cursors, and the
threshold is per-server, not per-connection. Similarly, the
corruption could happen when the server was under heavy load
(executing more than 1024 simultaneous complex queries), and this is
the reason why this bug is fixed in 4.1, which doesn't support
cursors.
The corruption was caused by a bug in the temporary tables code, when
an attempt to create a table could lead to a write beyond allocated
space. Note, that only internal tables were affected (the tables
created internally by the server to resolve the query), not tables
created with CREATE TEMPORARY TABLE. Another pre-condition for the
bug is TRUE value of --temp-pool startup option, which, however, is a
default.
The cause of a bug was that random memory was overwritten in
bitmap_set_next() due to out-of-bound memory access.
2006-07-27 13:59:15 +04:00
kroki/tomash@moonlight.intranet
053c9af65b
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-release
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-main
2006-07-27 13:47:36 +04:00
tsmith/tim@siva.hindu.god
80465ab6af
Merge siva.hindu.god:/usr/home/tim/m/bk/global-41
...
into siva.hindu.god:/usr/home/tim/m/bk/global-50
2006-07-26 13:30:03 -06:00
kroki/tomash@moonlight.intranet
4e845cccc4
BUG#21206: memory corruption when too many cursors are opened at once
...
Too many cursors (more than 1024) could lead to memory corruption.
This affects both, stored routines and C API cursors, and the
threshold is per-server, not per-connection. Similarly, the
corruption could happen when the server was under heavy load
(executing more than 1024 simultaneous complex queries), and this is
the reason why this bug is fixed in 4.1, which doesn't support
cursors.
The corruption was caused by a bug in the temporary tables code, when
an attempt to create a table could lead to a write beyond allocated
space. Note, that only internal tables were affected (the tables
created internally by the server to resolve the query), not tables
created with CREATE TEMPORARY TABLE. Another pre-condition for the
bug is TRUE value of --temp-pool startup option, which, however, is a
default.
The cause of a bug was that random memory was overwritten in
bitmap_set_next() due to out-of-bound memory access.
2006-07-26 16:23:07 +04:00
aivanov@mysql.com
9441aa22ea
Applied innodb-5.0-ss660 snapshot.
2006-07-26 08:26:07 +04:00
aivanov@mysql.com
e7548d2321
Merge mysql.com:/home/alexi/innodb/mysql-4.1-work
...
into mysql.com:/home/alexi/innodb/mysql-5.0-work
Null merge.
2006-07-26 07:54:25 +04:00
aivanov@mysql.com
765ed29c9a
Applied innodb-4.1-ss32 snapshot.
2006-07-26 07:47:29 +04:00
joerg@trift2.
367dcdf853
"mysql-test-run.pl" must write a "Logging:" line for the evaluation of RPM build tests.
...
(Re-apply a patch from the general tree to the clone.)
2006-07-25 12:56:23 +02:00
grog@eucla.lemis.com
f50d4caa95
slave.cc:
...
BUG#20850: Assert during slave shutdown in many rpl_* tests
This patch has already been applied to 5.1.
2006-07-25 20:00:18 +09:30
holyfoot/hf@mysql.com/deer.(none)
a9a345d9a5
Merge mysql.com:/home/hf/work/mysql-4.1.mrg
...
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-07-25 13:50:17 +05:00
joerg@trift2.
5e442de398
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into trift2.:/M41/push-4.1
2006-07-24 19:27:01 +02:00
joerg@trift2.
b7cf8cefe9
Merge trift2.:/M41/clone-4.1
...
into trift2.:/M41/push-4.1
2006-07-24 19:18:30 +02:00
msvensson@neptunus.(none)
d8151b6368
Bug#21218 Test "mysqlbinlog" fails to execute another program on Windows
...
- Send confusing output to /dev/null
2006-07-24 18:12:57 +02:00
joerg@trift2.
e31f8a662c
Merge trift2.:/M41/clone-4.1
...
into trift2.:/M50/merge-4.1-to-5.0
2006-07-24 16:30:31 +02:00
joerg@trift2.
1419b5c249
Merge trift2.:/M41/push-1-4.1
...
into trift2.:/M50/merge-4.1-to-5.0
2006-07-24 16:04:40 +02:00
joerg@trift2.
37408ed0f3
Merge trift2.:/M41/tmp_merge
...
into trift2.:/M50/merge-4.1-to-5.0
2006-07-24 15:47:57 +02:00
joerg@trift2.
5ac44f14cb
Merge trift2.:/M41/tmp_merge
...
into trift2.:/M50/merge-4.1-to-5.0
2006-07-24 14:06:17 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
38afcc3915
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-07-24 10:59:51 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
e22532fd80
mwasmnlm, mwccnlm, mwldnlm:
...
Filter out strange control characters, messes up logs
2006-07-24 10:55:26 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
694d4999ef
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b16327
2006-07-23 14:17:01 +05:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
47a9da936c
mysqlmanager.vcproj:
...
Place mysqlmanager 'pdb' file in 'client_debug' directory
mysys.vcproj:
Removed define of __NT__ from 'Debug' target
mysqld.vcproj:
Always generate 'pdb' and 'map' files
2006-07-22 02:00:33 +02:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
95197805e2
Merge bk://anubis/mysql-5.0-engines
...
into xiphis.org:/home/antony/work2/merge/mysql-5.0
2006-07-21 10:14:25 -07:00
tsmith@maint1.mysql.com
539ac78df2
Merge patch for bug #15195 from 5.0 -> 5.0-release (for 5.0.24)
2006-07-21 09:53:12 +02:00
tsmith/tim@siva.hindu.god
24f96519de
Finish the merge of the patch for bug #15195 from 4.1 -> 5.0
...
- Adapt it to work with the handlerton class
2006-07-20 13:41:00 -06:00
holyfoot/hf@mysql.com/deer.(none)
95b88445fb
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/home/hf/work/mysql-4.1.19983
2006-07-20 16:03:21 +05:00
tsmith/tim@siva.hindu.god
17cc8acc91
Partial merge of the patch for bug #15195 from 4.1 -> 5.0; more changes needed
2006-07-20 00:45:47 -06:00
kostja@bodhi.local
f22a4ce1a1
A fix and a test case for Bug#21002 "Derived table not selecting from a
...
"real" table fails in JOINs".
This is a regression caused by the fix for Bug 18444.
This fix removed the assignment of empty_c_string to table->db performed
in add_table_to_list, as neither me nor anyone else knew what it was
there for. Now we know it and it's covered with tests: the only case
when a table database name can be empty is when the table is a derived
table. The fix puts the assignment back but makes it a bit more explicit.
Additionally, finally drop sp.result.orig which was checked in by mistake.
2006-07-19 22:33:19 +04:00
tnurnberg@salvation.intern.azundris.com
36bf00709e
Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-release
...
into salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0
2006-07-19 19:52:27 +02:00
tnurnberg@salvation.intern.azundris.com
56e1d96122
manual merge, part 2/2
2006-07-19 16:50:55 +02:00
msvensson@neptunus.(none)
9a7d888aa3
Bug #21135 Crash in test "func_time"
...
- backport patch from 5.0
- "table" can be NULL in temporary fields used for type conversion
2006-07-19 15:55:04 +02:00
tnurnberg@salvation.intern.azundris.com
199bb148fd
Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-release
...
into salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-merge
2006-07-19 14:12:30 +02:00
tnurnberg@salvation.intern.azundris.com
b304cb6da8
Bug#20989: View '(null).(null)' references invalid table(s)... on SQL SECURITY INVOKER
...
REPLACE ... SELECT would require INSERT privileges on certain tables
when SELECT really suffices. Require INSERT only on target table.
2006-07-19 11:49:07 +02:00
patg@govinda.patg.net
71f5b4997a
"BUG #18764 : Delete conditions causing inconsistencies in Federated tables"
...
Post merge changes.
2006-07-18 18:41:36 -07:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
2eacb14d2e
mysql.spec.sh:
...
Added new "mysql_explain_log" man page
Added missing install of "myisam_ftdump" man page
Added missing install of "mysqlman" man page
2006-07-19 02:46:48 +02:00
patg@govinda.patg.net
259f9bb0d7
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into govinda.patg.net:/home/patg/mysql-build/mysql-5.0-bug18764.2
2006-07-18 17:21:50 -07:00
evgen@moonbone.local
b7a55b9b5c
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-07-18 23:45:17 +04:00
evgen@moonbone.local
6dd8772bfc
Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1
...
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-07-18 23:30:09 +04:00
evgen@moonbone.local
ed8eb31412
Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-07-18 21:32:25 +04:00
evgen@moonbone.local
a8d230c672
Merge moonbone.local:/work/mysql-4.1
...
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-07-18 21:30:26 +04:00