Commits · ca6c74b7ee8f9a1a94521083215601ef635f1db3 · Kirill Smelkov / mariadb

22 Jul, 2003 1 commit

merge · ca6c74b7

unknown authored Jul 22, 2003


sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

ca6c74b7

21 Jul, 2003 4 commits

gen_lex_hash sigsegv fixed · 491cdf39
unknown authored Jul 21, 2003

491cdf39
INSTALL-WIN-SOURCE: · d951272d
unknown authored Jul 21, 2003
```
  tweak


INSTALL-WIN-SOURCE:
  tweak
```
d951272d

undo one row warning instead use sql_warnings=1 · d1db6208

unknown authored Jul 21, 2003


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

d1db6208

Enable warnings by default for single value list inserts also when the client protocol is >= 4.1 · f22517e4

unknown authored Jul 21, 2003


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

f22517e4

20 Jul, 2003 6 commits

Merge bk-internal:/home/bk/mysql-4.1/ · 01291065

unknown authored Jul 21, 2003

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


mysql-test/r/innodb.result:
  Auto merged

01291065

absurd (and syntaxically incorrect) column definition corrected · a4dbcfd6
unknown authored Jul 21, 2003

a4dbcfd6
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · bc14ad82
unknown authored Jul 20, 2003
```
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
```
bc14ad82

Fix test results affected by error message edit. · de13ae26

unknown authored Jul 20, 2003


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.

de13ae26

bug #715: SELECT YEAR+0 FROM foobar is parsed as 'SELECT' 'YEAR' '+0' => syntax error · c1ed639c

unknown authored Jul 20, 2003


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

c1ed639c

errmsg.txt: · bc3dc272
unknown authored Jul 19, 2003
```
  fix typo


sql/share/english/errmsg.txt:
  fix typo
```
bc3dc272

18 Jul, 2003 8 commits
- Merge bk-internal:/home/bk/mysql-4.1/ · 56b220b1
  unknown authored Jul 18, 2003
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_func.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
```
  56b220b1
- All functions now use the same function to aggregate comparison · 00e8a411
  unknown authored Jul 18, 2003
```
and result types
```
  00e8a411
- Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · 62ec825c
  unknown authored Jul 18, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
  62ec825c
- IN now aggregates all argument types for comparison · 687863c0
  unknown authored Jul 18, 2003
  
  687863c0
- Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · c768fd18
  unknown authored Jul 18, 2003
```
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC
```
  c768fd18
- Scrum task 425: Added --verbose option for --help · ee144084
  unknown authored Jul 18, 2003
  
  ee144084
- CASE optimization · f4e07b86
  unknown authored Jul 18, 2003
  
  f4e07b86
- Some fixes in CASE. · a975548b
  unknown authored Jul 18, 2003
```
Test suit was extended to conver various arguments mixes.
```
  a975548b
17 Jul, 2003 9 commits
- Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 926b05ed
  unknown authored Jul 17, 2003
```
into ice.snake.net:/Users/paul/mysql-4.1
```
  926b05ed
- CASE now aggregates all argument types instead of using the only one argument · 102bfc9e
  unknown authored Jul 17, 2003
  
  102bfc9e
- Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · 8283a01f
  unknown authored Jul 17, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
  8283a01f
- Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 · e431b9fa
  unknown authored Jul 17, 2003
```
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
```
  e431b9fa
- fixed bug with location of mysql_create_sytem_tables · 96627521
  unknown authored Jul 17, 2003
  
  96627521
- CASE stores first_expr and else_expr in args[] array now. · d5a6d177
  unknown authored Jul 17, 2003
```
This allowed to reuse a lot of code. 
```
  d5a6d177
- Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · 85cc1227
  unknown authored Jul 17, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
  85cc1227
- ctype-utf8.c: · 35262eeb
  unknown authored Jul 17, 2003
```
  Stupid bug fix


strings/ctype-utf8.c:
  Stupid bug fix
```
  35262eeb
- Fix openssl_2 test so it passes or fails. (It was being reported · 7a3a6aeb
  unknown authored Jul 16, 2003
```
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.)
```
  7a3a6aeb
16 Jul, 2003 4 commits

Error message consistency edits + updates to affected test results. · 7770c167

unknown authored Jul 16, 2003


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.

7770c167

Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 69764747
unknown authored Jul 16, 2003
```
into ice.snake.net:/Users/paul/mysql-4.1
```
69764747

merge · eba0a3aa

unknown authored Jul 16, 2003


sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

eba0a3aa

Item_func_null doesn't have a separate Item for the first argument anymore. · a41a43f9
unknown authored Jul 16, 2003
```
args[0] is used instead. This allowed to resuse a lot of code.
```
a41a43f9

15 Jul, 2003 8 commits

Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · d9145e39
unknown authored Jul 15, 2003
```
into ice.snake.net:/Users/paul/mysql-4.1
```
d9145e39
Update openssl_1 test. · 6b52f582
unknown authored Jul 15, 2003

6b52f582

Modifications to error messages, and affected test results. · 2caf4612

unknown authored Jul 15, 2003


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.

2caf4612

cut&paste fixed · ac392bb2
unknown authored Jul 15, 2003

ac392bb2
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · cb8e29cb
unknown authored Jul 15, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
cb8e29cb
ELT passes the first argument in args[0] instead of having a separate Item. · db9b5f33
unknown authored Jul 15, 2003

db9b5f33
Merge bk-internal:/home/bk/mysql-4.1/ · f01a9538
unknown authored Jul 15, 2003
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
f01a9538

Merge bk-internal:/home/bk/mysql-4.1/ · 5aa33086

unknown authored Jul 15, 2003

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_func.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

5aa33086