Commits · b5e85696741e02ab33432bdec254edd802839fa1 · Kirill Smelkov / mariadb

06 Aug, 2003 1 commit

unknown authored Aug 06, 2003

  Code clean-up
sql_union.cc, union.test, union.result:
  A fix for a bug #978.
  This enables that NULL's can be entered into UNION's result set,
  although first SELECT columns are NOT NULL.
  This is also a start of fixing UNION's properly regarding type
  acceptance.
sql_select.cc:
  A commit for my second July SPRINT task


mysql-test/r/union.result:
  A fix for a bug #978.
  
  This enables that NULL's can be entered into UNION's result set,
  although first SELECT columns are NOT NULL.
  
  This is also a start of fixing UNION's properly regarding type
  acceptance.
mysql-test/t/union.test:
  A fix for a bug #978.
  
  This enables that NULL's can be entered into UNION's result set,
  although first SELECT columns are NOT NULL.
  
  This is also a start of fixing UNION's properly regarding type
  acceptance.
sql/sql_select.cc:
  Code clean-up
sql/sql_union.cc:
  Code clean-up

b5e85696

19 Jul, 2003 1 commit

Merge · 5dadac87

unknown authored Jul 19, 2003


mysql-test/r/innodb.result:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/table.h:
  Auto merged

5dadac87

18 Jul, 2003 7 commits
- 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 3 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
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 11 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

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 rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 42eb7b3f
unknown authored Jul 15, 2003
```
into mysql.r18.ru:/usr/home/ram/work/4.1
```
42eb7b3f
bugfix for the bugfix for the bug #539 · 79f26f7e
unknown authored Jul 15, 2003

79f26f7e
Item_func_field doesn't have a separate Item to store the first argument. · 4b3eecf4
unknown authored Jul 15, 2003
```
It's now passed as args[0]. This fix allowed to resuse a lot of code.
```
4b3eecf4
mysql should ignore ' " ` symbols inside comments (Bug #539). · 54fe4c54
unknown authored Jul 15, 2003

54fe4c54
Fix bug: mysqld crashes on func_sapdb test. · a1f92f0d
unknown authored Jul 15, 2003

a1f92f0d
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5308a077
unknown authored Jul 15, 2003
```
into mysql.r18.ru:/usr/home/ram/work/4.1
```
5308a077

14 Jul, 2003 5 commits
- Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · b9818a38
  unknown authored Jul 14, 2003
```
into teton.kitebird.com:/home/paul/mysql-4.1
```
  b9818a38
- Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1 · 837fc104
  unknown authored Jul 14, 2003
```
into myvenu.com:/home/venu/work/sql/dev-4.1
```
  837fc104
- COALESCE now aggregates its argument types in this way: · 6b001731
  unknown authored Jul 14, 2003
```
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 
```
  6b001731
- A test for character conversion in ALTER TABLE was added · e7360f49
  unknown authored Jul 14, 2003
  
  e7360f49
- Fix for the bug #841: wrong number of warnings · 350f2003
  unknown authored Jul 14, 2003
  
  350f2003
13 Jul, 2003 3 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · f1e3a929
  unknown authored Jul 14, 2003
```
into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
```
  f1e3a929
- Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1 · 04652795
  unknown authored Jul 13, 2003
```
into myvenu.com:/home/venu/work/sql/dev-4.1


sql/item_strfunc.cc:
  Auto merged
```
  04652795
- Removed unreferenced local variable · 768ab1e4
  unknown authored Jul 13, 2003
  
  768ab1e4