trudy@linux.site
6e258403c5
Updated file to use doxygen commenting style.
2006-12-18 18:08:38 -08:00
tsmith/tim@siva.hindu.god
2145103ac4
Merge siva.hindu.god:/usr/home/tim/m/bk/50-release
...
into siva.hindu.god:/usr/home/tim/m/bk/50-build
2006-12-18 18:48:52 -07:00
tsmith/tim@siva.hindu.god
d60550a4d6
This ChangeSet must be null-merged to 5.1.
...
Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.
Bugs fixed:
- Bug #21468 : InnoDB crash during recovery with corrupted data pages: XA bug?
- Bug #24299 : Identifiers in foreign keys cannot contain U+0160, U+0360, ..., U+FF60
- Bug #24386 : Performance degradation caused by instrumentation in mutex_struct
- Bug #24712 : SHOW TABLE STATUS for file-per-table showing incorrect time fields
2006-12-18 18:41:38 -07:00
trudy@linux.site
f498540b3f
Added back missing closing brace at file-end.
2006-12-18 17:16:40 -08:00
trudy@linux.site
9351d5e586
Update file to use doxygen commenting style.
2006-12-18 16:52:56 -08:00
trudy@linux.site
7b74da641f
Updated file to use doxygen commenting style.
2006-12-18 14:28:15 -08:00
patg@radha.patg.net
237a9482b9
WL# 3031
...
- Added more test results for hard-coded error numbers
- Fix for windows
2006-12-18 16:39:50 -05:00
baker@bk-internal.mysql.com
b1d173f510
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-12-18 17:57:34 +01:00
df@kahlann.erinye.com
7d840b96fb
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-18 14:41:55 +01:00
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.
c011b2e70f
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2006-12-18 11:59:14 +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
skozlov/ksm@mysql.com/virtop.localdomain
1f10aa10d9
fix for commit 1.2368
2006-12-18 12:52:59 +03:00
skozlov/ksm@mysql.com/virtop.localdomain
4843e335fc
fix for commit 1.2368
2006-12-18 09:46:44 +03:00
skozlov/ksm@mysql.com/virtop.localdomain
5b7c2c91c1
WL#2862
2006-12-17 23:08:04 +03: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
e67d2a07ef
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-12-15 17:17:29 +01:00
jonas@perch.ndb.mysql.com
ec4030cf71
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-12-15 17:14:41 +01:00
jonas@perch.ndb.mysql.com
2e37545419
merge fix
2006-12-15 17:12:41 +01:00
jonas@perch.ndb.mysql.com
e8e875ca33
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2006-12-15 16:57:43 +01:00
patg@radha.patg.net
2301aff234
WL #3031
...
Yet another test result that needed to be regenerated due to new error
messages. This test only runs via ./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=row rpl_extraCol_innodb
2006-12-15 09:42:41 -05: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
mskold/marty@linux.site
8753c50e37
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-12-15 09:59:26 +01: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
mskold/marty@linux.site
10f8e9fbb8
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-12-15 09:06:15 +01:00
mskold/marty@mysql.com/linux.site
532fe009b8
bug#19956 Problems with VARCHAR primary key and BLOB fields:added test case
2006-12-15 09:03:21 +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.
436aa807fb
Merge trift2.:/MySQL/M50/spec-5.0
...
into trift2.:/MySQL/M51/spec-5.1
2006-12-14 22:45:06 +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
mskold/marty@mysql.com/linux.site
856b919986
bug#19956 Problems with VARCHAR primary key and BLOB fields:put back removed error handling for HA_ERR_KEY_NOT_FOUND
2006-12-14 16:52:50 +01:00
mskold/marty@linux.site
db8329151f
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-12-14 16:42:24 +01:00
mskold/marty@linux.site
8f5f4d38a6
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-12-14 16:31:38 +01:00
mskold/marty@mysql.com/linux.site
8d8d063f91
Removed check for impossible error return
2006-12-14 16:27:14 +01:00
patg@radha.patg.net
860c27db19
BUG #25074
...
mysql_upgrade test gives inconsitent results
2006-12-14 10:07:17 -05:00