Commits · d5ce99e14915851e3227b94de3eddc152ae3210a · nexedi / MariaDB

17 Jul, 2003 7 commits
- CASE now aggregates all argument types instead of using the only one argument · d5ce99e1
  unknown authored Jul 17, 2003
  
  d5ce99e1
- Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · e1b96bd9
  unknown authored Jul 17, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
  e1b96bd9
- Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 42250468
  unknown authored Jul 17, 2003
```
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
```
  42250468
- fixed bug with location of mysql_create_sytem_tables · 2452519b
  unknown authored Jul 17, 2003
  
  2452519b
- CASE stores first_expr and else_expr in args[] array now. · 55406033
  unknown authored Jul 17, 2003
```
This allowed to reuse a lot of code. 
```
  55406033
- Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · d5686633
  unknown authored Jul 17, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
  d5686633
- ctype-utf8.c: · 16b662ee
  unknown authored Jul 17, 2003
```
  Stupid bug fix


strings/ctype-utf8.c:
  Stupid bug fix
```
  16b662ee
16 Jul, 2003 3 commits

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

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.

b2c5e0ff

Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9352bf87
unknown authored Jul 16, 2003
```
into ice.snake.net:/Users/paul/mysql-4.1
```
9352bf87
Item_func_null doesn't have a separate Item for the first argument anymore. · 225d0c9d
unknown authored Jul 16, 2003
```
args[0] is used instead. This allowed to resuse a lot of code.
```
225d0c9d

15 Jul, 2003 11 commits

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

d7d75cfb

Modifications to error messages, and affected test results. · 7522e99f

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.

7522e99f

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

71bad0b3
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 360b4b98
unknown authored Jul 15, 2003
```
into mysql.r18.ru:/usr/home/ram/work/4.1
```
360b4b98
bugfix for the bugfix for the bug #539 · 2f01bfaa
unknown authored Jul 15, 2003

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

f97f8b1d
Fix bug: mysqld crashes on func_sapdb test. · 22a77b14
unknown authored Jul 15, 2003

22a77b14
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 51df2b5e
unknown authored Jul 15, 2003
```
into mysql.r18.ru:/usr/home/ram/work/4.1
```
51df2b5e

14 Jul, 2003 5 commits
- Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0259ba5d
  unknown authored Jul 14, 2003
```
into teton.kitebird.com:/home/paul/mysql-4.1
```
  0259ba5d
- Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1 · bdc7892c
  unknown authored Jul 14, 2003
```
into myvenu.com:/home/venu/work/sql/dev-4.1
```
  bdc7892c
- COALESCE now aggregates its argument types in this way: · dce04ce1
  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 
```
  dce04ce1
- A test for character conversion in ALTER TABLE was added · 6b84badc
  unknown authored Jul 14, 2003
  
  6b84badc
- Fix for the bug #841: wrong number of warnings · 44c8ea6d
  unknown authored Jul 14, 2003
  
  44c8ea6d
13 Jul, 2003 3 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · b38f212f
  unknown authored Jul 14, 2003
```
into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
```
  b38f212f
- Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0a822e98
  unknown authored Jul 13, 2003
```
into myvenu.com:/home/venu/work/sql/dev-4.1


sql/item_strfunc.cc:
  Auto merged
```
  0a822e98
- Removed unreferenced local variable · 2e617d27
  unknown authored Jul 13, 2003
  
  2e617d27
12 Jul, 2003 3 commits

Added SHOW MASTER LOGS as synonym for SHOW BINARY LOGS. · 16ccd69d

unknown authored Jul 12, 2003

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.

16ccd69d

Merge · 28af4e44
unknown authored Jul 11, 2003

28af4e44

Add the support of 'SUBSTR' function compatible with Oracle and SAPDB (SCRUM #872) · 9fadadd3

unknown authored Jul 11, 2003


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

9fadadd3

11 Jul, 2003 2 commits

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 14e70d74
unknown authored Jul 11, 2003
```
into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
```
14e70d74

field_conv.cc: · f5666ffa

unknown authored Jul 11, 2003

  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.

f5666ffa

10 Jul, 2003 2 commits

Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5d89fea9
unknown authored Jul 10, 2003
```
into teton.kitebird.com:/home/paul/mysql-4.1
```
5d89fea9

- Updated error message tests in several results of the test suite after · 95a58fc7

unknown authored Jul 10, 2003

   the server error messages had been modified in errmsg.txt


mysql-test/r/create.result:
   - Updated error message in result after errmsg.txt has been modified
mysql-test/r/drop.result:
   - Updated error message in result after errmsg.txt has been modified
mysql-test/r/rpl000009.result:
   - Updated error message in result after errmsg.txt has been modified
mysql-test/r/symlink.result:
   - Updated error message in result after errmsg.txt has been modified
mysql-test/r/warnings.result:
   - Updated error message in result after errmsg.txt has been modified

95a58fc7

09 Jul, 2003 2 commits
- Error message style consistency edits. · 48d24ec0
  unknown authored Jul 09, 2003
  
  48d24ec0
- comment clarified · 4b4d00eb
  unknown authored Jul 09, 2003
  
  4b4d00eb
08 Jul, 2003 2 commits

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 1a1cc337

unknown authored Jul 08, 2003

into mashka.mysql.fi:/home/my/mysql-4.1


sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged

1a1cc337

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