bar@bar.mysql.r18.ru
83c6946232
Bug fix:
...
http://bugs.mysql.com/bug.php?id=1264
2003-09-16 15:43:17 +05:00
dlenev@mysql.com
2c24b2e9b4
Manual merge after commiting START SLAVE UNTIL
2003-09-14 01:57:09 +04:00
dlenev@dlenev.mshome
c0cfae1c8d
Implemented support for START SLAVE UNTIL (WL#868)
2003-09-14 00:13:41 +04:00
monty@mashka.mysql.fi
7538242e4f
merge with 4.1 tree
2003-09-11 20:31:40 +03:00
monty@mashka.mysql.fi
73f66f68fd
merge with 4.0.15
2003-09-11 20:24:14 +03:00
monty@mashka.mysql.fi
45aa92c574
After merge fixes.
...
Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)
2003-09-11 19:06:23 +03:00
hf@deer.(none)
f434b329f5
SCRUM
...
embedded&client library
some fixes: zero at the end of the data added
mysql_list_fields became 'virtual'
2003-09-11 09:46:31 +05:00
monty@mashka.mysql.fi
223a966763
Remove not used define (my_strxfrm)
2003-09-11 06:09:34 +03:00
bell@sanja.is.com.ua
ad07ffbf6d
merge
2003-09-09 22:26:19 +03:00
monty@mashka.mysql.fi
99490870e6
Cleaned up last bug fixes
...
Fix bug in SHOW GRANTS when there is a column privilege but no table privilege
2003-09-09 20:06:50 +03:00
hf@deer.(none)
2ba517a3f1
fix for #1210
2003-09-08 13:11:18 +05:00
monty@narttu.mysql.fi
4b3b4b9250
merge
2003-09-03 19:53:08 +03:00
serg@serg.mylan
2317fa3ba5
C cleanups
2003-09-03 16:31:01 +02: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
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
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
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
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