d2fa79b291
keep old engine & JOIN if we changed subquery Item (Bug #3646 )
2004-05-07 23:06:11 +03:00
97ffc1f408
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/magnus/mysql-4.1
2004-05-07 16:21:54 +02:00
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
c066b3022e
Fix auto_inc locking bug introduced in ChangeSet@1.1794.1.1
2004-05-07 12:13:45 +03:00
7af3097e60
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-05-07 03:33:39 +04:00
7084c77651
Added a test for a problem that was fixed by automerge and fixed a typo.
2004-05-07 03:32:51 +04:00
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
67ad78cb5d
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-05-06 23:02:32 +04:00
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
28673669a4
Merge with 4.0 to get security patch for check_grant_colum
2004-05-06 13:42:26 +03:00
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
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
5030d28035
fixed test results
2004-05-05 23:29:35 +03:00
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
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
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
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
26f0825cae
merge
2004-05-05 22:30:01 +03:00
4e2b94dea6
After merge fixes
2004-05-05 21:46:16 +03:00
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
a5d8b846fa
after merge fixes
2004-05-05 21:24:21 +03:00
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
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
d21d49a32a
Merge with 4.0.19
2004-05-05 17:05:24 +03:00
1d8bf1cb18
BUG# 3658 ALTER TABLE corrupts table
...
Added test file for ALTER TABLE, engine = ndbcluster
2004-05-05 16:04:23 +02:00
fdfcadc735
Manual merge for WL#1622 code, will need fixes
2004-05-05 16:10:16 +04:00
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
949c01bfa2
a fix (Bug #3435 : STDDEV|VARIANCE(constant) returns constant if no rows)
2004-05-05 16:06:01 +05:00
6893acc1e8
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/magnus/mysql-4.1
2004-05-05 12:15:27 +02:00
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
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
e9492cca05
avoid using ndb tables in query cache
2004-05-05 11:22:10 +03:00
347dfcd879
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/magnus/mysql-4.1
2004-05-05 08:55:32 +02:00
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
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
b58127689e
union.result:
...
fixing typo
union.test:
fixing type
2004-05-04 16:48:34 +03:00
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
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
909d69ff0a
union.result, union.test:
...
a small fix for the test case
2004-05-04 14:11:23 +03:00
d8ad1eb1c4
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-05-03 18:23:29 +02:00
333eadf1b2
Fix for a bug involving UNION's and SET SQL_SELECT_LIMIT
2004-05-03 19:15:26 +03:00
acb5820f89
per special request from Ingo :)
2004-05-03 17:17:50 +02:00
c0aad5a1a8
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-wl1700-diff
2004-05-03 16:15:45 +02:00
5a78b4c746
WL#1700 - Properly count key_blocks_used and key_blocks_current.
...
Introduced a new free blocks list. Free blocks are now re-used before
new blocks are allocated from the pool. There is a new status variable
which can be queried by "show status like key_blocks_unused".
2004-05-03 15:55:21 +02:00
380267859d
mysql-test-run: -start-from added, cleanup
2004-05-03 12:10:06 +02:00
8ab135a71c
Merge marko@build.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/marko/l/mysql-4.0
2004-05-03 10:43:05 +03:00
9efb2853ad
Merge marko@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-05-03 09:45:17 +03:00
25d815cde6
fixed zero result case for group functions in subquery (Bug #3505 )
...
fixed LIMIT 0 for zero rows optimisation
2004-05-02 13:03:49 +03:00
9a4acccd05
WL#1622 "SQL Syntax for Prepared Statements" - cosmetic code review fixes
2004-04-30 20:08:38 +04:00
c3df24362b
Merge neptunus.(none):/home/magnus/mysql-4.1
...
into neptunus.(none):/home/magnus/mysql-4.1-sql-bench
2004-04-30 13:41:19 +02:00
