pem@mysql.comhem.se
e27e208f67
Added comment about expected result for prime test.
...
(This is mostly to test sendmail tunneling of commit email...
might not actually get pushed)
2004-05-13 13:08:16 +02:00
monty@mysql.com
116f61c656
Don't automaticly generate a new key for a foreign key constraint if there is already a usable key.
...
Prefer not automatic keys before automatic keys. If there is two conf
2004-05-12 00:29:52 +03:00
tsmith@build.mysql.com
6ad9691dc8
Merge build:/home/bk/mysql-4.1
...
into build.mysql.com:/users/tsmith/m/41/mysql-4.1
2004-05-11 14:44:25 +02:00
serg@serg.mylan
6f32682524
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-05-11 12:40:07 +02:00
serg@serg.mylan
423f37b92b
out-of-bound array access fixed
2004-05-11 12:39:00 +02:00
serg@serg.mylan
d14e4eb57c
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-05-11 12:20:04 +02:00
serg@serg.mylan
8a03c1b869
bug#3612 - Item_func_div set decimals incorrectly
2004-05-11 12:19:37 +02:00
timour@mysql.com
f3dab7be12
Merge of WL#1469 with latest bk sources.
2004-05-11 12:15:58 +03:00
timour@mysql.com
eadcae3dc1
Merge of WL#1469 with latest bk version.
2004-05-11 12:12:32 +03:00
bar@bar.intranet.mysql.r18.ru
f16dac0492
Use Windows code page 1252 instead of real ISO 8859-1
2004-05-11 13:32:01 +05:00
tsmith@build.mysql.com
8746a7dab4
logging_ok:
...
Logging to logging@openlogging.org accepted
item_cmpfunc.cc, ctype_recoding.test, ctype_recoding.result:
Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec() (but #3704 )
2004-05-10 23:19:50 +02:00
timour@mysql.com
a840d8daad
Complete implementation of WL#1469 "Greedy algorithm to search for an optimal execution plan",
...
consisting of pos-review fixes and improvements.
2004-05-10 15:48:50 +03:00
ingo@mysql.com
f28616c02b
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.0-bug2831
2004-05-10 13:54:32 +02:00
serg@serg.mylan
c50e85bd7c
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-05-10 12:39:31 +02:00
serg@serg.mylan
2cbc4e71fc
backport from 4.1:
...
"phrase search" should not match partial words (it should not match 'paraphrase searches')
2004-05-10 12:39:01 +02:00
ingo@mysql.com
4bb5c83a62
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.0-bug2831
2004-05-10 12:36:09 +02:00
ingo@mysql.com
309c7412f6
Fix replace_result of $MASTER_MYPORT instead of literal numbers.
2004-05-10 12:15:40 +02:00
bell@sanja.is.com.ua
d2fa79b291
keep old engine & JOIN if we changed subquery Item (Bug #3646 )
2004-05-07 23:06:11 +03:00
pem@mysql.com
bf45960eef
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
marko@hundin.mysql.fi
11f9ec1dc5
Merge marko@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-05-07 12:48:01 +03:00
marko@hundin.mysql.fi
c066b3022e
Fix auto_inc locking bug introduced in ChangeSet@1.1794.1.1
2004-05-07 12:13:45 +03:00
monty@mysql.com
939ea71ecd
Portability fixes
...
Change strtoll -> my_strtoll10()
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems (Bug #3472 )
2004-05-07 01:43:17 +03:00
bell@sanja.is.com.ua
3aae50e8c0
EXPLAIN UNION using same routing which used for execution which allow return correct bug messages (Bug #3639 )
...
EXPLAIN of hidden SELECT of UNION
2004-05-06 20:40:21 +03:00
monty@mysql.com
28673669a4
Merge with 4.0 to get security patch for check_grant_colum
2004-05-06 13:42:26 +03:00
marko@hundin.mysql.fi
007e6210d4
Merge marko@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-05-06 09:53:50 +03:00
monty@mysql.com
f6dc9169e2
Fixed wrong key usage which caused wrong result for some "WHERE primary_key=constant" queries where MySQL could use 'only index' (Bug #3666 )
...
The bug was introduced in a patch in the 4.1.2 source tree.
2004-05-06 04:40:45 +03:00
bell@sanja.is.com.ua
5030d28035
fixed test results
2004-05-05 23:29:35 +03:00
bell@sanja.is.com.ua
ae85306e19
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-ndb-4.1
2004-05-05 23:19:13 +03:00
guilhem@mysql.com
cd18476e34
Replication:
...
as the I/O thread filters on the server id, we must test replicate_same_server_id in it (on top of in the SQL thread).
2004-05-05 22:01:41 +02:00
guilhem@mysql.com
f7f7e725d6
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-05-05 21:51:26 +02:00
guilhem@mysql.com
d20230bcbe
very minor changes: a STOP SLAVE in a replication test to get rid of a non critical message in slave.err,
...
and a comment update
2004-05-05 21:50:51 +02:00
bell@sanja.is.com.ua
26f0825cae
merge
2004-05-05 22:30:01 +03:00
monty@mysql.com
4e2b94dea6
After merge fixes
2004-05-05 21:46:16 +03:00
monty@mysql.com
6827fe4086
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-05-05 21:24:45 +03:00
monty@mysql.com
a5d8b846fa
after merge fixes
2004-05-05 21:24:21 +03:00
bell@sanja.is.com.ua
62fca61bc4
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-ndb-4.1
2004-05-05 21:24:13 +03:00
bell@sanja.is.com.ua
c5c35c667e
caching of queries with isammerge tables forbiden using general way
...
SQL_SELECT_LIMIT as default will be applied only for SELECT statement if there was not explicit LIMIT clause
correct table list passed to class constructor of select_update
2004-05-05 21:21:41 +03:00
monty@mysql.com
d21d49a32a
Merge with 4.0.19
2004-05-05 17:05:24 +03:00
marko@hundin.mysql.fi
6a6fa5b388
Merge marko@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-05-05 14:21:42 +03:00
ram@gw.mysql.r18.ru
949c01bfa2
a fix (Bug #3435 : STDDEV|VARIANCE(constant) returns constant if no rows)
2004-05-05 16:06:01 +05:00
monty@mysql.com
104fdf607d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-05-05 12:40:59 +03:00
monty@mysql.com
7e3cf5958c
Fixed crashing bug with alter table when table was in use (Bug #3643 )
...
We didn't use 'only index' for tables of type 'const'. (Bug #3497 )
2004-05-05 12:31:17 +03:00
bell@sanja.is.com.ua
e9492cca05
avoid using ndb tables in query cache
2004-05-05 11:22:10 +03:00
Sinisa@sinisa.nasamreza.org
ee627d2510
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-05-04 23:05:37 +03:00
Sinisa@sinisa.nasamreza.org
68cb444c62
Fix for a multi table updates when one of the tables is not updated
...
but used in a nested query.
2004-05-04 23:04:05 +03:00
pem@mysql.comhem.se
e1182c5226
Correction of WL#1567: row_count() is -1 following non-insert/update/delete
...
statements.
2004-05-04 17:18:47 +02:00
Sinisa@sinisa.nasamreza.org
b58127689e
union.result:
...
fixing typo
union.test:
fixing type
2004-05-04 16:48:34 +03:00
bell@sanja.is.com.ua
5de8c225e2
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
2004-05-04 15:35:11 +03:00
monty@mysql.com
59ddd8c738
Fix to handle unsigned data in prepared statements (Bug #3447 )
...
Fixed security problem that password was temporarly reset when someone changed GRANT for a user. (Bug #3404 )
Fixed problem with PROCEDURE analyse() and impossible WHERE (Bug #2238 )
Don't auto-repair tables in mysqlcheck if table type doesn't support 'check' command.
2004-05-04 15:02:38 +03:00
pem@mysql.comhem.se
296ba0ea57
WL#1567: Add ROW_COUNT() Function to retrieve count of rows updated/inserted/deleted
2004-05-04 13:45:20 +02:00