tsmith/tim@siva.hindu.god
7c82a06dcf
Remove warnings by casting
2006-12-19 20:17:33 -07:00
tsmith/tim@siva.hindu.god
73932df7d0
Merge siva.hindu.god:/usr/home/tim/m/bk/50-release
...
into siva.hindu.god:/usr/home/tim/m/bk/50-build
2006-12-19 17:46:28 -07:00
tsmith/tim@siva.hindu.god
84a0873d05
Merge siva.hindu.god:/usr/home/tim/m/bk/50-24200
...
into siva.hindu.god:/usr/home/tim/m/bk/50-release
2006-12-19 17:43:56 -07:00
tsmith/tim@siva.hindu.god
6cbfc343a8
Alternative decimal2double implementation using an algorithm
...
more similar to my_strtod() (and maybe even a bit faster due
to less floating point divisions).
This should at least partially fix Bug #23260 for DECIMALs
with a moderate number of total digits.
2006-12-19 17:42:26 -07:00
tsmith/tim@siva.hindu.god
0d5dc51438
Added innodb_rollback_on_timeout option to restore the 4.1
...
InnoDB timeout behavior (Bug #24200 )
2006-12-19 16:57:51 -07:00
tsmith/tim@siva.hindu.god
2bc45899c0
Bug #24947 : REPEAT function returns NULL when passed a field as the count parameter
...
Handling of large signed/unsigned values was not consistent, so some string functions could return bogus results.
The current fix is to simply patch up the val_str() methods for those string items.
It would be good clean this code up in general, to make similar problems much harder to make. This is left as an exercise for the reader.
2006-12-19 15:54:12 -07:00
istruewing@chilla.local
deeeeb4f69
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-19 12:42:22 +01:00
istruewing@chilla.local
6649a3874f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-19 12:41:39 +01:00
dfischer/mysqldev@mysql.com/production.mysql.com
3cc1a4251a
Merge mysql.com:/data0/mysqldev/my/mysql-5.0-release
...
into mysql.com:/data0/mysqldev/my/build-200612151202-5.0.32/mysql-5.0-release
2006-12-19 11:48:08 +01:00
istruewing@chilla.local
f3f5eb5cf6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2006-12-19 10:40:53 +01: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
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
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
svoj@mysql.com/april.(none)
77085c8efe
BUG#24358 - Table access crashes server
...
Having broken .frm, particulary number of field names does
not match number of fields, causes server crash.
Refuse to open a table if number of field names in a table
is not equal to number of fields in a table.
No test case, since it requires broken .frm file.
2006-12-15 16:01:56 +04: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
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
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
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
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
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
df@kahlann.erinye.com
75c7114124
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-07 16:07:14 +01:00
df@kahlann.erinye.com
19ec379b15
do not autorelease build ids when a child of mysql-test-run.pl dies
2006-12-07 16:06:29 +01:00