3f1e1f0f6b
Merge
2005-02-11 22:33:52 +01:00
828a785610
Condition pushdown v.2
2005-02-11 22:05:24 +01:00
ccb2f3381b
Things missing in last changset
...
After merge fixes
Don't give duplicate warnings for some ::store() functions
2005-02-10 15:41:51 +02:00
db13afd89d
auto-ROLLBACK if binlog was not closed properly
...
auto-commit on Xid_log_event
2005-02-09 20:04:28 +01:00
96558f6ad3
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-09 02:54:08 +04:00
b94a482ee9
Precision Math implementation
2005-02-09 02:50:45 +04:00
2c26ebe359
WL#2130: Table locking for stored FUNCTIONs
...
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
2005-02-08 20:52:50 +01:00
422c2eb868
4.1 -> 5.0 merge
2005-02-03 13:18:30 +02:00
11c0260147
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-02-02 00:22:19 +02:00
a67924ecbc
WL#1967
...
Support for COMMIT/ROLLBACK optional arguments
2005-02-01 19:48:05 +00:00
fb78bfebe4
open binlog index file *before* tc_log->open() and binlog itself *after*
2005-02-01 15:36:48 +01:00
f21a737197
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-01 10:05:22 +01:00
3c5060981f
query_id and my_xid -> ulonglong
...
fix for binlog+autocommit+tclog
comments, style fixes
2005-01-27 22:38:56 +01:00
0bf6e3aefc
fixed cleanup of result object of subqueries. (BUG#8125)
2005-01-26 15:27:45 +02:00
d7e5c4d617
sql_class.h, set_var.cc, mysqld.cc:
...
Add settable variables for semi-sync replication
2005-01-25 22:11:21 +02:00
7c07a2e725
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-01-21 08:43:41 +01:00
ea8882be80
BUG#6034 - Error code 124: Wrong medium type.
...
Version for 5.0. Committed for merge.
If the result table is one of the select tables in INSERT SELECT,
we must not disable the result tables indexes before selecting.
Now the preparation is split into two prepare methods.
The first detects the situation and defers some preparations
until the second phase.
2005-01-19 21:20:55 +01:00
1cb5d98d85
When we warn that --log-bin alone is dangerous, we give a suggestion.
2005-01-16 15:46:28 +01:00
1034677f94
XA (not completely polished out yet)
2005-01-16 13:16:23 +01:00
f4274fe9be
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-11 19:35:00 +02:00
27c13fa33f
Merge
2005-01-11 17:29:46 +01:00
a0bc131743
Merge mysql.com:/home/kostja/work/mysql-4.1-7428
...
into mysql.com:/home/kostja/work/mysql-5.0-root
2005-01-11 14:47:12 +03:00
067d13f632
A fix for linking failure of MySQL client when linking with imap libraries
...
(Bug#7428) (renamed: hash_reset -> my_hash_reset)
2005-01-11 13:53:10 +03:00
346aeda888
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-01-07 15:34:25 +01:00
7cf8285b3f
After merge fixes
...
Add support for warnings for prepare of prepared statements
Fixed test to work with --ps-protocol
Fixed some test results
2005-01-04 13:46:53 +02:00
309b1a2b6c
Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY
2005-01-03 23:04:52 +02:00
881b3a023f
Merge
2005-01-03 15:20:06 +01:00
1bd22faa05
Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
...
This allows use to use INSERT IGNORE ... ON DUPLICATE ...
2004-12-31 12:04:35 +02:00
34d5331cee
Merge with global tree
2004-12-31 00:50:30 +02:00
d71c030587
After merge fixes
2004-12-31 00:44:00 +02:00
a5204f692b
Merge
2004-12-29 10:02:03 +01:00
60e35755ef
WL#2126 - Multi_read_range.
...
Added the required structures and functions for
handing over multiple key ranges to the table handler.
2004-12-23 21:45:10 +01:00
4f4bbfc279
Merge with 4.1
2004-12-22 13:54:39 +02:00
3edf243875
Condition pushdown to storage engine
2004-12-17 21:13:22 +01:00
9818cadd1b
WL#2274 - INSERT..SELECT..UPDATE
...
UPDATE clause conflicts with SELECT for use of item_list field.
Alter UPDATE clause to use new lex field update_list
Tests included
2004-12-13 12:26:28 +00:00
0de4777187
Merge with 4.1
2004-12-06 11:38:56 +02:00
734ffb8452
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-global-4.1
2004-12-03 22:13:53 +02:00
48fc4cbc6b
Merge
2004-12-03 17:48:19 +01:00
052665e1eb
sql/sql_class.h
...
Bug #6284 - report truncation warnings in INSERT ... SELECT only for "INSERT" part
sql/sql_insert.cc
Bug #6284 - report truncation warnings in INSERT ... SELECT only for "INSERT" part
2004-12-03 15:02:29 +01:00
08f771a0cc
Manual fixes to merge of fix for Bug #6682 to 4.1.
2004-12-03 02:44:33 +01:00
4b8e96d5ca
Merge
2004-12-03 00:39:55 +01:00
13649d90ae
Prevent adding 'CREATE TABLE .. SELECT' query to the binary log when the
...
insertion of new records partially failed. It would get logged because of the
logic to log a partially-failed 'INSERT ... SELECT' (which can't be rolled back
in non-transactional tables), but 'CREATE TABLE ... SELECT' is always rolled
back on failure, even for non-transactional tables. (Bug #6682 )
(Original fix reimplemented after review by Serg and Guilhem.)
2004-12-03 00:05:11 +01:00
4c017d18e2
Merge
2004-12-01 10:25:11 +02:00
072d38eb12
merge
2004-11-21 20:08:12 +02:00
2d3dd65cc1
merged
2004-11-20 18:36:41 +01:00
a68a9fe268
remove unused parts of code
...
fix for 'show create schema_table'
fix for usage schema tables in subselect
'wrong schema table charset' fix
2004-11-18 12:16:06 +03:00
1700bf3844
Enabled usage of new system variables for ndb
...
- ndb_use_exact_count
- ndb_autoincrement_prefetch_sz
- ndb_use_transactions
- ndb_force_send
moved "inlined" functions to .cc file since they are virtual anyways
enabled printout od ndb errors in warnings even if mapping existst to mysql error code
2004-11-17 08:15:53 +00:00
27395a2fb1
fixed joincleunup to avoid double deletin tables, and too earlyfull cleanup in case of EXPLAIN
...
fixed cleunup of TMP_TABLE_PARAM
(BUG#6406)
2004-11-16 00:16:04 +02:00
1555469b64
merge
2004-11-12 15:36:31 +02:00
31f7811183
post-review fixes
2004-11-12 14:34:00 +02:00
