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
bell@sanja.is.com.ua
ad07ffbf6d
merge
2003-09-09 22:26:19 +03: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
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
bell@laptop.sanja.is.com.ua
eb3240a908
merge
2003-08-26 16:49:53 +03:00
pem@mysql.com
7f158dd12a
Merge 4.1 into 5.0
2003-08-26 11:51:09 +02:00
monty@mashka.mysql.fi
2263e3e51f
Merge with 4.0.14
2003-08-11 22:44:43 +03: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
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
paul@teton.kitebird.com
bd8c921172
Print accounts in error messages as 'user'@'host' rather than 'user@host'.
...
The latter is misleading because differs from the syntax used for GRANT/REVOKE.
Fix up test result affected by error message edits.
2003-07-24 12:43:57 -05:00
paul@ice.snake.net
30eaa657a1
errmsg.txt:
...
fix typo
2003-07-19 23:19:19 -05:00
kostja@oak.local
7dab500b7a
Merge oak.local:/home/kostja/mysql/mysql-4.1-root
...
into oak.local:/home/kostja/mysql/mysql-4.1
2003-07-17 14:55:13 +04:00
paul@ice.snake.net
84b9c4e78d
Error message consistency edits + updates to affected test results.
2003-07-16 14:37:00 -05:00
paul@ice.snake.net
b0cea06b2e
Modifications to error messages, and affected test results.
2003-07-15 11:33:01 -05:00
heikki@hundin.mysql.fi
bf6938fd4d
errmsg.txt:
...
Correct a misleading error message about max row length
2003-07-14 16:04:20 +03:00
paul@teton.kitebird.com
e08e67ff9d
Error message style consistency edits.
2003-07-09 18:42:54 -05: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
39e7db9f51
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mashka.mysql.fi:/home/my/mysql-4.1
2003-07-08 23:54:48 +03:00
pem@mysql.telia.com
9c3a7a6ba3
Merge 4.1 into 5.0 (first pass).
2003-07-08 17:50:23 +02: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
paul@ice.snake.net
bdfe922f85
Error message edits. (Change sentence ending with period + sentence
...
not ending with period into single sentence.)
2003-07-07 23:35:24 -05: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
paul@teton.kitebird.com
33f8d7aedf
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into teton.kitebird.com:/home/paul/mysql-4.1
2003-06-26 11:04:20 -05:00
bar@bar.mysql.r18.ru
65335d37ff
New messages for 3-adic and N-adic operations
...
REPLACE() now processed arguments collations according to standard
2003-06-26 15:45:04 +05:00
paul@teton.kitebird.com
36a75d26f2
modify error message
2003-06-25 16:25:03 -05:00
carsten@tsort.bitbybit.dk
725d5fdc43
Some error messages re. BLOBs are true for TEXTs as well
2003-06-09 15:22:28 +02:00
gluh@gluh.mysql.r18.ru
7d020eae17
REVOKE all privileges and delete user(244)
2003-06-06 17:43:23 +05:00
monty@mashka.mysql.fi
cb7061ebe4
merge
2003-05-22 02:57:27 +03:00
venu@myvenu.com
0c25993d24
Fix merge conflict by changing warning codes to new one
2003-05-21 01:21:06 -07:00
venu@myvenu.com
97a2c472bc
Resolve merge conflict
2003-05-21 00:14:56 -07:00
bar@bar.mysql.r18.ru
5b788e660a
A separate, better error message when it's impossible to aggregate strings for some operation
2003-05-20 16:36:59 +05:00
monty@narttu.mysql.fi
dd2b7918cd
Merge with 4.0.13
2003-05-19 16:35:49 +03:00
monty@mashka.mysql.fi
60dfb25be3
Give warning if MySQL doesn't honor given storage engine
...
Allow syntax CREATE TABLE t1 (LIKE t2)
2003-05-13 11:15:11 +03:00
monty@narttu.mysql.fi
c6333c5148
Fixed bug in SET SQL_BIG_SELECTS
2003-04-24 09:18:53 +03:00
pem@mysql.com
7b5df9edec
Check the number of args to SPs.
...
Fixes bug #280 .
2003-04-17 13:20:02 +02:00
pem@mysql.com
64da2fff67
Post post-merge fix.
2003-04-17 00:34:15 +02:00
pem@mysql.com
386b0b91b2
Merged 4.1 into 5.0.
2003-04-16 23:23:23 +02:00
vva@eagle.mysql.r18.ru
02ad1b95e3
Merge
2003-04-10 10:25:21 -04:00
vva@eagle.mysql.r18.ru
950fa7aa8a
added compress/uncompress function
2003-04-09 20:50:30 -04:00
hf@deer.mysql.r18.ru
5d4e9f95f2
Merging
2003-04-08 19:43:24 +05:00
pem@mysql.com
736e78251e
Merging 4.1 to 5.0.
2003-04-04 13:45:35 +02:00
wax@kishkin.ru
8c0de640e3
resolve new updates group_concat
2003-04-02 19:16:19 +06:00
guilhem@mysql.com
654410a3d3
Deprecated the update log (Sprint task #792 ). Now --log-update
...
just turns on --log-bin and prints a warning. SQL_LOG_UPDATE
is handled in two ways (see mysqld.cc for comments).
2003-04-02 00:15:20 +02:00
hf@genie.(none)
f8f0b70380
SCRUM
...
two KILL commands implementation (version 2)
2003-03-31 13:39:46 +05:00
pem@mysql.com
4a171efd6f
Merged 4.1 -> 5.0.
2003-03-18 16:12:50 +01:00
