pem@mysql.comhem.se
d42b145817
Post-merge fixes, some quite complex. client/mysqlbinlog.cc and sql/log_event.cc
...
merged manually by guilhem.
2004-04-28 12:08:54 +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
timour@mysql.com
9f1fd5bd90
Implementation of WL#1469 (Greedy algorithm to search for an optimal execution plan).
2004-04-16 13:21:08 +03: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
tomas@mc05.(none)
40de5714b0
logging_ok:
...
Logging to logging@openlogging.org accepted
stop_ndbcluster, ndb_config_2_node.ini, install_ndbcluster:
new file
2004-04-14 15:46:39 +02:00
guilhem@mysql.com
5c7d736443
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-04-13 22:41:00 +02:00
guilhem@mysql.com
066382e6e7
Fix for BUG#3461 "multi-table DELETE replicated despite replicate-wild-ignore-table":
...
In tables_ok(), when there is no table having "updating==TRUE" in the list,
return that we don't replicate this statement (the slave is supposed to
replicate *changes* only).
In practice, the case can only happen for this statement:
DELETE t FROM t,u WHERE ... ;
tables_ok(t,u) will now return 0, which (check all_tables_not_ok())
will give a chance to tables_ok(t) to run.
2004-04-13 22:40:16 +02:00
sergefp@mysql.com
194027d5d8
Merged
2004-04-13 02:18:09 +04:00
ram@gw.mysql.r18.ru
c8937dbcb7
A fix. (Bug #3376 : AVG(constant) returns constant if no rows in result set)
2004-04-09 19:07:39 +05:00
sergefp@mysql.com
eef8fbcf9e
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-04-09 15:15:51 +04:00
bell@sanja.is.com.ua
e8137a13e0
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1
2004-04-09 11:31:06 +03:00
monty@mysql.com
f96c4941d8
Fixed problems noticed with last build
2004-04-09 07:12:41 +03:00
bell@sanja.is.com.ua
555eb86616
merge
2004-04-08 23:50:10 +03:00
sergefp@mysql.com
a298c6d4fa
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-04-08 19:14:11 +04:00
sergefp@mysql.com
ac563b1b8e
Merge
2004-04-08 17:08:56 +04:00
monty@mysql.com
00738a2be0
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-04-08 15:02:25 +03:00
monty@mysql.com
43546e7a82
Moved reading of ranges from opt_range.cc to handler.cc
...
This gives the handler more optimization possiblities and is needed for NDB cluster
Fixed not-initialized memory error detected by valgrind
2004-04-08 13:58:06 +03:00
bell@sanja.is.com.ua
56be6f3f93
merge
2004-04-08 00:19:43 +03:00
bell@sanja.is.com.ua
5e37c41fae
new error for unsupported command in PS
...
fixed IN subselect with basic constant left expression
SQLCOM_CREATE_TABLE, SQLCOM_UPDATE_MULTI, SQLCOM_REPLACE_SELECT, SQLCOM_INSERT_SELECT, QLCOM_DELETE_MULTI fixed to be compatible with PS (BUG#3398, BUG#3406)
fixed multiupdate privelege check (BUG#3408)
fixed multiupdate tables check (BUG#3411)
unchecked commands now is rejected by PS protocol to avoid serever crash
fixed cleunup procedure to be compatible sith DO/SET (BUG#3393)
2004-04-08 00:16:17 +03:00
pem@mysql.com
dfd59e296e
Merge 4.1 -> 5.0.
2004-04-07 19:07:44 +02:00
serg@serg.mylan
6ebf869b40
merged
2004-04-07 16:20:46 +02:00
serg@serg.mylan
6fc74e13e7
post-review fixes
...
HA_EXTRA_WRITE_CACHE now part of start_bulk_insert()
test cleanups
2004-04-07 16:04:28 +02:00
bell@sanja.is.com.ua
61fd95d168
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1
2004-04-07 15:23:05 +03:00
vva@eagle.mysql.r18.ru
5fa9953ce3
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_3342/mysql-4.1
2004-04-07 17:23:04 +05:00
sergefp@mysql.com
ca75b62d5a
Correct handling of parameter variables with NULL values in PREPARE queries
2004-04-07 12:58:28 +04:00
monty@mysql.com
70c4eb5838
Portability fixes
...
Fixed problems with group_concat() and HAVING
Updated crash-me values
2004-04-07 04:33:58 +03:00
serg@serg.mylan
e8eda8129f
::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
...
Field::val_str simplification, comment
2004-04-06 21:35:26 +02:00
monty@mysql.com
472e87a40c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-04-06 18:30:34 +03:00
vva@eagle.mysql.r18.ru
aeff7ce714
fixed
...
bug #3342 "SHOW CREATE DATABASE seems to require DROP privilege"
(now it require only SELECT privilege on database)
2004-04-06 20:26:35 +05:00
bar@bar.intranet.mysql.r18.ru
950a2ebab1
Fixed charsetnr sent to the client
2004-04-06 19:57:33 +05:00
pem@mysql.comhem.se
1541f2e794
Fixed BUG#2780: Stored procedure exit handler ignored for warnings.
...
Actually catch pushed warnings.
2004-04-06 16:29:38 +02:00
monty@mysql.com
7ca9a70583
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-04-06 17:17:15 +03:00
vva@eagle.mysql.r18.ru
0cc998a466
fixed the tests mysql-test/t/synchronization.test
...
for Bug #2385 CREATE TABLE LIKE lacks locking on source and destination table
2004-04-06 19:17:13 +05:00
pem@mysql.comhem.se
4a6e6251e7
Fixed BUG#2776: Stored procedure crash if variable assigned to default.
...
Keep track on the default value and use it. (Or NULL, if not declared.)
2004-04-06 15:48:58 +02:00
pem@mysql.comhem.se
eb7319e850
Fixed BUG#2772: Function with character set clause fails in stored procedures.
...
Complex return types were not stored correctly in the mysql.proc table.
2004-04-06 13:26:53 +02:00