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
evgen@moonbone.local
7820d1b916
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt1
2006-12-12 17:57:51 +03:00
df@kahlann.erinye.com
b9cce096a2
BUG#24896 magnus' suggestion
2006-12-12 15:47:02 +01: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
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)
7696592b09
minor cleanup
2006-12-11 18:52:24 -07: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
kostja@bodhi.local
92f1c76236
Post-merge fixes for Bug#4968 "Stored procedure crash if cursor opened
...
on altered table" and Bug#19733 "Repeated alter, or repeated
create/drop, fails"
2006-12-12 01:50:12 +03:00
kostja@bodhi.local
758404b238
Merge bodhi.local:/opt/local/work/mysql-4.1-4968
...
into bodhi.local:/opt/local/work/mysql-5.0-4968-pull-from-4.1
2006-12-12 01:23:30 +03: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
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
df@kahlann.erinye.com
8375e6684d
BUG#24896 mysql_upgrade -p fix
2006-12-08 10:23:03 +01:00
kostja@bodhi.local
90072e69b3
A fix and test cases for
...
Bug#4968 "Stored procedure crash if cursor opened on altered table"
Bug#19733 "Repeated alter, or repeated create/drop, fails"
Bug#19182 "CREATE TABLE bar (m INT) SELECT n FROM foo; doesn't work from
stored procedure."
Bug#6895 "Prepared Statements: ALTER TABLE DROP COLUMN does nothing"
Bug#22060 "ALTER TABLE x AUTO_INCREMENT=y in SP crashes server"
Test cases for bugs 4968, 19733, 6895 will be added in 5.0.
Re-execution of CREATE DATABASE, CREATE TABLE and ALTER TABLE
statements in stored routines or as prepared statements caused
incorrect results (and crashes in versions prior to 5.0.25).
In 5.1 the problem occured only for CREATE DATABASE, CREATE TABLE
SELECT and CREATE TABLE with INDEX/DATA DIRECTOY options).
The problem of bugs 4968, 19733, 19282 and 6895 was that functions
mysql_prepare_table, mysql_create_table and mysql_alter_table were not
re-execution friendly: during their operation they used to modify contents
of LEX (members create_info, alter_info, key_list, create_list),
thus making the LEX unusable for the next execution.
In particular, these functions removed processed columns and keys from
create_list, key_list and drop_list. Search the code in sql_table.cc
for drop_it.remove() and similar patterns to find evidence.
The fix is to supply to these functions a usable copy of each of the
above structures at every re-execution of an SQL statement.
To simplify memory management, LEX::key_list and LEX::create_list
were added to LEX::alter_info, a fresh copy of which is created for
every execution.
The problem of crashing bug 22060 stemmed from the fact that the above
metnioned functions were not only modifying HA_CREATE_INFO structure in
LEX, but also were changing it to point to areas in volatile memory of
the execution memory root.
The patch solves this problem by creating and using an on-stack
copy of HA_CREATE_INFO (note that code in 5.1 already creates and
uses a copy of this structure in mysql_create_table()/alter_table(),
but this approach didn't work well for CREATE TABLE SELECT statement).
2006-12-08 02:20:09 +03: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
mskold/marty@mysql.com/linux.site
84a8d1759b
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-12-07 15:54:43 +01:00
mskold/marty@mysql.com/linux.site
8fa5f366f7
Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
2006-12-07 15:51:16 +01:00
mskold/marty@mysql.com/linux.site
93fda180d1
Bug#24818 CREATE UNIQUE INDEX (...) USING HASH on a NDB table crashes mysqld: Added test case
2006-12-07 15:49:59 +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
df@kahlann.erinye.com
bb1297cdc3
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 15:13:12 +01:00
df@kahlann.erinye.com
77965c013c
BUG#24780 use --sysconfdir in scripts
2006-12-07 15:02:32 +01:00
holyfoot/hf@mysql.com/deer.(none)
4f0c9c431c
merging fix
2006-12-07 15:22:43 +04:00
holyfoot/hf@mysql.com/deer.(none)
9203d43427
merging
2006-12-07 09:11:56 +04:00
msvensson@neptunus.(none)
94eb027f6b
Only call mysql_server_end if mysql_server_init has been called.
...
Remove DBUG_ENTER in my_end
2006-12-06 23:43:36 +01:00
msvensson@neptunus.(none)
eb1ba91d14
Flush stderr after print of error message to get predictable output
2006-12-06 22:03:56 +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)
f404488d29
bug #22372
...
datafile added to be used in gis.test
2006-12-06 21:47:29 +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)
8022e9fcce
Adjust replace to mask win paths
2006-12-06 16:44:31 +01:00
jonas@perch.ndb.mysql.com
a0974ea8c8
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-12-06 13:26:44 +01:00
jonas@perch.ndb.mysql.com
6d6fd5f7da
ndb - bug#22773
...
Fix correct log event on db-node disconnect
2006-12-06 13:09:30 +01: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
msvensson@neptunus.(none)
b9a4ae9909
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-12-05 19:47:24 +01:00
msvensson@neptunus.(none)
244ec63ac4
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-05 19:14:09 +01:00
msvensson@neptunus.(none)
be212d3486
Remove hack that removes vardir
2006-12-05 19:13:31 +01:00
msvensson@neptunus.(none)
a507459762
Merge bk-internal:/home/bk/mysql-4.1-build
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-12-05 19:12:12 +01:00
msvensson@neptunus.(none)
6d71f74743
Cset exclude: msvensson@neptunus.(none)|ChangeSet|20061204181655|04883
2006-12-05 18:46:08 +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