dlenev@mysql.com
2e2ac59e05
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-local
2003-07-23 19:49:42 +04:00
dlenev@dlenev.mshome
b5faccbbc3
Fix security bug. mysqld server without ssl support was completly
...
ignorant about ssl_type attribute
2003-07-23 18:50:18 +04:00
guilhem@gbichot2
a97c926eb6
temporary modification of rpl_loaddata.test until 4.0 is merged in 4.1.
...
This is to avoid a test failure, which is fixed in 4.0 in
ChangeSet@1.1455.34.1, 2003-06-10 23:29:49+02:00, guilhem@mysql.com
by making RESET SLAVE reset the error.
2003-07-23 16:48:45 +02:00
guilhem@mysql.com
29207651af
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2003-07-23 15:48:52 +02:00
guilhem@gbichot2
9a5ac78f4c
On Feb 4th, 2003, Monty said he would push my patch to print replicate-do-table
...
and other replicate-*-table options in SHOW SLAVE STATUS.
Seems like it had not been done, so I push it now:
there's 4 new columns to SHOW SLAVE STATUS.
2003-07-23 15:46:46 +02:00
hf@deer.(none)
e849dad4f3
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-07-23 15:23:53 +05: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
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
hf@deer.(none)
2e35e6f866
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-07-22 12:23:38 +05:00
serg@serg.mylan
52e043fd44
gen_lex_hash sigsegv fixed
2003-07-21 21:13:52 +02:00
paul@teton.kitebird.com
43cc5a3431
INSTALL-WIN-SOURCE:
...
tweak
2003-07-21 12:23:41 -05:00
venu@hundin.mysql.fi
0440e70a96
undo one row warning instead use sql_warnings=1
2003-07-21 19:37:18 +03:00
hf@deer.(none)
46bd4b1bce
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-07-21 16:19:32 +05:00
hf@deer.(none)
6e9a460182
Another fix for "client code in embedded library"
2003-07-21 16:19:00 +05:00
venu@myvenu.com
bc7cf30338
Enable warnings by default for single value list inserts also when the client protocol is >= 4.1
2003-07-21 00:13:22 -07:00
serg@serg.mylan
dc5c0784cf
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-07-21 00:33:13 +02:00
serg@serg.mylan
44f656708b
absurd (and syntaxically incorrect) column definition corrected
2003-07-21 00:32:35 +02:00
paul@ice.snake.net
8e6d2a0fc2
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2003-07-20 07:01:18 -05:00
paul@ice.snake.net
2ddef9fcf8
Fix test results affected by error message edit.
2003-07-20 07:00:00 -05:00
serg@serg.mylan
3ca302dbac
bug #715 : SELECT YEAR+0 FROM foobar is parsed as 'SELECT' 'YEAR' '+0' => syntax error
2003-07-20 12:26:18 +02:00
paul@ice.snake.net
30eaa657a1
errmsg.txt:
...
fix typo
2003-07-19 23:19:19 -05:00
serg@serg.mylan
859a4cc116
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-07-18 18:06:45 +02:00
hf@deer.(none)
9bdd31d18d
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-07-18 16:27:11 +05:00
hf@deer.(none)
cbff55a59d
SCRUM
...
Including client code into embedded library
fixes
2003-07-18 16:26:35 +05:00
bar@bar.mysql.r18.ru
46813d545d
All functions now use the same function to aggregate comparison
...
and result types
2003-07-18 15:50:40 +05:00
bar@bar.mysql.r18.ru
53c85bd0e8
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-07-18 14:04:45 +05:00
bar@bar.mysql.r18.ru
e6cd54379e
IN now aggregates all argument types for comparison
2003-07-18 14:03:54 +05:00
gluh@gluh.mysql.r18.ru
8bee3ea70a
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC
2003-07-18 13:29:26 +05:00
gluh@gluh.mysql.r18.ru
0b7f817fa4
Scrum task 425: Added --verbose option for --help
2003-07-18 13:28:38 +05:00
bar@bar.mysql.r18.ru
c8ecb45223
CASE optimization
2003-07-18 13:11:47 +05:00
bar@bar.mysql.r18.ru
ccece982fb
Some fixes in CASE.
...
Test suit was extended to conver various arguments mixes.
2003-07-18 12:42:35 +05:00
paul@ice.snake.net
bdeb6fe2fb
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Users/paul/mysql-4.1
2003-07-17 12:58:06 -05:00
bar@bar.mysql.r18.ru
a2f7ef9c8b
CASE now aggregates all argument types instead of using the only one argument
2003-07-17 22:58:05 +05:00
bar@bar.mysql.r18.ru
8cffa7b2b4
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-07-17 22:58:04 +05:00
vva@eagle.mysql.r18.ru
e78e9ee0e8
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
2003-07-17 13:58:03 -04:00
vva@eagle.mysql.r18.ru
e76d784864
fixed bug with location of mysql_create_sytem_tables
2003-07-17 12:15:41 -04:00
bar@bar.mysql.r18.ru
8c06421c12
CASE stores first_expr and else_expr in args[] array now.
...
This allowed to reuse a lot of code.
2003-07-17 16:07:56 +05:00
bar@bar.mysql.r18.ru
9e3561e45e
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-07-17 10:22:18 +05:00
bar@bar.mysql.r18.ru
c6ade13d8b
ctype-utf8.c:
...
Stupid bug fix
2003-07-17 10:21:30 +05:00
paul@ice.snake.net
7fb37ad847
Fix openssl_2 test so it passes or fails. (It was being reported
...
as [skipped], even when run explicitly.)
2003-07-16 23:47:48 -05: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
1f6089d8e2
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Users/paul/mysql-4.1
2003-07-16 09:19:14 -05:00
bar@bar.mysql.r18.ru
a35fff5bc3
Item_func_null doesn't have a separate Item for the first argument anymore.
...
args[0] is used instead. This allowed to resuse a lot of code.
2003-07-16 11:29:16 +05:00
paul@ice.snake.net
cf09817106
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Users/paul/mysql-4.1
2003-07-15 15:06:14 -05:00
paul@teton.kitebird.com
27a82c836c
Update openssl_1 test.
2003-07-15 14:37:22 -05:00
paul@ice.snake.net
b0cea06b2e
Modifications to error messages, and affected test results.
2003-07-15 11:33:01 -05:00
hf@deer.(none)
11de0b35f7
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-07-15 20:06:27 +05:00
serg@serg.mylan
da5a81cf1f
cut&paste fixed
2003-07-15 15:20:22 +02:00
bar@bar.mysql.r18.ru
96689393e5
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-07-15 18:12:27 +05:00