Commits · 85cc1227942783a381d56490960d25774d4c6516 · Kirill Smelkov / mariadb

17 Jul, 2003 2 commits
- 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
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
12 Jul, 2003 3 commits

Added SHOW MASTER LOGS as synonym for SHOW BINARY LOGS. · 19a4a84d

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.

19a4a84d

Merge · 2bc79e08
unknown authored Jul 11, 2003

2bc79e08

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

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

a5ce6a49

11 Jul, 2003 2 commits

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

field_conv.cc: · d1d636de

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.

d1d636de

10 Jul, 2003 2 commits

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

- Updated error message tests in several results of the test suite after · 1846a9eb

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

1846a9eb

09 Jul, 2003 2 commits
- Error message style consistency edits. · 8ad04725
  unknown authored Jul 09, 2003
  
  8ad04725
- comment clarified · 63779073
  unknown authored Jul 09, 2003
  
  63779073
08 Jul, 2003 7 commits

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 531a5d76

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

531a5d76

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

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 0e1d651e

unknown authored Jul 08, 2003

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


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

0e1d651e

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · fa936cb6
unknown authored Jul 08, 2003
```
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC


sql/mysql_priv.h:
  Auto merged
```
fa936cb6
SAPDB date/time finctions · 4adf1804
unknown authored Jul 08, 2003
```
mysql-test/r/cast.result:
  Changes for SAPDB date/time finctions
```
4adf1804
Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1 · c11b418d
unknown authored Jul 08, 2003
```
into myvenu.com:/home/venu/work/sql/dev-4.1
```
c11b418d

implementation of mysql_stmt_reset client end · 6a2e7122

unknown authored Jul 08, 2003


include/mysql.h:
  add mysql_stmt_reset prototype
include/mysql_com.h:
  add COM_STMT_RESET
libmysql/libmysql.def:
  Add mysql_stmt_reset def
sql/sql_prepare.cc:
  Fix selects hang after windows slowdown issue fix (send_fields)
sql/sql_parse.cc:
  Add COM_STMT_RESET
sql/mysql_priv.h:
  add defination of mysql_stmt_reset

6a2e7122