monty@narttu.mysql.fi
d56dc85205
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-04-03 19:55:37 +03:00
vva@eagle.mysql.r18.ru
f45be5e6cd
added test for replication load data into temporary table with additional options
2003-04-03 12:54:08 -04:00
monty@narttu.mysql.fi
618857b6eb
Merge with 3.23 to get fixes for:
...
mysqldump --delete-master-logs
Portability fix for hammer
Memory overrun for MyISAM
LOAD DATA LOCAL replication bug fix.
2003-04-03 12:33:13 +03:00
guilhem@mysql.com
1211b9a513
Small-and-safe fix for bug #218 : "LOAD DATA INFILE IGNORE is well
...
logged, but read as LOAD DATA INFILE REPLACE"
This was just bad && instead of &, but nasty consequences.
This should be merged to 4.0 BUT it will not be automatic (some code
has moved from log_event.h to log_event.cc, and log_event.cc has changed);
please Merging Man, do 'bk grep REPLACE_FLAG' in 4.0/sql
to find all the new places.
2003-04-01 18:19:15 +02:00
vva@eagle.mysql.r18.ru
af61a4c7fa
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
2003-03-25 19:58:40 -04:00
vva@eagle.mysql.r18.ru
e1173e70a5
fix bug with parameters of LOAD DATA INFILE in exec_event
2003-03-25 19:57:38 -04:00
guilhem@mysql.com
b90c91a710
Fix for bug #174 (charset 0 caused segfault)
2003-03-21 21:08:56 +01:00
monty@narttu.mysql.fi
9f200ede0d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-03-20 02:06:08 +02:00
monty@narttu.mysql.fi
48a9c1239c
Added support for ULONG division with DIV
...
Fixed non fatal memory leak in slave code.
2003-03-19 21:23:13 +02:00
bar@bar.mysql.r18.ru
8103c4c537
CONVERT class was removed
2003-03-18 17:01:32 +04:00
bar@bar.mysql.r18.ru
7549a76c7c
Replication were broken because of automatic charset conversion.
...
As a fix, my_charset_bin is now used in master-slave packets instead
of system_charset_info.
2003-03-18 11:34:19 +04:00
monty@narttu.mysql.fi
5dd970c335
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-03-17 15:06:06 +02:00
bar@bar.mysql.r18.ru
caf31a0790
Preparing to client<->server autoconvert
2003-03-17 13:14:04 +04:00
monty@narttu.mysql.fi
a434bca704
Merge with 4.0
2003-03-16 19:17:54 +02:00
monty@mashka.mysql.fi
9257a27c82
Fixed character set bug when replicating user variables
2003-03-05 16:10:40 +02:00
monty@narttu.mysql.fi
143c85057e
Fix for reading variables from binary log.
2003-03-04 15:17:29 +02:00
bar@bar.mysql.r18.ru
4ffd74e5de
Coercibility is now stored in user vars
2003-03-03 13:16:39 +04:00
guilhem@mysql.com
10735252ee
When the SQL thread cannot read an event from the relay log
...
("Event too big" etc), stop this thread instead of going on
with the next event, which would certainly lead to slave's data
corruption.
2003-03-02 00:34:44 +01:00
monty@narttu.mysql.fi
e8aa21c8d3
LOAD DATA INFILE is not replicated if replicate_*_table is set
...
LOAD DATA LOCAL INFILE was not replicated correctly
2003-02-28 22:24:00 +02:00
monty@narttu.mysql.fi
050543bdfc
Merge with 3.23 -> 4.0
2003-02-28 13:29:48 +02:00
monty@narttu.mysql.fi
a0d2a621ed
Added detection if pthread_attr_getstacksize() exists
...
Fixed bug in RAND() usage in mysqlbinlog
2003-02-27 17:35:51 +02:00
gluh@gluh.mysql.r18.ru
ae911ef858
Bug fix: for SHOW STATUS (when ssl is used)
...
Added ROW_RESULT to switchs(for documentation purposes)
2003-02-17 18:06:51 +04:00
gluh@gluh.mysql.r18.ru
063668c08d
Merge gluh@192.168.21.1:/usr/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.uvar
2003-02-17 15:07:01 +04:00
monty@mashka.mysql.fi
acf8993439
Fixed problem when connecting to user without a password.
...
Fixed problem with LIKE and BINARY
2003-02-14 11:47:41 +02:00
monty@mashka.mysql.fi
48558055ed
Move tmp_table_used to THD
...
Optimize depending sub querys
Remove valgrind warnings
2003-02-10 17:59:16 +02:00
bell@sanja.is.com.ua
291f8a225a
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-select-4.1
2003-02-02 17:39:27 +02:00
gluh@gluh.mysql.r18.ru
7cfbabd807
Changed ROW_RESULT to default
2003-01-31 14:07:07 +04:00
bar@bar.mysql.r18.ru
37fdb93d7c
Gluh asked me to do it
2003-01-31 11:41:39 +04:00
gluh@gluh.mysql.r18.ru
c7485119ab
Fix for mysqlbinlog compilation
2003-01-31 10:28:13 +04:00
gluh@gluh.mysql.r18.ru
8d3c43880d
conflicts resolving
2003-01-31 09:43:53 +04:00
bell@sanja.is.com.ua
e294751c41
fixed bug in determinating uncacheable queries
...
new fatal_error interface to assign is_fatal_error and ne.report_error
commant about Item_row
2003-01-30 22:15:44 +02:00
gluh@gluh.mysql.r18.ru
57a805de6c
'Replicate user variables' task
2003-01-30 21:39:54 +04:00
bar@bar.mysql.r18.ru
735399a850
Move latin1 into a separarte file
2003-01-29 17:31:20 +04:00
monty@mashka.mysql.fi
7436e9ec97
Merge
2003-01-21 21:28:51 +02:00
monty@mashka.mysql.fi
25c393a12e
Portability fixes (for windows)
...
Some changes to the prepared statement protocol to make it easier to use and faster.
2003-01-21 21:07:59 +02:00
hf@deer.mysql.r18.ru
389680e04e
Conflicts resolving
2003-01-20 18:59:45 +04:00
monty@mashka.mysql.fi
12ab0651c6
merge with 4.0 to get bug fix for SHOW PROCESSLIST + connected slave
2003-01-19 02:28:07 +02:00
monty@mashka.mysql.fi
183df2da7f
Fixes cases where thd->query was not protected.
...
This fixes a problem with SHOW PROCESSLIST
2003-01-19 02:00:26 +02:00
monty@mashka.mysql.fi
76f146a175
Merge with 4.0.9
2003-01-18 03:13:37 +02:00
vva@eagle.mysql.r18.ru
05aa563043
Merge vvagin@work.mysql.com:/home/bk/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BINLOG_LOADDATA/4.1.clear
2003-01-17 22:04:43 +04:00
vva@eagle.mysql.r18.ru
1b25ee3579
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BINLOG_LOADDATA/4.1.clear
2003-01-17 21:59:03 +04:00
vva@eagle.mysql.r18.ru
4b5a313c1a
new option --local-load in mysqlbinlog
2003-01-17 21:52:56 +04:00
gluh@gluh.mysql.r18.ru
f2a193521e
Merge sgluhov@work.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.upd
2003-01-17 16:40:54 +04:00
gluh@gluh.mysql.r18.ru
6ac602142a
Replication: Optimize away string.append
...
Fixed problem with replication LOAD DATA INFILE when using --old-rpl-compat
Fixed rpl_temporary test
2003-01-17 16:39:29 +04:00
hf@deer.mysql.r18.ru
96089e2b3a
resolving conflicts
2003-01-15 13:15:35 +04:00
hf@deer.mysql.r18.ru
c59bff7c96
SCRUM
...
embedded library trimming
2003-01-15 12:11:44 +04: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
f8e660d88c
merge with 4.0.9
...
To get bug fixes for TCP/IP connections, FORCE INDEX and OPTIMIZE TABLE with NULL keys
2003-01-09 03:55:26 +02:00
monty@mashka.mysql.fi
89ef355b9e
Fix for bug in LOAD DATA INFILE and replication
...
Fix for SHOW VARIABLES in embedded server
2003-01-08 11:24:39 +02:00
monty@mashka.mysql.fi
f9772317ee
merge
2003-01-04 15:40:55 +02:00