bell@sanja.is.com.ua
813d81c726
removing additional IN subquery condition
...
fixed IN optimisation bug
2003-09-08 21:58:09 +03:00
carsten@tsort.bitbybit.dk
e0d04fd22b
Add QUICK as mysql-recover option in mysqld --help
2003-09-05 14:44:21 +02:00
monty@narttu.mysql.fi
4b3b4b9250
merge
2003-09-03 19:53:08 +03:00
serg@serg.mylan
7d2b0a0ce7
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-09-03 15:40:19 +02:00
kostja@oak.local
36dd82c1d5
merge commit, hope that none of bar and dlenev changes were
...
lost.
2003-09-03 14:12:10 +04:00
serg@serg.mylan
755455e15c
merged
2003-09-03 12:07:18 +02:00
dlenev@mysql.com
73ab4be246
Manual merge fixes
2003-09-01 16:14:54 +04:00
dlenev@dlenev.mshome
2486222cd2
Implemented replication over SSL
...
Added proper options to CHANGE MASTER TO, new fields to SHOW SLAVE STATUS,
Honoring this parameters during connection to master.
Introduced new format of master.info file
2003-09-01 15:16:20 +04:00
monty@narttu.mysql.fi
77a70a0a24
merge with 4.0.15
2003-08-29 13:44:35 +03:00
monty@narttu.mysql.fi
66b160c253
vio ssl structure renames (to get rid of ending _)
...
Added TCP/IP read/write timeout for windows
Check on windows if second server is started with same TCP/IP port
2003-08-27 02:51:39 +03:00
pem@mysql.telia.com
08e5a7e135
Post-merge fixes.
2003-08-26 17:41:40 +02:00
pem@mysql.com
7f158dd12a
Merge 4.1 into 5.0
2003-08-26 11:51:09 +02:00
igor@rurik.mysql.com
40193a7fa5
Manual merge
2003-08-26 00:13:22 -07:00
monty@narttu.mysql.fi
e12136b468
show symlinked directories in SHOW CREATE TABLE
2003-08-23 12:25:39 +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
serg@serg.mylan
08d7f298ee
fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib
...
moved them all from different places to item_strfunc.{h,cc}
checksum table command
Com_xxx status variables updated
2003-08-21 16:15:06 +02:00
monty@narttu.mysql.fi
359846f052
Fixed some varnings from valgrind
...
Set min value of max_allowed_packet to 1024
Fixed problem with UNION's without braces and SQL_CALC_FOUND_ROWS, LIMIT #,#
and ORDER BY...LIMIT
2003-08-20 16:25:44 +03:00
bell@laptop.sanja.is.com.ua
dd9cbce47b
merge
2003-08-19 20:14:35 +03:00
monty@mashka.mysql.fi
4f7512160b
After merge fixes
...
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings
2003-08-19 00:08:08 +03:00
monty@mashka.mysql.fi
2263e3e51f
Merge with 4.0.14
2003-08-11 22:44:43 +03:00
igor@rurik.mysql.com
2813cd1f0b
set_var.cc, mysqld.cc, handler.cc, set_var.h, handler.h:
...
Added key cache parameters for midpoint insertion strategy
Many files:
Added midpoint insertion strategy for key cache
mi_test2.c:
Added a parameter to resize_key_cache
2003-08-09 11:12:22 -07:00
monty@mashka.mysql.fi
8f08c511ee
Review of changesets since last pull.
...
(Mostly code cleanups)
2003-08-07 20:16:37 +03:00
bell@sanja.is.com.ua
de705e53f2
fixed bug in used_tables() report of left expression of IN subquery
...
fixed number of rows of external field reported to optimizer
added check of choosen key (checked left expression tag)
(SCRUM fix for simple IN optimisation)
2003-08-07 11:16:02 +03:00
igor@rurik.mysql.com
f7adcbff7b
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-08-02 03:27:13 -07:00
igor@rurik.mysql.com
9306f55d8e
Many files:
...
Added key cache assignment
mi_locking.c:
Added key cache assignment: correction
my_sys.h:
Added key cache variable structure
2003-08-02 02:43:18 -07:00
kostja@oak.local
50d3291aee
manual merge
2003-07-31 17:11:52 +04:00
heikki@hundin.mysql.fi
a5eacc69e6
mysqld.cc:
...
innodb_fast_shutdown CAN take an argument though it was not specified so in mysqld.cc
2003-07-29 00:04:56 +03:00
serg@serg.mylan
67da1edee2
'mysqld --verbose' should not print help screen
2003-07-27 10:26:29 +02:00
gluh@gluh.mysql.r18.ru
c6a38a2557
Bug#909: mysqld --verbose --help != mysqld --help --verbose
...
Proposed fix for bug#909
2003-07-25 11:03:57 +05:00
miguel@hegel.local
33c47c7ead
Fix for service issue with paths having spaces (bug #687 )
2003-07-23 21:57:44 -04:00
vva@eagle.mysql.r18.ru
99aa453f37
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_663/mysql-4.1
2003-07-22 19:02:36 -04:00
vva@eagle.mysql.r18.ru
f32299279d
fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump)
2003-07-22 18:58:30 -04:00
kostja@oak.local
d90129d1e9
Merge oak.local:/home/kostja/mysql/mysql-4.1-root
...
into oak.local:/home/kostja/mysql/mysql-4.1
2003-07-18 18:16:46 +04:00
gluh@gluh.mysql.r18.ru
333bddb33f
SCRUM:
...
Task 499 'init_connect, init_slave options'
2003-07-18 14:11:01 +05:00
gluh@gluh.mysql.r18.ru
0b7f817fa4
Scrum task 425: Added --verbose option for --help
2003-07-18 13:28:38 +05:00
igor@rurik.mysql.com
26ecd86539
Conflict resolution
2003-07-16 13:35:34 -07:00
monty@narttu.mysql.fi
df7c1e8165
Better fix for bug #791 : At binlog rotation, INSERTs may not find their way into the binlog
2003-07-14 14:59:26 +03:00
guilhem@mysql.com
34c8918915
removed 2 small useless if().
2003-07-12 15:06:40 +02: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
a8a29a39d2
Merging 4.1 into 5.0 (second pass; post-merge fixes).
...
One test in subselect.test still wrong.
Had to reconstruct all errmsg.txt files completely, since auto-merge made
a mess of the lot. :-(
2003-07-09 17:07:12 +02:00
kostja@oak.local
941a8623ca
resolved conflict with pulled changeset
2003-07-09 18:24:43 +04:00
monty@mashka.mysql.fi
d9e7072210
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mashka.mysql.fi:/home/my/mysql-4.0
2003-07-09 00:00:16 +03:00
monty@mashka.mysql.fi
b2cbd83913
Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS
...
Removed double my_thread_end() which caused fatal error on windows if mysqld died on startup
2003-07-08 23:58:04 +03:00
pem@mysql.telia.com
9c3a7a6ba3
Merge 4.1 into 5.0 (first pass).
2003-07-08 17:50:23 +02:00
kostja@oak.local
0f28677af6
Merge oak.local:/home/kostja/mysql/mysql-4.1-root
...
into oak.local:/home/kostja/mysql/mysql-4.1
2003-07-08 12:03:46 +04:00
kostja@oak.local
a232225b69
Preliminary support for options --secure-auth,
...
--old-passwords
Support for option --old-protocol was removed.
Some test performed.
Tests for SSL and replication are pending.
More strict following to specification for --old-passwords
is in the TODO.
2003-07-08 02:36:14 +04:00
serg@serg.mylan
74ac300642
typos fixed
2003-07-07 19:35:11 +02:00
monty@mashka.mysql.fi
ebcc7b5a4f
Support for variables with components
...
Added framework to create/drop and manager buffers for multiple key caches
2003-07-06 19:09:57 +03:00
guilhem@mysql.com
9c73d91d54
WL#912 (more user control on relay logs):
...
FLUSH LOGS now rotates relay logs,
and a new variable max_relay_log_size.
Plus a very small bit of code cleaning.
2003-07-06 17:59:54 +02:00
monty@narttu.mysql.fi
42e5754a4b
Fixed problem with stacksize on Unixware
2003-07-04 01:21:42 +03:00