svoj@mysql.com/april.(none)
5344932e14
Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-12-30 03:42:29 +04:00
svoj@mysql.com/april.(none)
45aeb7f04d
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG23196/mysql-4.1-engines
2006-12-30 02:30:19 +04:00
svoj@mysql.com/june.mysql.com
a86ee0c18c
Merge mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-engines
2006-12-29 15:33:43 +04:00
svoj@mysql.com/june.mysql.com
441f5069db
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-engines
2006-12-29 15:33:03 +04:00
svoj@mysql.com/june.mysql.com
63670828ba
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-4.1-engines
2006-12-29 15:17:07 +04:00
istruewing@chilla.local
3765d8a012
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-27 19:24:08 +01:00
svoj@mysql.com/april.(none)
fb01230ac5
After merge fix.
2006-12-27 19:54:49 +04:00
svoj@mysql.com/april.(none)
2fc0bca6a4
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-engines
2006-12-27 17:55:33 +04:00
svoj@mysql.com/april.(none)
19ba64de3f
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-4.1-engines
2006-12-27 16:47:06 +04:00
svoj@mysql.com/june.mysql.com
c72d93b0ed
Merge mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-5.0-engines
2006-12-27 15:50:45 +04:00
svoj@mysql.com/june.mysql.com
28b1bb363b
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-4.1-engines
2006-12-27 15:35:26 +04:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
82b03f29ac
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
...
into xiphis.org:/home/antony/work2/mysql-5.0-engines-merge
2006-12-26 16:23:05 -08:00
svoj@mysql.com/june.mysql.com
591712f53f
BUG#25048 - ERROR 126 : Incorrect key file for table '.XXXX.MYI'; try to
...
repair it
Multi-table delete that is optimized with QUICK_RANGE reports table
corruption.
DELETE statement must not use KEYREAD optimization, and sets
table->no_keyread to 1. This was ignored in QUICK_RANGE optimization.
With this fix QUICK_RANGE optimization honors table->no_keyread
value and does not enable KEYREAD when it is requested.
2006-12-26 17:47:30 +04:00
kent@mysql.com/kent-amd64.(none)
226a5c833f
Many files:
...
Changed header to GPL version 2 only
2006-12-23 20:17:15 +01:00
istruewing@chilla.local
ea353c72a6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-21 17:13:38 +01:00
joerg@trift2.
51fcec6a20
configure.in : Update of the NDB version number was missing, do it.
2006-12-21 13:35:41 +01:00
joerg/mysqldev@bk-internal.mysql.com
a420981f74
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-build
2006-12-20 22:29:03 +01:00
istruewing@chilla.local
33b96c3036
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-20 18:22:26 +01:00
svoj@mysql.com/april.(none)
32c7187952
Merge mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-engines
2006-12-20 20:01:31 +04:00
svoj@mysql.com/april.(none)
5424cf19de
Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-4.1-engines
2006-12-20 19:08:28 +04:00
svoj@mysql.com/april.(none)
5ad9035605
BUG#21310 - Trees in SQL causing a "crashed" table with MyISAM storage engine
...
An update that used a join of a table to itself and modified the
table on one side of the join reported the table as crashed or
updated wrong rows.
Fixed by creating temporary table for self-joined multi update statement.
2006-12-20 19:05:35 +04:00
istruewing@chilla.local
d9b9778e53
Bug#25213 - Compiler warnings in MyISAM code
...
Compiler warnings due to non-matching conversion
specifications in format strings in DBUG_PRINT calls,
due to non-used parameters (in non-debug mode), and
due to seemingly uninitialized variables.
Initialized variables, declared parameters unused, and
casted DBUG_PRINT arguments to get rid of warnings.
2006-12-20 15:32:02 +01:00
istruewing@chilla.local
1d69857c4d
Bug#25208 - Warnings in mi_packrec.c
...
Compiler warnings due to non-matching conversion
specifications in format strings in DBUG_PRINT calls.
Fixed DBUG_PRINT format specifiactions.
2006-12-20 15:18:09 +01:00
joerg@trift2.
90fc044fc2
Fix silly typos in the disabling of "im_daemon_life_cycle" (bug#24415).
2006-12-20 11:13:16 +01:00
joerg@trift2.
eb7dfa032c
Merge trift2.:/MySQL/M50/clone-5.0
...
into trift2.:/MySQL/M50/push-5.0
2006-12-20 10:56:43 +01:00
joerg@trift2.
f9802fd47d
Disable test "im_deamon_life_cycle", Bug#24425, see note: [19 Dec 23:17] Trudy Pelzer
2006-12-20 10:54:41 +01:00
tsmith/tim@siva.hindu.god
945756e484
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 20:23:34 -07:00
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
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
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