gluh@eagle.intranet.mysql.r18.ru
d59ff2764c
Bug#11577 'show procedure/function status' doesn't work for user with limited access
...
changed 'SHOW PROCEDURE' behavoiur to be like INFORMATION_SCHEMA.routines
2005-07-19 13:49:43 +05:00
stewart@mysql.com
270a183c74
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/main
2005-07-19 15:05:10 +10:00
stewart@mysql.com
08f7c3c2e8
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/stewart/Documents/MySQL/4.1/main
2005-07-19 15:04:19 +10:00
elliot@mysql.com
98dc8e3242
Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
...
into mysql.com:/Users/emurphy/src/work/mysql-5.0-bug11567
2005-07-18 22:27:20 -04:00
patg@radha.local
164255fc81
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into radha.local:/Users/patg/mysql-build/mysql-5.0
2005-07-19 03:18:54 +02:00
patg@radha.local
e2d8644053
Eric's implentation of OPTIMIZE TABLE and REPAIR TABLE,
...
as well as changes to the test.
2005-07-19 03:04:51 +02:00
jimw@mysql.com
aff38d8659
Handle systems where 127.0.0.1 doesn't always map to 'localhost'
...
first. (Bug #11822 )
2005-07-18 17:00:37 -07:00
jimw@mysql.com
dd2f631ec4
Fix number to date conversion so it always honors the NO_ZERO_DATE,
...
NO_ZERO_IN_DATE, and INVALID_DATES bits of SQL_MODE. (Bug #5906 )
2005-07-18 16:12:44 -07:00
mronstrom@mysql.com
2d23c691f7
Bug #10600
...
remove_table_from_cache fails to signal other thread and gets
blocked when other thread also gets blocked
2005-07-19 00:29:19 +02:00
elliot@mysql.com
22be12ab86
BUG#11567 Fixed binlog tests on windows.
2005-07-18 17:47:26 -04:00
konstantin@mysql.com
52b8928b09
Merge mysql.com:/home/kostja/mysql/mysql-4.1-root
...
into mysql.com:/home/kostja/mysql/mysql-5.0-merge
2005-07-19 00:55:37 +04:00
monty@mishka.local
2278e0319c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-07-18 19:03:01 +03:00
evgen@moonbone.local
e75e566469
Merge moonbone.local:/work/mysql-4.1-bug-11868
...
into moonbone.local:/work/mysql-5.0-bug-11482
2005-07-18 19:37:42 +04:00
reggie@linux.site
8f605428cb
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into linux.site:/home/reggie/bk/bug7142
2005-07-18 08:03:59 -06:00
gbichot@production.mysql.com
7cd2fb13ff
Fix for BUG#12003 "assertion failure in testsuite (double lock of
...
LOCK_thread_count)" and for BUG#12004 "SHOW BINARY LOGS reports 0
for the size of all binlogs but the current one".
There are a lot of 4.1->5.0 unmerged changes (hardest are in the optimizer), can't merge; still pushing in 4.1 because my changes
are very small. Feel free to ask me if you have problems merging them.
2005-07-18 14:46:53 +02:00
monty@mishka.local
78c65b5adc
Cleanups during review
...
Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (
2005-07-18 15:33:18 +03:00
stewart@mysql.com
0eb6a68e2c
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/main
2005-07-18 15:02:21 +10:00
patg@krsna.patg.net
1394b43949
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-5.0
2005-07-17 10:20:11 -07:00
igor@rurik.mysql.com
54dd7e5ebf
select.result, select.test:
...
Added a test case for bug #11745 .
sql_select.cc:
Fixed bug # 11745.
Added support of where clause for queries with FROM DUAL.
sql_yacc.yy:
Fixed bug # 11745.
Added optional where clause for queries with FROM DUAL.
2005-07-17 09:46:14 -07:00
patg@radha.local
dd129ed329
Federated Storage Engine, bug 9925 "Federated query processor (step 2 or step 3) not using logic in
...
WHERE statement"
2005-07-17 04:10:19 +02:00
igor@rurik.mysql.com
553f2a59f3
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2005-07-16 18:28:09 -07:00
igor@rurik.mysql.com
bff3507b1d
func_in.result, func_in.test:
...
Fixed bug #11885 .
sql_select.cc:
Fixed bug #11885 .
Predicates of the forms 'a IN (v)' 'a NOT IN (v)' now
is replaced by 'a=v' and 'a<>v' at the parsing stage.
sql_yacc.yy:
Fixed bug #11885 .
Predicates of the forms 'a IN (v)' 'a NOT IN (v)' now
is replaced by 'a=v' and 'a<>v' at the parsing stage.
2005-07-16 18:06:34 -07:00
igor@rurik.mysql.com
6ea960c8d6
opt_range.cc:
...
Fixed bug #11853 .
Corrected the code of the range optimization for
NOT IN and NOT BETWEEN.
range.test, range.result:
Fixed bug #11853 .
2005-07-16 08:19:20 -07:00
konstantin@mysql.com
8b0adacbc6
After-merge fixes (4.1 -> 5.0).
2005-07-16 16:10:42 +04:00
konstantin@mysql.com
8e72214d74
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/media/sda1/mysql/mysql-5.0-merge
2005-07-16 13:45:32 +04:00
jimw@mysql.com
c61ce0d90d
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-15 18:59:18 -07:00
evgen@moonbone.local
52569ad519
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/mysql-4.1-bug-11868
2005-07-16 05:59:17 +04:00
evgen@moonbone.local
81d93df1ae
Fix bug#11868 NOT NULL ref optimization in subquery used in update must be
...
disabled if ref is built with a key from the updated table
Problem was in add_not_null_conds() optimization function.
It contains following code:
JOIN_TAB *referred_tab= not_null_item->field->table->reginfo.join_tab;
...
add_cond_and_fix(&referred_tab->select_cond, notnull);
For UPDATE described in bug report referred_tab is 0 and dereferencing it
crashes the server.
2005-07-16 05:31:16 +04:00
patg@krsna.patg.net
db1fb6a7e5
This is the same patch as 1.1937, with small variable declaration changes, memory
...
deallocation cleanup
2005-07-15 17:33:47 -07:00
jimw@mysql.com
6a18b7f1a2
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-15 16:29:15 -07:00
konstantin@mysql.com
68ab7f8e9f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/opt/local/work/mysql-4.1-root
2005-07-16 03:29:14 +04:00
jimw@mysql.com
d408fca40e
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-15 16:29:14 -07:00
reggie@linux.site
29ddf3af61
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into linux.site:/home/reggie/bk/bug7403
2005-07-15 17:29:13 -06:00
konstantin@mysql.com
e08caeeee2
A fix and a test case for Bug#9359 "Prepared statements take snapshot
...
of system vars at PREPARE time": implement a special Item
to handle system variables. This item substitutes itself with
a basic constant containing variable value at fix_fields.
2005-07-16 03:29:13 +04:00
evgen@moonbone.local
0298bc347a
Fix bug#11482 4.1.12 produces different resultset for a complex query
...
than in previous 4.1.x
Wrongly applied optimization were adding NOT NULL constraint which results in
rejecting valid rows and reduced result set.
The problem was that add_notnull_conds() while checking subquery were adding
NOT NULL constraint to left joined table, to which, normally, optimization
don't have to be applied.
2005-07-16 03:29:12 +04:00
bell@sanja.is.com.ua
b4a723e4d2
post merge changes: added safe_charset_converter to other static functions
2005-07-16 00:52:00 +03:00
bell@sanja.is.com.ua
8aad35f9d2
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0
2005-07-16 00:17:05 +03:00
bell@sanja.is.com.ua
6114bee47c
stop evaluation constant functions in WHERE (BUG#4663)
...
correct value of CURRENT_USER() in SP with "security definer" (BUG#7291)
2005-07-16 00:01:44 +03:00
reggie@linux.site
95a5c8ef49
Merge linux.site:/home/reggie/bk/bug7403
...
into linux.site:/home/reggie/bk/mysql-5.0
2005-07-15 12:15:45 -06:00
jimw@mysql.com
b4b874568b
Merge mysql.com:/home/jimw/my/mysql-4.1-9979
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-15 10:52:22 -07:00
pem@mysql.com
7d7f34cf1c
Fixed BUG#9538: SProc: Creation fails if we try to SET system variable
...
using @@var_name in proc
Made sure we don't lose the tokenizer state when swapping lex in during SET
parsing.
2005-07-15 17:24:19 +02:00
tomas@poseidon.ndb.mysql.com
d8a584f064
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-07-15 17:14:34 +02:00
tomas@poseidon.ndb.mysql.com
d0d82338cb
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-07-15 15:40:15 +02:00
reggie@linux.site
f9adcc3cac
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into linux.site:/home/reggie/bk/bug7403
2005-07-15 06:15:00 -06:00
tomas@poseidon.ndb.mysql.com
b144b920a0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-new
2005-07-15 14:14:59 +02:00
tomas@poseidon.ndb.mysql.com
f54afc792f
Merge
2005-07-15 14:13:23 +02:00
tomas@poseidon.ndb.mysql.com
cd590a6a02
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-release
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-new
2005-07-15 13:32:08 +02:00
ramil@mysql.com
cd20ee4361
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-07-15 16:27:59 +05:00
ramil@mysql.com
ffb7421955
NO_DEFAULT_VALUE_FLAG and BLOB_FLAG combined
2005-07-15 16:25:31 +05:00
ramil@mysql.com
b11d04e50a
a fix (bug #9881 : ALTER TABLE gives wrong error message with sql-mode TRADITIONAL).
2005-07-15 15:50:57 +05:00