3711c98b2a
Trivial manual merge
2004-05-15 00:06:16 +04:00
02f51ccf2d
Many files:
...
Fix remaining cases of Bug #3596 : fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
2004-05-14 16:48:56 +03:00
71a374dc13
Merge
2004-05-14 13:33:02 +03:00
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
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
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
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
7c2c408cb8
Added NDB storage engine
2004-04-15 09:14:14 +02:00
a314cbefa1
WL#1622 "SQL Syntax for Prepared Statements": post-review fixes:
...
Moved PS name to Statement class, Statement_map now handles name-to-statement resolution.
Both named and unnamed statements are now executed in one function (sql_prepare.cc:execute_stmt)
Fixed a problem: Malformed sequence of commands from client could cause server to use previously deleted objects.
Some code cleanup and small fixes
2004-04-13 01:58:48 +04:00
ac563b1b8e
Merge
2004-04-08 17:08:56 +04:00
1f8505d66f
Post-merge fixes
2004-04-05 19:52:10 +04:00
a8386d01c2
Many files:
...
SQL Syntax for Prepared Statements (WL#1622)
ps.test, ps.result:
new file
2004-04-05 19:43:37 +04:00
1e4af935c1
removed old way to prevent using stack tables for caching Items in PS
...
fixed error code in union test
2004-04-04 03:05:44 +03:00
de502e1df2
removed unused field
...
layout fised
debug information added
2004-04-01 23:27:22 +03:00
5568155e04
fix for table/field caching mechanism
...
save moving ON/USING tables conditions to WHERE clause (BUG#2794)
2004-04-01 03:00:38 +03:00
90a5e244be
To save 32KB memory per thread when --log-bin is not used, we do not
...
init the binlog_cache (THD::transaction.trans_log).
I have checked all places where trans_log is used, because as now
it may not be inited in some cases, we have to be cautious
(will forward this commit mail to Heikki).
2004-03-26 19:11:37 +01:00
53c810cda4
merge fixes (use old code)
2004-03-18 00:16:04 +02:00
350b433569
merge with 4.0
2004-03-16 22:41:30 +02:00
8d5430ef73
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_2709/mysql-4.1
2004-03-16 17:14:09 +04:00
36120d420a
Fix of compilation failure of latest 4.1 tree: new constants in mysqld.cc
...
exceed unsigned long limit.
2004-03-15 22:39:36 +03:00
189761bcd3
actions for bug
...
#2709 Affected Rows for ON DUPL. KEY undocumented, perheps illogical
1. added COPY_INFO::updated to work with it in
'insert .. on duplicate' instead of COPY_INFO::deleted
2. added affected rows to output of "info:" in mysqltest.c
2004-03-15 21:36:16 +04:00
4c78e46351
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2004-03-04 20:30:29 +02:00
58a978b900
Fixed Bug#2491, INSERT DELAYED causes binary log unusable by mysqlbinlog (replication is ok)
...
Setting insert delayed threads = 0 at mysql_init_command.
2004-03-04 17:58:36 +00:00
d03034d306
invalidation of locking for write tables (BUG#2693)
...
fixed linking query_prealloc_size to query cache presence
2004-03-04 18:32:55 +02:00
8cc8b0ea5c
Desperate attempt to push part of prepared statements cleanup which was
...
reviewed in Saint-Petersbourg (including post-review fixes).
2004-03-02 22:39:50 +03:00
24143abecf
- fixed another HP-UX compile error ("Member 'set_item_arena' not declared
...
in class Statement")
2004-02-28 17:34:22 +01:00
c6c1efba7e
after review changes
2004-02-20 16:24:03 +02:00
a66b398eb8
merge
2004-02-17 11:12:55 +02:00
f4d1ee971b
merge
2004-02-17 01:52:33 +02:00
3f86f10a57
ulternative bugfix for BUG#2508 and fix for BUG#2809 - every table has its own TABLE structure
2004-02-17 01:14:51 +02:00
050af89dd8
Merge with public tree
2004-02-16 10:31:05 +02:00
eb83bb374a
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-02-14 15:08:32 +02:00
44b37b089a
merge
2004-02-14 13:31:39 +02:00
c25fc5c664
Another fix for #2208
...
previous one had error
2004-02-13 11:56:36 +04:00
f20b775c63
PS fixed to be compatible with derived tables (BUG#2641)
2004-02-12 18:50:00 +02:00
6777120d85
merge
2004-02-12 11:12:16 +02:00
272bd74abb
memory leacks in PS with subqueries fixed (adddition to fix of BUG#2462)
2004-02-12 03:10:26 +02:00
125fb04b87
merge fixes
2004-02-11 19:15:02 +02:00
ce14578909
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
451e423be4
Fixes for bugs #2508 and #2552
2004-02-10 21:34:25 +02:00
d7e3b89ce9
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.2208
2004-02-10 19:33:04 +04:00
348bd98e48
Fix for #2208 (multi-query returns wrong result in embedded library)
...
now we execute only one first select during mysql_real_query
others - during 'mysql_next_result'
2004-02-10 17:09:59 +04:00
cefdd4fec6
merge
2004-02-09 15:49:11 +02:00
06432eac36
Added --compact to mysqlbinlog
...
Fixed output from mysqlbinlog when using --skip-comments
Fixed warnings from valgrind
Fixed ref_length when used with HEAP tables
More efficent need_conversion()
Fixed error handling in UPDATE with not updateable tables
Fixed bug in null handling in CAST to signed/unsigned
2004-02-09 12:31:03 +01:00
69e2460bd4
fixed subquery with PS (BUG#2462)
...
fixed UNION preparation
2004-02-08 20:14:13 +02:00
6bfede9639
Added SQL_SELECT::cleanup() to make it easier to reuse SQL_SELECT item's for sub selects. Needed for proper fix for bug #2479 .
...
Added 'select_to_file' class to be able to merge identical code for select_export and select_dump
2004-02-05 10:22:08 +01:00
ed44e769ba
Fixed parsing of column names and foreign key constraints in Innobase to handle quoted identifiers and identifiers with space. (Bug #1725 )
...
Fix optimizer tuning bug when first used key part was a constant. (Bug #1679 )
2004-01-30 10:46:30 +01:00
eb0ae211c5
more clear (grammar mistake)
2004-01-19 23:34:40 +03:00
c74cd37cd1
More comments to THD::lock and THD::locked_tables commented
2004-01-19 23:34:39 +03:00
c1dd070ba7
Some small portability fixes.
...
Added support for lower_case_table_names=2, which is to be used on case insensitive file systems.
This tells MySQL to preserve the used case of filenames and database names to make it esier to move files between cases sensitive can case insensitive file systems (like Windows and Linux)
2003-12-30 13:14:21 +02:00
