monty@mysql.com
53d05f4adb
Removed compiler warnings
2004-06-01 23:39:39 +03:00
monty@mysql.com
7d8f8bc77b
Changed prototype of killed_ptr() to make it more portable
...
Applied patches for Netware
2004-05-26 19:12:49 +03:00
pem@mysql.com
71eddc362e
Merging 4.1 to 5.0.
2004-05-26 17:04:45 +02:00
konstantin@mysql.com
f207b33a7b
Support for character set conversion in binary protocol: another go
...
after Monty's review.
- Item_param was rewritten.
- it turns out that we can't convert string data to character set of
connection on the fly, because they first should be written to the binary
log.
To support efficient conversion we need to rewrite prepared statements
binlogging code first.
2004-05-25 02:03:49 +04:00
bell@sanja.is.com.ua
c7396f8d20
PS and SP made compatible in mechanism used for preparing query for rexecutions (Bug #2266 )
2004-05-20 02:02:49 +03:00
monty@mysql.com
21f1bca789
Portability fixes
...
Fixed wrong number of warnings/duplicates for machines with high-byte-first
2004-05-19 05:09:10 +03:00
pem@mysql.com
bf45960eef
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
monty@mysql.com
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
monty@mysql.com
d21d49a32a
Merge with 4.0.19
2004-05-05 17:05:24 +03:00
miguel@hegel.local
8d1480f7c5
Windows fixes for VC++ compiler compability
2004-05-05 02:59:17 -03:00
pem@mysql.comhem.se
296ba0ea57
WL#1567: Add ROW_COUNT() Function to retrieve count of rows updated/inserted/deleted
2004-05-04 13:45:20 +02:00
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
bell@sanja.is.com.ua
a535342d57
after review PS fixes
2004-04-10 01:14:32 +03:00
serg@serg.mylan
0ade401777
always call start_bulk_insert, clarify this behaviour in comment block
...
change 10 to a #define'd constant
2004-04-08 20:41:00 +02:00
monty@mysql.com
62fa4013ce
Don't enable HA_EXTRA_WRITE_CACHE if too few rows
...
Revert main parts of patch for online index builds. Should be done differently
Added support for %lx in my_snprintf()
2004-04-08 17:56:45 +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
bell@sanja.is.com.ua
560a9f66d3
after review changes
2004-04-07 13:25:24 +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
0013516951
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-04-05 16:28:16 +03:00
monty@mysql.com
42cf92ce37
Fixed many compiler warnings
...
Fixed bugs in group_concat with ORDER BY and DISTINCT (Bugs #2695 , #3381 and #3319 )
Fixed crash when doing rollback in slave and the io thread catched up with the sql thread
Set locked_in_memory properly
2004-04-05 13:56:05 +03:00
bell@sanja.is.com.ua
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
dlenev@jabberwock.localdomain
f6bff2e6c6
WL#1266 "Separate auto-set logic from TIMESTAMP type."
...
Final version of patch.
Adds support for specifying of DEFAULT NOW() and/or ON UPDATE NOW()
clauses for TIMESTAMP field definition.
Current implementation allows only one such field per table and
uses several unireg types for storing info about this properties of
field. It should be replaced with better implementation when new
.frm format is introduced.
2004-04-02 10:12:53 +04:00
bell@sanja.is.com.ua
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
monty@mysql.com
f602829c75
Fix to get correct metadata when using temporary tables to create result. (Bug #2654 )
2004-03-30 19:24:28 +03:00
monty@mysql.com
505970b4a7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-03-29 17:57:59 +03:00
monty@mysql.com
e6882bbfd8
Disable INSERT DELAYED for embedded library
2004-03-29 17:57:07 +03:00
guilhem@mysql.com
8066c2ce75
Changing SET SQL_LOG_BIN so that it explicitely throws an error if
...
user is not SUPER, instead of setting the value but ignoring it
silently internally.
2004-03-26 19:25:22 +01:00
monty@mysql.com
53c810cda4
merge fixes (use old code)
2004-03-18 00:16:04 +02:00
monty@mysql.com
350b433569
merge with 4.0
2004-03-16 22:41:30 +02:00
vva@eagle.mysql.r18.ru
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
monty@mysql.com
73780de129
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/my/mysql-4.0
2004-03-06 10:43:53 +02:00
jani@ua72d24.elisa.omakaista.fi
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
monty@mysql.com
b9c4ee353d
Rollback UPDATE/DELETE statements on kill
...
nsure that rows in a multi-row INSERT DELAYED are inserted atomicly
2004-03-04 18:16:10 +02:00
bell@sanja.is.com.ua
f4d1ee971b
merge
2004-02-17 01:52:33 +02:00
bell@sanja.is.com.ua
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
monty@mysql.com
ce14578909
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
pem@mysql.com
c8585f3283
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
monty@mysql.com
079edf3313
Code cleanups
2004-02-10 12:03:08 +01:00
heikki@hundin.mysql.fi
d9790a406c
row0mysql.c:
...
Allow always DROPping of a table which is only referenced by FOREIGN KEY constraints from the same table
Many files:
Do not let REPLACE to perform internally an UPDATE if the table is referenced by a FOREIGN KEY: the manual says that REPLACE must resolve a duplicate key error semantically with DELETE(s) + INSERT, and not by an UPDATE; the internal update caused foreign key checks and cascaded operations to behave in a semantically wrong way
2004-02-09 23:57:29 +02:00
bell@sanja.is.com.ua
b99d13582b
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-derived2-4.1
2004-02-09 12:10:12 +02:00
vva@eagle.mysql.r18.ru
45b85c10c3
changed allocation of st_table::insert_values
...
from table->mem_root to thd->mem_root
(fixed bug #2438 "Runaway memory consumption")
2004-02-03 01:07:43 +04:00
bell@sanja.is.com.ua
2a9cd37cd6
now all tables of query are locked in one place (including derived tables)
...
fixed BUG#2120 and other problem with EXPLAINing derived tables
2004-02-01 15:30:32 +02:00
bell@sanja.is.com.ua
e5fa5585f0
removed droping field->query_id for reinitialization tables for subquery.
...
(BUG#2089)
2004-01-03 00:12:07 +02:00
monty@mysql.com
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
monty@mysql.com
c6ed2a625b
Update for VC++
...
(Fixed project files, compiler warnings etc..)
2003-12-21 02:07:45 +02:00
konstantin@oak.local
d37da004f6
THD::lex now points to THD::main_lex like in 5.0
...
All tests pass (client_test included)
2003-12-19 20:52:13 +03:00