Commit graph

8685 commits

Author SHA1 Message Date
unknown
4ef2a4306d Fix for #886
sql-common/client.c:
  SOCKET_EINTR is handled differently working in replication
2003-07-28 20:16:11 +05:00
unknown
ae5d38569d Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2003-07-25 10:50:54 -05:00
unknown
13325ee789 Bug#909: mysqld --verbose --help != mysqld --help --verbose
Proposed fix for bug#909
2003-07-25 11:03:57 +05:00
unknown
3a8d1c3cd0 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.


mysql-test/r/grant_cache.result:
  Fix up test result to match error message edit.
sql/share/czech/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/danish/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/dutch/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/english/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/estonian/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/french/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/german/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/greek/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/hungarian/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/italian/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/japanese/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/korean/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/norwegian-ny/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/norwegian/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/polish/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/portuguese/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/romanian/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/russian/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/serbian/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/slovak/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/spanish/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/swedish/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/ukrainian/errmsg.txt:
  Print user@host in syntax actually used for GRANT/REVOKE.
2003-07-24 12:43:57 -05:00
unknown
fb98d363e7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-local


BitKeeper/etc/logging_ok:
  auto-union
2003-07-23 19:49:42 +04:00
unknown
af8d09ff47 Fix security bug. mysqld server without ssl support was completly
ignorant about ssl_type attribute


sql/sql_acl.cc:
  Now acl_getroot() honors ssl_type attribute even if we compile without openssl
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-07-23 18:50:18 +04:00
unknown
3be8c60c25 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.


mysql-test/r/rpl_loaddata.result:
  temporary modification until 4.0 is merged in 4.1
mysql-test/t/rpl_loaddata.test:
  temporary modification until 4.0 is merged in 4.1
2003-07-23 16:48:45 +02:00
unknown
bacddcc5f5 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
unknown
dae34fb60f 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.


mysql-test/r/rpl000015.result:
  Result update (more columns)
mysql-test/r/rpl_empty_master_crash.result:
  Result update (more columns)
mysql-test/r/rpl_flush_log_loop.result:
  Result update (more columns)
mysql-test/r/rpl_log.result:
  Result update (more columns)
mysql-test/r/rpl_log_pos.result:
  Result update (more columns)
mysql-test/r/rpl_redirect.result:
  Result update (more columns)
mysql-test/r/rpl_replicate_do.result:
  Result update (more columns)
mysql-test/r/rpl_rotate_logs.result:
  Result update (more columns)
mysql-test/t/rpl_replicate_do.test:
  Result update (more columns)
sql/slave.cc:
  Print replicate_*_table options in SHOW SLAVE STATUS
sql/slave.h:
  two functions to make a string of replicate_*_table lists.
2003-07-23 15:46:46 +02:00
unknown
a80c5a9c9b 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
unknown
41e77ddf65 SCRUM - adding client into embedded server
error handling fixed
fetch_lengths made to work differently in embedded and client cases


include/mysql.h:
  removed 'embedded' error containers - they're unnecessary now
  added declarations for fetch_lengths to be 'virtual'
include/sql_common.h:
  fetch_lengths declaration removed
libmysql/libmysql.c:
  implementations for fetch_lengths to be 'virtual' added
libmysqld/lib_sql.cc:
  error informations now is moved from thd->net to mysql-net
libmysqld/libmysqld.c:
  error data is in mysql->net now
sql-common/client.c:
  we have to return old fetch_lengths implementation for 'client' case
sql/protocol.cc:
  handling of sqlstate for embedded library added
2003-07-23 15:23:20 +05:00
unknown
9b675b8be0 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


sql/field_conv.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
2003-07-22 19:02:36 -04:00
unknown
38aa6d1c15 fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump) 2003-07-22 18:58:30 -04:00
unknown
ceb2374b69 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
unknown
491cdf396f gen_lex_hash sigsegv fixed 2003-07-21 21:13:52 +02:00
unknown
d951272de1 INSTALL-WIN-SOURCE:
tweak


INSTALL-WIN-SOURCE:
  tweak
2003-07-21 12:23:41 -05:00
unknown
d1db620853 undo one row warning instead use sql_warnings=1
sql/sql_insert.cc:
  Undo warnings for single row inserts
mysql-test/t/warnings.test:
  undo one row warning instead use sql_warnings=1
mysql-test/r/warnings.result:
  Fix result file
2003-07-21 19:37:18 +03:00
unknown
ca3cd6dad1 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
unknown
53f4626105 Another fix for "client code in embedded library"
include/mysql.h:
  mysql_close isn't virtual nown
