miguel@hegel.local
234208f03e
Fix VC++ compiler error with redifinition return type
2003-08-29 22:13:57 -04:00
monty@narttu.mysql.fi
77a70a0a24
merge with 4.0.15
2003-08-29 13:44:35 +03:00
dlenev@dlenev.mshome
6cad89775b
Fixed problem with absence of gmtime_r under Windows.
2003-08-29 03:23:18 +04:00
hf@deer.(none)
bf3e65b128
SCRUM:
...
Fixed some mess with STDCALL in function's declarations
2003-08-28 13:39:46 +05:00
jani@rhols221.adsl.netsonic.fi
5f8ef50b35
Added a warning to my_print_defaults if --verbose is given
...
and --defaults-file is a non-existing or non-regular file.
Bug#755
2003-08-27 19:22:14 +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
bell@laptop.sanja.is.com.ua
eb3240a908
merge
2003-08-26 16:49:53 +03:00
igor@rurik.mysql.com
40193a7fa5
Manual merge
2003-08-26 00:13:22 -07:00
serg@serg.mylan
58bdc6f5e1
use crc32() from bundled zlib if system zlib is unavailable
2003-08-21 18:30:43 +02:00
monty@narttu.mysql.fi
23f0de0867
Fixed problem with undefined assert symbol
2003-08-20 17:16:07 +03: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
guilhem@mysql.com
6e32e19047
Use my_b_append instead of my_b_write on a SEQ_READ_APPEND cache, when we write
...
the first 4 bytes of the relay log. Indeed comments in mysys/mf_iocache.c
say we must always use my_b_append for such a cache.
This *could* avoid a very rare assertion failure which is:
030524 19:32:38 Slave SQL thread initialized, starting replication in log 'FIRST' at position 0, relay log '/
users/gbichot/4.1.1/mysql-test/var/log/slave-relay-bin.000001' position: 4
030524 19:32:38 next log '/users/gbichot/4.1.1/mysql-test/var/log/slave-relay-bin.000002' is currently active
mysqld: mf_iocache.c:701: _my_b_seq_read: Assertion `pos_in_file == info->end_of_file' failed.
and which seemed to happen always when the SQL thread and/or the I/O thread
were at position 4 in a relay log.
2003-08-19 17:00:36 +02:00
serg@serg.mylan
7b873fa876
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-08-19 11:07:57 +02:00
ram@mysql.r18.ru
ba77af7321
Removed idle MY_LEX_SIGNED_NUMBER
2003-08-19 12:49:47 +05:00
monty@mashka.mysql.fi
10c4acfb4f
merge
2003-08-19 00:10:21 +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
a9146ace70
Cleanups to recent patches
...
Fix packet error when using wrong GRANT command
2003-08-15 09:54:19 +03:00
serg@serg.mylan
7c5ba4f6fa
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-08-12 19:44:13 +02:00
monty@mashka.mysql.fi
2263e3e51f
Merge with 4.0.14
2003-08-11 22:44:43 +03:00
dlenev@dlenev.mshome
921ac8af8b
Implemented UTC_TIME, UTC_DATE and UTC_TIMESTAMP functions (WL#345)
2003-08-11 23:43:01 +04:00
serg@serg.mylan
835e00661d
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-08-09 23:48:57 +02: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
serg@serg.mylan
79922d946a
table checksum background:
...
my_checksum() mysys function
NISAM checksum code moved from mysys to isam/ - it's obsolete
MyISAM checksum code moved to mysys
table's checksum accessible from sql layer
SHOW TABLE STATUS shows checksum (WL#646)
code cleanup
2003-08-05 21:14:15 +02: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
bar@bar.mysql.r18.ru
c2a7768b56
A new separate error message: Unknown collation 'blablabla'
2003-07-29 17:12:14 +05:00
serg@serg.mylan
f384ff5889
ulong is not portable
2003-07-27 10:17:04 +02:00
serg@serg.mylan
e0d9c9cd2b
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-07-27 09:59:24 +02:00
bell@sanja.is.com.ua
9ba680040b
added warning about external fields resolving to EXPLAIN command
...
(SCRUM) (WL#1053)
2003-07-25 01:02:42 +03:00
miguel@hegel.local
33c47c7ead
Fix for service issue with paths having spaces (bug #687 )
2003-07-23 21:57:44 -04:00
hf@deer.(none)
a4f899dfc0
SCRUM - adding client into embedded server
...
error handling fixed
fetch_lengths made to work differently in embedded and client cases
2003-07-23 15:23:20 +05:00
serg@serg.mylan
2cac8f0768
now GRANT db.* ... compares patterns correctly to prevent privilege escalation
2003-07-22 22:21:23 +02:00
hf@deer.(none)
6e9a460182
Another fix for "client code in embedded library"
2003-07-21 16:19:00 +05:00
kostja@oak.local
715f8747d4
few compile-time bugs fixed
2003-07-18 18:57:21 +04:00
kostja@oak.local
09e53b0169
Style fixes, comments for 4.1.1 authorization
...
Now special 1-byte packet is used for request of old password
Fixed bug with --skip-grant-tables and acl_getroot
2003-07-18 18:25:54 +04:00
igor@rurik.mysql.com
26ecd86539
Conflict resolution
2003-07-16 13:35:34 -07:00
igor@rurik.mysql.com
42e1296e9d
mi_keycache.c:
...
new file
Many files:
Added CACHE INDEX command
2003-07-16 12:30:49 -07:00
hf@deer.(none)
6b303f846b
Including client code into libmysqld
...
Merging
2003-07-14 16:41:58 +05:00
kostja@oak.local
941a8623ca
resolved conflict with pulled changeset
2003-07-09 18:24:43 +04:00
monty@mashka.mysql.fi
8b54bff34c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mashka.mysql.fi:/home/my/mysql-4.1
2003-07-08 23:48:04 +03:00
guilhem@mysql.com
46b0e778b8
Fix for
...
BUG#797 "If query ignored on slave (replicate-ignore-table) the slave still checks if
the returned error (0) is the same as the one on the master, whereas it shouldn't
test this.
Plus a new test for BUG#797.
2003-07-08 15:50:57 +02:00
venu@myvenu.com
bb718b31d0
implementation of mysql_stmt_reset client end
2003-07-08 02:27:21 -07: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
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
kostja@oak.local
1d20b23247
Bug fixes for authentication
...
OLD_PASSWORD made a keyword to allow set password=old_password('abc') constructions.
2003-07-04 20:52:04 +04:00
hf@deer.(none)
9d4bae335c
Resolving conflicts
2003-07-04 13:21:14 +05:00
hf@deer.(none)
c224b55835
SCRUM
...
Including client code into embedded library
Code trimming (fixes of comments etc)
2003-07-04 11:40:10 +05:00