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
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
Sinisa@sinisa.nasamreza.org
909d69ff0a
union.result, union.test:
...
a small fix for the test case
2004-05-04 14:11:23 +03:00
serg@serg.mylan
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
Sinisa@sinisa.nasamreza.org
333eadf1b2
Fix for a bug involving UNION's and SET SQL_SELECT_LIMIT
2004-05-03 19:15:26 +03:00
serg@serg.mylan
acb5820f89
per special request from Ingo :)
2004-05-03 17:17:50 +02:00
ingo@mysql.com
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
ingo@mysql.com
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
serg@serg.mylan
380267859d
mysql-test-run: -start-from added, cleanup
2004-05-03 12:10:06 +02:00
marko@hundin.mysql.fi
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
marko@hundin.mysql.fi
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
bell@sanja.is.com.ua
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
sergefp@mysql.com
9a4acccd05
WL#1622 "SQL Syntax for Prepared Statements" - cosmetic code review fixes
2004-04-30 20:08:38 +04:00
magnus@neptunus.(none)
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
magnus@neptunus.(none)
d4ee7e7e9b
Addded test files for NDB
...
Updated stop_ndbcluster script
2004-04-30 12:49:34 +02:00
magnus@neptunus.(none)
08fa382a70
Merge neptunus.(none):/home/magnus/mysql-4.1
...
into neptunus.(none):/home/magnus/mysql-4.1-sql-bench
2004-04-30 12:45:20 +02:00
magnus@neptunus.(none)
122bff3240
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/magnus/mysql-4.1
2004-04-30 12:43:28 +02:00
magnus@neptunus.(none)
ed6148da75
Updated default NDB config to work better with sql-bench
...
Updated sql-bench configs to take NDB's limitations into account
2004-04-30 10:08:44 +02:00
monty@mysql.com
7c742e5583
Portability fixes
2004-04-30 00:14:56 +03:00
marko@hundin.mysql.fi
a490b95b04
InnoDB: implement LOCK TABLE (Bug #3299 )
2004-04-29 16:42:33 +03:00
magnus@neptunus.(none)
cfbabb0245
Added new mysql-test files for NDB
2004-04-29 09:58:38 +02:00
guilhem@mysql.com
eff7b259e3
Very small fixes for testsuite (a real_sleep instead of sleep, plus TCP port independency of the result file).
2004-04-28 23:43:46 +02:00
guilhem@mysql.com
e7fbd33acc
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-04-28 18:31:31 +02:00
guilhem@mysql.com
3fc39188ec
A new option --replicate-same-server-id to force a slave to execute queries originating from itself
...
(WL#794). This can be of interest in some recovery-from-backup scenarios, and also when you have
two databases in one mysqld, having a certain similarity and you want one db to be updated when the other is
(some sort of trigger).
Plus small fix for BUG#3568 "MySQL server crashes when built --with-debug and CHANGE MASTER +MASTER_POS_WAIT"
2004-04-28 18:24:46 +02:00
monty@mysql.com
f61b08a24b
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/my/mysql-4.0
2004-04-28 18:38:30 +03:00
antony@ltantony.dsl-verizon.net
9bd11ea8f6
Merge ltantony.dsl-verizon.net:/usr/home/antony/work/mysql-4.0
...
into ltantony.dsl-verizon.net:/usr/home/antony/work/bug3481
2004-04-28 16:38:29 +01:00
sergefp@mysql.com
d4e9522962
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-04-28 19:27:56 +04:00
antony@ltantony.dsl-verizon.net
28870228d4
Fix for Bug 3481
...
CREATE statement allowed extra unnecessary commas
2004-04-28 16:14:53 +01:00
monty@mysql.com
f10d098f7d
Fixed http address in some scripts (Bug #3460 )
...
Output TIMESTAMP in 4.1 format for 4.1 tables (or for TIMESTAMP(19)) (portability fix)
Fixed that INTERVAL can handle big integers. (Bug #3498 )
Fixed that hostname="" works identical as hostname="%" for table/column grants (Bug #3473 )
2004-04-28 17:45:08 +03:00
serg@serg.mylan
2bcfab10ea
bug#3556 - soundex
2004-04-28 14:19:02 +02:00
monty@mysql.com
edc584acce
Fixed stack overrun with some INSERT ... SELECT ... GROUP BY queries (Bug #3265 )
...
Ensure that raid_chunks is not set to higher than 255 as this could cause problems with DROP DATABASE. (Bug #3182 )
2004-04-28 03:37:45 +03:00
serg@serg.mylan
3a7b6d68e7
after-merge fix: make concurrent-insert-skip code ft2-aware
2004-04-27 21:17:10 +02:00
monty@mishka.local
4999203fbd
Fixed results for previous patch
...
Ensure that mysqldump doesn't give an error about missing Index.xml when it's not needed
2004-04-27 17:32:40 +03:00
monty@mishka.local
ef18b13738
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2004-04-27 15:48:48 +03:00
monty@mishka.local
e9cfe01db0
After merge fixes
...
Changed 'SHOW FIELD STATUS' to use 'Engine' instead of 'Type'
2004-04-27 15:33:40 +03:00
monty@mishka.local
21fd1d270e
Merge with 4.0
2004-04-26 15:53:31 +03:00
marko@hundin.mysql.fi
4e65909621
Merge marko@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-04-23 11:03:52 +03:00
serg@sergbook.mylan
606073084e
symlink, not hardlink
...
mkdir in Makefile, not in configure
chmod a-x
2004-04-21 14:55:39 -05:00
marko@hundin.mysql.fi
df5336a3cc
Introduce keys in child tables corresponding to FOREIGN KEYs
...
Remove redundant keys in CREATE TABLE and ALTER TABLE
2004-04-21 13:15:43 +03:00
tomas@mc05.(none)
78b242c946
install_ndbcluster:
...
cosmetic
2004-04-18 22:02:12 +02:00
bell@sanja.is.com.ua
918183a667
fixed option name
2004-04-16 08:49:50 +03:00
bell@sanja.is.com.ua
c8d836aa66
merge
2004-04-16 08:39:03 +03:00
bell@sanja.is.com.ua
df5df8a1d1
allow --skip-ndbcluster if server is not compiled
...
fixed syntax errro
2004-04-16 08:32:10 +03:00
magnus@neptunus.(none)
af263160f2
Fix mysql-test-run to work better with NDB
...
Fix broken string constant in mysqld.cc
2004-04-15 17:30:50 +02:00
magnus@neptunus.(none)
855fcf1411
Updated mysql-test-run to work with the started NDB Cluster
...
Added one test case for ndb to mysql-test-run, ndb_basic. It will show that
NDB Cluster is supported.
2004-04-15 12:03:13 +02:00
sergefp@mysql.com
3df206443a
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-04-14 22:23:50 +04:00
tomas@mc05.(none)
d48ebf3e58
mysql-test-run.sh:
...
added options for ndbcluster
2004-04-14 17:16:31 +02:00