kent@mysql.com/kent-amd64.(none)
344599948d
mysqld.cc, configure.in:
...
Don't use thread priority by default on Mac OS X (bug#18526)
2007-01-01 09:54:41 +01:00
kent@mysql.com/kent-amd64.(none)
1b8bd0d246
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.0
2006-12-31 01:04:07 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729
my_strtoll10-x86.s:
...
Corrected spelling in copyright text
Makefile.am:
Don't update the files from BitKeeper
Many files:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
Many files:
Added GPL copyright text
Removed files:
Docs/Support/colspec-fix.pl
Docs/Support/docbook-fixup.pl
Docs/Support/docbook-prefix.pl
Docs/Support/docbook-split
Docs/Support/make-docbook
Docs/Support/make-makefile
Docs/Support/test-make-manual
Docs/Support/test-make-manual-de
Docs/Support/xwf
2006-12-31 01:02:27 +01: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
tsmith/tim@siva.hindu.god
7c82a06dcf
Remove warnings by casting
2006-12-19 20:17:33 -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
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
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
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
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
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
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
svoj@mysql.com/april.(none)
e17d7bce00
BUG#23404 - ROW_FORMAT=FIXED option is lost is an index is added to the
...
table
ROW_FORMAT option is lost during CREATE/DROP INDEX.
This fix forces CREATE/DROP INDEX to retain ROW_FORMAT by instructing
mysql_alter_table() that ROW_FORMAT is not used during creating/dropping
indexes.
2006-12-07 18:32:40 +04:00
holyfoot/hf@mysql.com/deer.(none)
9203d43427
merging
2006-12-07 09:11:56 +04:00
holyfoot/hf@mysql.com/deer.(none)
9e52ef1f9d
Merge mysql.com:/home/hf/work/22372/my41-22372
...
into mysql.com:/home/hf/work/22372/my50-22372
2006-12-06 22:02:39 +04:00
holyfoot/hf@mysql.com/deer.(none)
e83c682fb7
bug #22372 (LOAD DATA crashes the table with the geometry field)
...
The problem is that the GEOMETRY NOT NULL can't automatically set
any value as a default one. We always tried to complete LOAD DATA
command even if there's not enough data in file. That doesn't work
for GEOMETRY NOT NULL. Now Field_*::reset() returns an error sign
and it's checked in mysql_load()
2006-12-06 21:45:57 +04:00
msvensson@neptunus.(none)
7cb305ca77
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-05 19:56:49 +01:00
iggy@rolltop.ignatz42.dyndns.org
40aba03eda
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
2006-12-05 10:33:11 -05:00
iggy@rolltop.ignatz42.dyndns.org
ee85368237
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
2006-12-05 10:32:38 -05:00
iggy@rolltop.ignatz42.dyndns.org
5dcf553159
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836
2006-12-05 09:39:48 -05:00
iggy@rolltop.ignatz42.dyndns.org
71970547da
Bug#20836 Selecting into variables results in wrong results being returned
...
- Comment Cleanup.
2006-12-05 09:29:32 -05:00
msvensson@neptunus.(none)
58baec3f76
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-05 11:18:00 +01:00
mskold/marty@mysql.com/linux.site
f8bd5d312b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-12-05 06:38:08 +01:00
thek@kpdesk.mysql.com
57f78d4ddc
Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint
...
into kpdesk.mysql.com:/home/thek/dev/tmp/mysql-5.0-maint
2006-12-04 23:51:54 +01:00
iggy@rolltop.ignatz42.dyndns.org
e0eed3a34b
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
2006-12-04 15:33:53 -05:00
iggy@rolltop.ignatz42.dyndns.org
f427935804
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
2006-12-04 15:32:16 -05:00
msvensson@neptunus.(none)
128b73fc36
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-04 19:28:38 +01:00
msvensson@neptunus.(none)
33c248eee5
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-12-04 19:06:42 +01:00
istruewing@chilla.local
098abfadd0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-04 19:03:01 +01:00
msvensson@neptunus.(none)
a9f4f4ed11
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-12-04 19:01:31 +01:00
gkodinov@dl145s.mysql.com
d253588c69
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0
2006-12-04 18:05:42 +01:00
mskold/marty@mysql.com/linux.site
6e8f99d29b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-12-04 15:09:47 +01:00
Kristofer.Pettersson@naruto.
f91e48c762
Merge naruto.:C:/cpp/bug17733/my50-bug17733
...
into naruto.:C:/cpp/mysql-5.0-maint
2006-12-04 14:43:34 +01:00
gkodinov/kgeorge@macbook.gmz
063fe51c69
item_func.cc:
...
fixed a valgrind warning
type_varchar.test:
fixed a valgrind warning
2006-12-04 14:26:05 +02:00
andrey@example.com
b5e44560f6
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into example.com:/work/bug24395-v2/my50
2006-12-02 00:30:10 +01:00
andrey@example.com
b275089b66
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into example.com:/work/bug24395-v2/my41
2006-12-01 23:11:44 +01:00
istruewing@chilla.local
763fdea487
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-01 18:49:20 +01:00
istruewing@chilla.local
341bd06408
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-01 18:38:08 +01:00
thek@kpdesk.mysql.com
94b48caf2e
Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my50-bug22043
...
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
2006-12-01 18:00:45 +01:00
istruewing@chilla.local
ab70ed5e48
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2006-12-01 15:49:49 +01:00
df@kahlann.erinye.com
da7820c37d
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
2006-12-01 13:02:54 +01:00
thek@kpdesk.mysql.com
b201d4ef93
Bug#22043 MySQL don't add "USE <DATABASE>" before "DROP PROCEDURE IF EXISTS"
...
- Refactoring of duplicate code
- Modified bad test cases
- Changed expected error when operating on information_schema.
2006-12-01 12:50:57 +01:00
Kristofer.Pettersson@naruto.
6c8d7ea894
Bug#17733 Flushing logs causes daily server crash
...
Server crashes if a flush commmand is issued and binlog is closed.
- added check to prevent binlog access when binlog file isn't opened.
2006-12-01 09:49:19 +01:00