guilhem@mysql.com
e4c7496c14
a small comment about why we call end_io_cache in mysql_load
2003-09-25 00:24:06 +02:00
guilhem@mysql.com
9854acae25
Fix for BUG#1391:
...
"If LOAD DATA INFILE 'small_file' fails on master, slave leaves temp files"
(the bug is in the master)
2003-09-25 00:14:46 +02:00
pem@mysql.com
8d884c02bb
Merging 4.1 -> 5.0
2003-09-24 11:29:38 +02:00
bar@bar.mysql.r18.ru
1d20c09ce9
New SQL variables "collation_server" and "collation_database"
2003-09-15 16:31:04 +05:00
monty@mashka.mysql.fi
80565e1352
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mashka.mysql.fi:/home/my/mysql-tmp
2003-09-07 15:14:32 +03:00
hf@deer.(none)
c7297eba3e
Fix for LOAD DATA to work with embedded library
2003-09-06 18:50:30 +05:00
monty@narttu.mysql.fi
77a70a0a24
merge with 4.0.15
2003-08-29 13:44:35 +03:00
monty@narttu.mysql.fi
fe9dc5e711
Add column names for metadata when running mysql with -T
...
Change metadata info so that that MIN() and code MAX() reports that they can return NULL. Bug #324
2003-08-27 10:26:03 +03:00
pem@mysql.com
7f158dd12a
Merge 4.1 into 5.0
2003-08-26 11:51:09 +02:00
monty@narttu.mysql.fi
5192a58140
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-08-22 04:08:16 +03:00
monty@narttu.mysql.fi
efa85aad49
Move test that uses many tables (in query_cache.test) to separate test so that we can get it 'skipped' instead of 'failed' on system where we can't open many files.
2003-08-22 04:07:40 +03:00
guilhem@mysql.com
1dd53ed073
First commit for fixing BUG#1100
...
"LOAD DATA INFILE is badly filtered by binlog-*-db rules".
There will probably be a second final one to merge Dmitri's changes
to rpl_log.result and mine.
2 new tests:
rpl_loaddata_rule_m : test of logging of LOAD DATA INFILE when the master has binlog-*-db rules,
rpl_loaddata_rule_s : test of logging of LOAD DATA INFILE when the slave has binlog-*-db rules and --log-slave-updates.
2003-08-20 23:24:45 +02:00
ram@mysql.r18.ru
0f47087e22
Fix for the bug #841 : wrong number of warnings
2003-07-14 15:32:31 +05:00
monty@mashka.mysql.fi
e1aa90a9bf
Safety and speedup fixes:
...
Changed is_open() to work as before.
Added back inited argument to LOG
2003-07-14 10:12:05 +03:00
guilhem@mysql.com
fbebac9a48
Fix for BUG#791:
...
a safer way of initing the mutexes in MYSQL_LOG.
is_open() is now always thread-safe.
See each file for details.
2003-07-11 14:26:44 +02:00
pem@mysql.telia.com
9c3a7a6ba3
Merge 4.1 into 5.0 (first pass).
2003-07-08 17:50:23 +02:00
bar@bar.mysql.r18.ru
81f0fb6e18
character_set_server is now updatable
...
character_set_database was added
Code optimization: reuse more code for all character sets variables
2003-05-30 13:03:56 +05:00
monty@mashka.mysql.fi
e436736d29
ixed wrong unlock of tables (new bug)
2003-05-26 20:48:40 +03:00
heikki@hundin.mysql.fi
b8e5b65f88
ha_innodb.cc:
...
Remove accidenatlly committed debug printfs when query cache is used
sql_update.cc, sql_load.cc, sql_insert.cc, sql_delete.cc:
For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated.
2003-05-26 19:10:43 +03:00
monty@mashka.mysql.fi
cb7061ebe4
merge
2003-05-22 02:57:27 +03:00
venu@myvenu.com
39cbb547d4
Resolve merge colflict
2003-05-21 00:12:09 -07:00
monty@narttu.mysql.fi
dd2b7918cd
Merge with 4.0.13
2003-05-19 16:35:49 +03:00
serg@serg.mylan
784fb81426
INSERT ... UPDATE ... VALUES()
2003-05-03 01:16:56 +02:00
venu@myvenu.com
eb137c063c
Support of warnings for all DML statements (Insert, Update and Alter)
...
Fix LOAD DATA INFILE warnings to have a better meanigful messages
Fix to make the mysql command line to automatically show the warnings count for all basic commands
2003-04-30 00:02:28 -07:00
greg@mysql.com
24968f1ee3
Changes from Novell for NetWare platform
2003-04-24 20:48:54 -04:00
venu@myvenu.com
213847281a
Fix to return appropriate warnings using SHOW WARNINGS for LOAD DATA INFILE (scrum)
2003-04-22 00:53:07 -07:00
hf@deer.mysql.r18.ru
5d4e9f95f2
Merging
2003-04-08 19:43:24 +05:00
hf@deer.mysql.r18.ru
0428d08606
SCRUM
...
two KILL versions
code trimming with headquarter's suggestions
2003-04-08 19:18:33 +05:00
pem@mysql.com
736e78251e
Merging 4.1 to 5.0.
2003-04-04 13:45:35 +02:00
guilhem@mysql.com
654410a3d3
Deprecated the update log (Sprint task #792 ). Now --log-update
...
just turns on --log-bin and prints a warning. SQL_LOG_UPDATE
is handled in two ways (see mysqld.cc for comments).
2003-04-02 00:15:20 +02:00
bar@bar.mysql.r18.ru
ca1a736296
mbcharlen() is now used instead of ismbhead(). The last one has been removed.
2003-04-01 15:52:09 +05:00
hf@genie.(none)
f8f0b70380
SCRUM
...
two KILL commands implementation (version 2)
2003-03-31 13:39:46 +05:00
bar@bar.mysql.r18.ru
9994e625ff
sql_load.cc:
...
LOAD DATA INFILE now uses database character set instead of server character set. This is not excellent but at least allows to load for example cyrillic data into cyrillic database if server charset is latin1. In the future we should add a syntax to specify file charset or evern charset of each field.
2003-03-07 12:55:55 +04:00
monty@narttu.mysql.fi
0197fc78c9
Merge with 4.0
2003-02-27 03:49:26 +02:00
monty@narttu.mysql.fi
61213dbc7a
Code cleanup
2003-02-27 00:06:09 +02:00
Sinisa@sinisa.nasamreza.org
571fc250ff
A fix for a crashing bug with unspecified database in this type of
...
command:
load data infile 'filename' into table db.table;
2003-02-26 15:28:28 +02:00
monty@narttu.mysql.fi
9a46698e1e
Merge with 4.0.11
2003-02-26 01:03:47 +02:00
bell@sanja.is.com.ua
05bbea4b25
fixed invalidation of query cache on LOAD DATA
2003-02-14 22:20:38 +02:00
bell@sanja.is.com.ua
44d8a8cdab
merging
2003-01-25 13:19:46 +02:00
bell@sanja.is.com.ua
d56e23f64e
fixed subselects with temporary tables (SCRUM)
...
fixed memory leacks
2003-01-25 02:25:52 +02:00
hf@deer.mysql.r18.ru
389680e04e
Conflicts resolving
2003-01-20 18:59:45 +04:00
monty@mashka.mysql.fi
76f146a175
Merge with 4.0.9
2003-01-18 03:13:37 +02:00
hf@deer.mysql.r18.ru
96089e2b3a
resolving conflicts
2003-01-15 13:15:35 +04:00
monty@mashka.mysql.fi
8dd439e751
Guard against compiling without -fno-exceptions
...
Allocate bigger default thread stack because of problems with glibc
Fixed bug in UPDATE ... not_null_field=expression_that_returns_null
Fixed bug in replication when using auto_increment and LOAD DATA INFILE
2003-01-14 11:27:26 +02:00
monty@mashka.mysql.fi
1bc3105da3
Fixed core dump bug in str LIKE "%other_str%" where strings contained characters >= 128.
...
Fixed problem with replication LOAD DATA INFILE when using --old-rpl-compat.
When executing on master LOAD DATA and InnoDB failed with 'table full' error the binary log was corrupted.
2003-01-10 01:55:05 +02:00
monty@mashka.mysql.fi
07daf3169e
Merge with 4.0.8
2003-01-03 00:04:33 +02:00
hf@deer.mysql.r18.ru
e3b3b68307
Big purge about embedded library (scrum)
2002-12-16 17:33:29 +04:00
monty@mashka.mysql.fi
af5ff70101
Fixed possible replication problem in LOAD DATA INFILE with innodb tables.
2002-12-13 16:28:15 +02:00
monty@mashka.mysql.fi
dac6498f9b
Merge with 4.0
2002-11-21 15:56:48 +02:00
monty@hundin.mysql.fi
65badfff1a
Put temporary files in binlog cache when using BEGIN/COMMIT
...
Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
New variables @@rand_seed1 and @@rand_seed2 (used by replication)
DROP TEMPORARY TABLE
2002-11-07 04:02:37 +02:00