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
monty@mashka.mysql.fi
07daf3169e
Merge with 4.0.8
2003-01-03 00:04:33 +02:00
vva@eagle.mysql.r18.ru
6ab60981e8
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BINLOG_TEMPORARY/4.1
2002-12-30 01:59:08 +04:00
vva@eagle.mysql.r18.ru
1dcca480e8
processing thread specific queries
2002-12-30 01:46:48 +04:00
hf@deer.mysql.r18.ru
8a205e4ba3
Merge
2002-12-19 14:57:24 +04:00
bar@bar.mysql.r18.ru
1bba969b1e
removed several cases of default_charset_info use
...
a bit more ucs2 compatibility
2002-12-19 09:38:29 +04:00
hf@deer.mysql.r18.ru
c1e69d2cca
Merging
2002-12-16 18:58:55 +04: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
5022e56cba
Ensure that BEGIN / COMMIT is handled properly if slave dies
...
Added syntax support for
CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1;
2002-12-11 15:46:39 +02:00
monty@mashka.mysql.fi
d3eb993a27
rename of net_pkg.cc to protocol.cc
...
Class for sending data from server to client (Protocol)
This handles both the old ( <= 4.0 ) protocol and then new binary protocol that is used for prepared statements.
2002-12-11 09:17:51 +02:00
monty@mashka.mysql.fi
35ff08c2af
After merge fixes
...
Added THD to add_to_xxx_list() functions for faster parsing.
2002-12-06 21:11:27 +02:00
monty@mashka.mysql.fi
806294c573
Fixes after merge with 4.0
2002-11-21 22:25:53 +02:00
monty@mashka.mysql.fi
dac6498f9b
Merge with 4.0
2002-11-21 15:56:48 +02:00
monty@mashka.mysql.fi
7a70332836
Portability fix when using -DBIG_TABLES
2002-11-14 12:21:36 +02:00
monty@butch.
890b39bb68
merge
2002-11-07 12:49:01 +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
monty@butch.
a2bdf9265f
Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes.
2002-11-07 03:54:00 +02:00
bell@sanja.is.com.ua
c94b39134f
Fixed error handling bug
2002-11-04 00:56:25 +02:00
nick@mysql.com
6d88799e95
Reordered functions--grouped by class now.
...
Added comment blocks.
2002-10-29 23:50:07 -07:00
nick@mysql.com
b9007ca6a1
Added missing case for Rand_log_event to Log_event::get_type_str()
2002-10-24 20:20:37 -06:00
nick@mysql.com
6c22ca4454
Added Rand_log_event
2002-10-24 16:48:34 -06:00
nick@mysql.com
d749b832b2
Added Rand_log_event
2002-10-22 15:17:17 -06:00
monty@mashka.mysql.fi
62a26cf891
Update after last merge. Fixes some wrong test results.
2002-10-03 16:54:26 +03:00
monty@mashka.mysql.fi
0f39457613
Merge with 4.0.4
2002-10-02 17:55:12 +03:00
monty@mashka.mysql.fi
d69250a969
Fixes and code cleanups after merge with 4.0.3
...
Warning handling and initial prepared statement handling (last not complete yet)
Changed a lot of functions that returned 0/1 to my_bool type.
GRANT handling now uses read/write locks instead of mutex
Change basic net functions to use THD instead of NET
(needed for 4.1 protocol)
Use my_sprintf instead of sprintf() + strlen()
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()
Note that the following test fails (will be fixed ASAP):
sub_select, union, rpl_rotate_logs and rpl_mystery22
2002-10-02 13:33:08 +03:00
nick@mysql.com
96e9cd3ae1
fix (work-around) rpl_log test on FreeBSD.
2002-09-25 18:04:08 -06:00
monty@mashka.mysql.fi
cb8580a2cd
Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
...
This should fix some issues where --lower-case-table-names doesn't work properly under windows.
2002-09-20 14:05:18 +03:00
monty@mashka.mysql.fi
ce4b584a85
Increased max possible max_allowed_packet to 1G
...
Small optimization to not do external locking of temporary MyISAM tables.
2002-09-19 17:49:41 +03:00
monty@mashka.mysql.fi
f3a186c905
Portability fixes.
...
Improve mysql-test to be more robust.
Fix that GRANT doesn't delete SSL options
Change innobase_flush_log_at_trx_commit to uint.
Don't rotate logs if we read a rotate log entry from the master.
2002-09-11 06:40:08 +03:00
monty@narttu.mysql.fi
7134ffec21
Merge with 4.0.3
...
Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)
2002-08-30 12:40:40 +03:00