mskold/marty@mysql.com/linux.site
dab48d5df2
bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: copy tablespace from old table in copying alter table
2006-12-19 15:53:46 +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
patg@radha.patg.net
62ee86dbfd
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-clean
2006-12-18 21:08:39 -05: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
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
holyfoot/hf@mysql.com/deer.(none)
3f2ef81771
bug #24502 (reorganize partition closes connection)
...
when REORGANIZE creates new partition, no_subparts for that partition
isn't set right (call handler::set_partitions_defaults always returns 1)
Normally the number of subpartitions should be inherited from the
table.
2006-12-18 14:39:23 +04: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@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
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
msvensson@neptunus.(none)
2dbdd8ba58
Remove old hack to avoid reception of SUB_DATA signals to destroyed Ndb object
2006-12-13 21:04:10 +01:00
svoj@april.(none)
35e7dea871
Merge mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.1-engines
2006-12-13 17:32:40 +04: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
malff/marcsql@weblab.(none)
c55862698e
Merge cleanup
2006-12-12 16:42:35 -07:00
malff/marcsql@weblab.(none)
f22dad8bd7
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-merge2
2006-12-12 13:50:55 -07: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
gluh@gluh.(none)
c6d9cf1b12
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2006-12-12 17:59:34 +04:00
kostja@bodhi.local
bc6e73873d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime
2006-12-12 13:57:28 +03: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)
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
patg@govinda.patg.net
f9097b86af
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-arch-wl3031-merge
2006-12-08 22:30:18 -05:00
patg@govinda.patg.net
98062f567d
WL# 3031
...
Post-commit issues fixed
* Test results for other tests fixed due to added error #s
* Memory allocation/free issues found with running with valgrind
* Fix to mysql-test-run shell script to run federated_server test (installs
mysql.servers table properly)
2006-12-08 22:19:51 -05:00
pgalbraith@bk-internal.mysql.com
23f0c6d765
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-12-09 02:34:42 +01:00
istruewing@chilla.local
05dde1f311
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2006-12-08 15:55:56 +01:00
holyfoot/hf@deer.(none)
edfbcc12cb
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/home/hf/work/embt/my51-embt
2006-12-08 15:49:43 +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
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
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
andrey@example.com
12a68db3d3
Additional fix for bug#22369
2006-12-07 13:57:39 +01:00
holyfoot/hf@deer.(none)
dfff2c27bc
Merge mysql.com:/home/hf/work/22372/my50-22372
...
into mysql.com:/home/hf/work/22372/my51-22372
2006-12-07 09:27:47 +04:00
holyfoot/hf@mysql.com/deer.(none)
9203d43427
merging
2006-12-07 09:11:56 +04:00
baker@bk-internal.mysql.com
37f7e29db2
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-12-06 20:26:10 +01: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
holyfoot/hf@deer.(none)
4e3530626f
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/home/hf/work/mysql-5.1.20835
2006-12-06 12:56:11 +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
petr/cps@outpost.site
c25429f1a6
remove assert
2006-12-05 19:04:46 +03: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
f18d064da5
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
2006-12-05 10:32:16 -05:00
iggy@rolltop.ignatz42.dyndns.org
c1c082af86
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836
2006-12-05 09:41:02 -05:00