2003-07-21 16:19:00 +05:00
unknown
f22517e4ec Enable warnings by default for single value list inserts also when the client protocol is >= 4.1
tests/client_test.c:
  test for timestamp bug (BR #819)
sql/sql_insert.cc:
  Enable warnings by default for single value list
  protocol
mysql-test/t/warnings.test:
  Updated test for single value list insert warning
mysql-test/r/warnings.result:
  Updated warnings results
2003-07-21 00:13:22 -07:00
unknown
012910656f Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


mysql-test/r/innodb.result:
  Auto merged
2003-07-21 00:33:13 +02:00
unknown
a4dbcfd681 absurd (and syntaxically incorrect) column definition corrected 2003-07-21 00:32:35 +02:00
unknown
bc14ad82df 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
unknown
de13ae26e1 Fix test results affected by error message edit.
mysql-test/r/bdb.result:
  Fix test result affected by error message edit.
mysql-test/r/innodb.result:
  Fix test result affected by error message edit.
mysql-test/r/isam.result:
  Fix test result affected by error message edit.
mysql-test/r/repair_part1.result:
  Fix test result affected by error message edit.
2003-07-20 07:00:00 -05:00
unknown
c1ed639cb6 bug #715: SELECT YEAR+0 FROM foobar is parsed as 'SELECT' 'YEAR' '+0' => syntax error
mysql-test/r/bigint.result:
  test results updated
mysql-test/r/type_decimal.result:
  test results updated
mysql-test/t/bigint.test:
  new tests added
mysql-test/t/type_decimal.test:
  error numbers updated
sql/item.h:
  round(9999999999999999999) fixed
sql/sql_yacc.yy:
  bug #715: SELECT YEAR+0 FROM foobar is parsed as 'SELECT' 'YEAR' '+0'   => syntax error
  unary '+' added
2003-07-20 12:26:18 +02:00
unknown
bc3dc272f7 errmsg.txt:
fix typo


sql/share/english/errmsg.txt:
  fix typo
2003-07-19 23:19:19 -05:00
unknown
56b220b11e Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_func.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-07-18 18:06:45 +02:00
unknown
127ff28c89 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
unknown
d17b3e967d SCRUM
Including client code into embedded library
fixes


libmysql/libmysql.c:
  We should call this way
libmysqld/lib_sql.cc:
  Necessary initializations added
libmysqld/libmysqld.c:
  mysql_close can't be "virtual"
  mysqltest.c calls mysql_close before mysql_connect
sql-common/client.c:
  We have to redo fetch_lengths to count lengths looking at '\0' in string.
  It works slower, but is correct for both client and embedded libraries
2003-07-18 16:26:35 +05:00
unknown
00e8a41151 All functions now use the same function to aggregate comparison
and result types
2003-07-18 15:50:40 +05:00
unknown
62ec825c63 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
unknown
687863c093 IN now aggregates all argument types for comparison 2003-07-18 14:03:54 +05:00
unknown
c768fd18ee 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
unknown
ee1440848f Scrum task 425: Added --verbose option for --help 2003-07-18 13:28:38 +05:00
unknown
f4e07b861e CASE optimization 2003-07-18 13:11:47 +05:00
unknown
a975548b53 Some fixes in CASE.
Test suit was extended to conver various arguments mixes.
2003-07-18 12:42:35 +05:00
unknown
926b05ed0e 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
unknown
102bfc9ee8 CASE now aggregates all argument types instead of using the only one argument 2003-07-17 22:58:05 +05:00
unknown
8283a01f24 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
unknown
e431b9faca 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
unknown
96627521e8 fixed bug with location of mysql_create_sytem_tables 2003-07-17 12:15:41 -04:00
unknown
d5a6d17707 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
unknown
85cc122794 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
unknown
35262eebdc ctype-utf8.c:
Stupid bug fix


strings/ctype-utf8.c:
  Stupid bug fix
2003-07-17 10:21:30 +05:00
unknown
7a3a6aebc7 Fix openssl_2 test so it passes or fails. (It was being reported
as [skipped], even when run explicitly.)


mysql-test/include/have_openssl_2.inc:
  There is no such variable as SSL_get_cipher.
mysql-test/r/have_openssl_2.require:
  Require file required garbage. Fix to require something sensible.
mysql-test/r/openssl_2.result:
  Add output of SHOW STATUS to test result.
mysql-test/t/openssl_2.test:
  Use actual lettercase of SSL status variables.
  (Test will work with uppercase, but there's no
  reason not to use the actual lettercase.)
2003-07-16 23:47:48 -05:00
unknown
7770c16770 Error message consistency edits + updates to affected test results.
mysql-test/r/innodb.result:
  Fix test result to correspond to error message edits.
mysql-test/r/repair_part2.result:
  Fix test result to correspond to error message edits.
mysql-test/r/type_blob.result:
  Fix test result to correspond to error message edits.
sql/share/czech/errmsg.txt:
  Error message consistency edits.
sql/share/dutch/errmsg.txt:
  Error message consistency edits.
sql/share/estonian/errmsg.txt:
  Error message consistency edits.
sql/share/french/errmsg.txt:
  Error message consistency edits.
sql/share/german/errmsg.txt:
  Error message consistency edits.
sql/share/greek/errmsg.txt:
  Error message consistency edits.
sql/share/hungarian/errmsg.txt:
  Error message consistency edits.
sql/share/italian/errmsg.txt:
  Error message consistency edits.
sql/share/norwegian-ny/errmsg.txt:
  Error message consistency edits.
sql/share/norwegian/errmsg.txt:
  Error message consistency edits.
sql/share/danish/errmsg.txt:
  Error message consistency edits.
sql/share/polish/errmsg.txt:
  Error message consistency edits.
sql/share/portuguese/errmsg.txt:
  Error message consistency edits.
sql/share/romanian/errmsg.txt:
  Error message consistency edits.
sql/share/serbian/errmsg.txt:
  Error message consistency edits.
sql/share/slovak/errmsg.txt:
  Error message consistency edits.
sql/share/spanish/errmsg.txt:
  Error message consistency edits.
sql/share/swedish/errmsg.txt:
  Error message consistency edits.
sql/share/ukrainian/errmsg.txt:
  Error message consistency edits.
sql/share/english/errmsg.txt:
  Error message consistency edits.
2003-07-16 14:37:00 -05:00
unknown
6976474705 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
unknown
a41a43f99d 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
unknown
d9145e3964 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
unknown
6b52f58255 Update openssl_1 test. 2003-07-15 14:37:22 -05:00