Commit graph

8762 commits

Author SHA1 Message Date
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
unknown
2caf4612f3 Modifications to error messages, and affected test results.
mysql-test/r/merge.result:
  Sync to modified error message.
sql/share/danish/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/dutch/errmsg.txt:
  Remove extraneous periods.
sql/share/english/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/estonian/errmsg.txt:
  Remove extraneous periods.
sql/share/french/errmsg.txt:
  Remove extraneous periods.
sql/share/german/errmsg.txt:
  Remove extraneous periods.
sql/share/greek/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/hungarian/errmsg.txt:
  Remove extraneous periods.
sql/share/italian/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/japanese/errmsg.txt:
  Remove extraneous periods.
sql/share/korean/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/norwegian-ny/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/norwegian/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/polish/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/romanian/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/russian/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/serbian/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/slovak/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/spanish/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/swedish/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
2003-07-15 11:33:01 -05:00
unknown
bf3af8eeac 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
unknown
ac392bb27b cut&paste fixed 2003-07-15 15:20:22 +02:00
unknown
cb8e29cb43 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
unknown
db9b5f333e ELT passes the first argument in args[0] instead of having a separate Item. 2003-07-15 18:11:49 +05:00
unknown
f01a95386d Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-07-15 15:04:39 +02:00
unknown
5aa330863b 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-15 14:58:04 +02:00
unknown
42eb7b3fe4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/4.1
2003-07-15 17:56:20 +05:00
unknown
79f26f7e35 bugfix for the bugfix for the bug 2003-07-15 17:38:01 +05:00
unknown
4b3eecf46b Item_func_field doesn't have a separate Item to store the first argument.
It's now passed as args[0]. This fix allowed to resuse a lot of code.
2003-07-15 17:33:00 +05:00
unknown
54fe4c542e mysql should ignore ' " ` symbols inside comments (Bug ). 2003-07-15 14:38:48 +05:00
unknown
5c0075496e Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-07-15 10:47:45 +02:00
unknown
a1f92f0d12 Fix bug: mysqld crashes on func_sapdb test. 2003-07-15 12:55:29 +05:00
unknown
c458a78a83 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-07-15 11:15:03 +05:00
unknown
5308a07713 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/4.1
2003-07-15 09:24:42 +05:00
unknown
b9818a3825 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2003-07-14 12:16:23 -05:00
unknown
837fc104e2 Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-07-14 07:37:09 -07:00
unknown
6b001731c1 COALESCE now aggregates its argument types in this way:
if some of the arguments is STRING_RESULT the STRING_RESULT
else if some of the arguments is REAL_RESULT then REAL_RESULT
else INT_RESULT
2003-07-14 19:28:36 +05:00
unknown
e7360f4989 A test for character conversion in ALTER TABLE was added 2003-07-14 18:00:27 +05:00
unknown
ef46c1f32b Including client code into libmysqld
Merging 


include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/net_serv.cc:
  #ifndef was removed
2003-07-14 16:41:58 +05:00
unknown
90091dee46 Some mistakes fixed
libmysql/libmysql.c:
  was removed by mistake during merging
libmysqld/Makefile.am:
  link should be removed first
libmysqld/libmysqld.c:
  We don't need this line here
sql-common/pack.c:
  Function was moved to old place
sql/sql_client.cc:
  we do need this function
2003-07-14 16:38:51 +05:00
unknown
350f20032a Fix for the bug : wrong number of warnings 2003-07-14 15:32:31 +05:00
unknown
bc17b14d94 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-07-14 10:54:22 +02:00
unknown
f1e3a929e8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
2003-07-14 00:18:03 +02:00
unknown
0465279561 Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1


sql/item_strfunc.cc:
  Auto merged
2003-07-13 09:53:31 -07:00
unknown
768ab1e47e Removed unreferenced local variable 2003-07-13 01:20:15 -04:00
unknown
19a4a84dbc Added SHOW MASTER LOGS as synonym for SHOW BINARY LOGS.
Added PURGE BINARY LOGS as synonym for PURGE MASTER LOGS.
Removed PURGE LOGS (now PURGE MASTER LOGS).
Added SHOW BDB LOGS as synonym for SHOW LOGS.
Note: tests key_cache.test hanged, rpl_log_pos.test, rpl_rotate_logs.test failed for me.
For the second and third one I guess this will disappear after merging 4.0.


mysql-test/r/rpl_rotate_logs.result:
  result update
mysql-test/t/rpl_rotate_logs.test:
  added test for synonym PURGE BINARY LOGS, changed PURGE LOGS to
  PURGE MASTER LOGS.
sql/sql_yacc.yy:
  Added SHOW MASTER LOGS as synonym for SHOW BINARY LOGS.
  Added PURGE BINARY LOGS as synonym for PURGE MASTER LOGS.
  Removed PURGE LOGS (now PURGE MASTER LOGS).
  Added SHOW BDB LOGS as synonym for SHOW LOGS.
2003-07-12 23:31:21 +02:00
unknown
2bc79e0876 Merge 2003-07-11 18:56:39 -07:00
unknown
a5ce6a49dd Add the support of 'SUBSTR' function compatible with Oracle and SAPDB (SCRUM )
sql/lex.h:
  Add SUBSTR aliased to SUBSTRING
sql/item_strfunc.cc:
  Implement SUBSTR negative offset
mysql-test/t/func_str.test:
  New tests for SUBSTR
mysql-test/r/func_str.result:
  Updated SUBSTR results
2003-07-11 18:55:03 -07:00
unknown
97d9742f10 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
2003-07-11 15:06:07 +02:00
unknown
d1d636de8f field_conv.cc:
Data was not converted when ALTER TABLE CHAGE changed a field character set.


sql/field_conv.cc:
  Data was not converted when ALTER TABLE CHAGE changed a field character set.
2003-07-11 16:11:17 +05:00