df@kahlann.erinye.com
ad1abb3cb3
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
2006-12-18 14:38:00 +01:00
df@kahlann.erinye.com
038f0051b5
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release
2006-12-18 13:49:53 +01:00
df@kahlann.erinye.com
5ad288f18b
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-12-18 13:44:57 +01:00
df@kahlann.erinye.com
4a98f36e59
Use a temporary directory for sockets if the socket path becomes too long.
2006-12-18 13:44:21 +01:00
df@kahlann.erinye.com
c78b3c4ee8
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-12-18 13:35:29 +01:00
joerg@trift2.
534b2ca0a8
support-files/mysql.spec.sh
...
Fix the move of "mysqlmanager" to section 8: Directory name was wrong.
2006-12-18 11:51:45 +01:00
df@kahlann.erinye.com
6a0ce67209
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-12-15 22:57:40 +01:00
evgen@moonbone.local
8f5429be28
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-15 23:06:20 +03:00
df@kahlann.erinye.com
905d9e848c
also include data files for varbinary test in binary distribution
2006-12-15 17:57:31 +01:00
df@kahlann.erinye.com
0cce240581
minor fixup
2006-12-15 17:45:17 +01:00
jonas@perch.ndb.mysql.com
6ffda53e88
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-12-15 17:24:15 +01:00
jonas@perch.ndb.mysql.com
b4d323c09a
ndb - bug#25059
...
incorrect handling of commit/ignore error in unique index code
2006-12-15 15:39:45 +01:00
jonas@perch.ndb.mysql.com
5b16e6bf95
ndb - bug#25090
...
add testcase
2006-12-15 13:31:31 +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
jonas@perch.ndb.mysql.com
c9fe45e12a
ndb - bug#25090
...
make sure apicon timer is reset when setting CS_CONNECTED
2006-12-15 12:37:55 +01:00
gkodinov/kgeorge@macbook.gmz
d56d3a6971
Bug #15439 : UDF name case handling forces DELETE FROM mysql.func to remove
...
the UDF
When deleting a user defined function MySQL must remove it from both the
in-memory hash table and the mysql.proc system table.
Finding (and removal therefore) from the internal hash table is case
insensitive (or whatever the default charset is), whereas finding and
removal from the system table is case sensitive.
As a result if you supply a function name that is not in the same character
case to DROP FUNCTION the server will remove the function only from the
in-memory hash table and will keep the row in mysql.proc system table.
This will cause inconsistency between the two structures (that is fixed
only by restarting the server).
Fixed by using the name in the precise case (from the in-memory hash table)
to delete the row in the mysql.proc system table.
2006-12-15 11:38:30 +02:00
df@kahlann.erinye.com
c4676b699a
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
2006-12-15 09:28:40 +01:00
df@kahlann.erinye.com
911435414a
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-12-15 09:27:23 +01:00
joerg@trift2.
9b8c7ffc19
Merge trift2.:/MySQL/M41/spec-4.1
...
into trift2.:/MySQL/M41/push-4.1
2006-12-14 22:57:33 +01:00
joerg@trift2.
daba0ecbdc
Merge trift2.:/MySQL/M50/spec-5.0
...
into trift2.:/MySQL/M50/push-5.0
2006-12-14 22:52:38 +01:00
joerg@trift2.
a62051b77c
support-files/mysql.spec.sh
...
The "mysqlmanager" man page got moved from section 1 to 8.
2006-12-14 22:41:26 +01:00
joerg@trift2.
8bdcf736bb
Merge trift2.:/MySQL/M41/spec-4.1
...
into trift2.:/MySQL/M50/spec-5.0
2006-12-14 22:37:13 +01:00
joerg@trift2.
5582d60177
support-files/mysql.spec.sh
...
The Docs team has two new manpages for the "server" RPM: "my_print_defaults" and "mysql_tzinfo_to_sql".
2006-12-14 22:30:32 +01:00
df@kahlann.erinye.com
02d6bcaae0
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
2006-12-14 13:32:27 +01:00
df@kahlann.erinye.com
0231b019cd
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-12-14 13:31:11 +01:00
df@kahlann.erinye.com
9497df0b86
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
2006-12-14 09:34:24 +01:00
df@kahlann.erinye.com
95564bfea3
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
2006-12-14 09:33:27 +01:00
igor@olga.mysql.com
8642d23b6a
Fixed bug #25027 .
...
Blocked evaluation of constant objects of the classes
Item_func_is_null and Item_is_not_null_test at the
prepare phase in the cases when the objects used subqueries.
2006-12-13 21:08:25 -08:00
svoj@mysql.com/april.(none)
db88cf3df7
Merge mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.0-engines
2006-12-13 16:29:33 +04:00
svoj@mysql.com/april.(none)
f92ae8d6c1
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-4.1-engines
2006-12-13 15:53:37 +04:00
igor@olga.mysql.com
026196c4ef
Fixed bug #25027 .
...
Removed an assertion that was not valid for the cases where the query
in a prepared statement contained a single-row non-correlated
subquery that was used as an argument of the IS NULL predicate.
2006-12-13 00:39:13 -08:00
igor@olga.mysql.com
11cdca9a2f
Merge olga.mysql.com:/home/igor/mysql-4.1-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2006-12-12 11:53:09 -08:00
evgen@moonbone.local
7820d1b916
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt1
2006-12-12 17:57:51 +03:00
df@kahlann.erinye.com
b9cce096a2
BUG#24896 magnus' suggestion
2006-12-12 15:47:02 +01:00
df@kahlann.erinye.com
bd44245eb6
BUG#24902 in 5.0
2006-12-12 13:55:40 +01:00
gluh@mysql.com/gluh.(none)
635a5641bc
Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2006-12-12 15:41:43 +04:00
gluh@mysql.com/gluh.(none)
118a0c7fe2
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2006-12-12 14:01:06 +04:00
igor@olga.mysql.com
53d97a7d72
Fixed bug #24670 : optimizations that are legal only for subqueries without tables
...
and no WHERE condition were applied for any subquery without tables.
2006-12-11 18:57:23 -08:00
malff/marcsql@weblab.(none)
7696592b09
minor cleanup
2006-12-11 18:52:24 -07:00
malff/marcsql@weblab.(none)
996fa0dfbb
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.0-19194
2006-12-11 17:15:08 -07:00
malff/marcsql@weblab.(none)
506c2a722f
Bug#19194 (Right recursion in parser for CASE causes excessive stack usage,
...
limitation)
Bug#24854 (Mixing Searched Case with Simple Case inside Stored Procedure
crashes Mysqld)
Implemented code review (19194) comments
2006-12-11 16:59:02 -07:00
gluh@mysql.com/gluh.(none)
f0f4d3c0bd
Merge mysql.com:/home/gluh/MySQL/Merge/4.1
...
into mysql.com:/home/gluh/MySQL/Merge/4.1-opt
2006-12-11 15:32:07 +04:00
df@kahlann.erinye.com
78e1df3e9f
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
2006-12-11 10:51:29 +01:00
df@kahlann.erinye.com
476632aad9
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
2006-12-11 10:49:31 +01:00
istruewing@chilla.local
c583a7ba76
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-08 12:29:13 +01:00
istruewing@chilla.local
df2b93439f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-08 12:28:21 +01:00
holyfoot/hf@mysql.com/deer.(none)
4091806268
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/home/hf/work/embt/my50-embt
2006-12-08 15:22:46 +04:00
istruewing@chilla.local
ca62c94230
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2006-12-08 12:20:48 +01:00
holyfoot/hf@mysql.com/deer.(none)
f83bedabed
Merge bk@192.168.21.1:mysql-4.1-opt
...
into mysql.com:/home/hf/work/embt/my41-embt
2006-12-08 15:15:33 +04:00
df@kahlann.erinye.com
8375e6684d
BUG#24896 mysql_upgrade -p fix
2006-12-08 10:23:03 +01:00