Commits · 2fa2ab70470251f242b33287468a22319057bc6b · nexedi / MariaDB

18 Jul, 2003 11 commits

unknown authored Jul 18, 2003


include/mysql.h:
  fixed compile-time bug
sql/sql_class.cc:
  fixed compile-time bug
sql/sql_class.h:
  fixed compile-time bug

2fa2ab70

Style fixes, comments for 4.1.1 authorization · a4b15d53

unknown authored Jul 18, 2003

Now special 1-byte packet is used for request of old password
Fixed bug with --skip-grant-tables and acl_getroot


include/mysql.h:
  removed scramble_323 member as now scramble_323 function does not count
  on trailing zero for scramble
include/mysql_com.h:
  updated declarations
libmysql/libmysql.c:
  now server sends special 1-byte packet instead of old scramble
  to re-request password.
  mysql->scramble_323 replaced with mysql->scramble
sql-common/client.c:
  now server sends special 1-byte packet instead of old scramble
  to re-request password.
  mysql->scramble_323 replaces with mysql->scramble
sql/password.c:
  comments beautified
  hash_password now accepts password length
sql/protocol.cc:
  added send_old_password_request function
sql/protocol.h:
  added send_old_password_request function
sql/sql_acl.cc:
  style fixes, bug with --skip-grant-tables and acl_getroot
  fixed
sql/sql_class.h:
  thd->scramble_323 removed as now
  old functions accept not null-terminated scrambles
sql/sql_crypt.cc:
  fixed with new hash_password proto
sql/sql_parse.cc:
  style fixes
  few comments added

a4b15d53

Merge oak.local:/home/kostja/mysql/mysql-4.1-root · c8c99b52
unknown authored Jul 18, 2003
```
into oak.local:/home/kostja/mysql/mysql-4.1


sql/mysqld.cc:
  Auto merged
```
c8c99b52
All functions now use the same function to aggregate comparison · a6430911
unknown authored Jul 18, 2003
```
and result types
```
a6430911
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · 4779a706
unknown authored Jul 18, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
4779a706
IN now aggregates all argument types for comparison · 2255c3d7
unknown authored Jul 18, 2003

2255c3d7
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 75d58cfd
unknown authored Jul 18, 2003
```
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC
```
75d58cfd
Scrum task 425: Added --verbose option for --help · a00836dd
unknown authored Jul 18, 2003

a00836dd
CASE optimization · 63bc7d35
unknown authored Jul 18, 2003

63bc7d35
Merge oak.local:/home/kostja/mysql/mysql-4.1-root · b0bdbafd
unknown authored Jul 18, 2003
```
into oak.local:/home/kostja/mysql/mysql-4.1
```
b0bdbafd
Some fixes in CASE. · 94a7953a
unknown authored Jul 18, 2003
```
Test suit was extended to conver various arguments mixes.
```
94a7953a

17 Jul, 2003 10 commits

Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 248929dc
unknown authored Jul 17, 2003
```
into ice.snake.net:/Users/paul/mysql-4.1
```
248929dc
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 oak.local:/home/kostja/mysql/mysql-4.1-root · 98181bf6

unknown authored Jul 17, 2003

into oak.local:/home/kostja/mysql/mysql-4.1


sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/lex.h:
  Auto merged
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/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/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/russian/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
sql/share/ukrainian/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

98181bf6

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

Fix openssl_2 test so it passes or fails. (It was being reported · 292858fa

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.)

292858fa

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