summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge oak.local:/home/kostja/mysql/mysql-4.1-rootunknown2003-07-1856-1527/+1359
|\ | | | | | | | | | | | | | | into oak.local:/home/kostja/mysql/mysql-4.1 sql/mysqld.cc: Auto merged
| * Merge oak.local:/home/kostja/mysql/mysql-4.1-rootunknown2003-07-1856-1527/+1359
| |\ | | | | | | | | | | | | | | | | | | into oak.local:/home/kostja/mysql/mysql-4.1
| | * Merge oak.local:/home/kostja/mysql/mysql-4.1-rootunknown2003-07-1756-1527/+1359
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * resolved conflict with pulled changesetunknown2003-07-0956-1527/+1359
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/mysql.h: Auto merged include/mysql_com.h: Auto merged libmysql/libmysql.c: Auto merged sql/item_create.cc: Auto merged sql/item_create.h: Auto merged sql/lex.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged include/mysqld_error.h: manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT sql/set_var.h: manually resolved conflict sql/share/czech/errmsg.txt: manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT sql/share/danish/errmsg.txt: manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT sql/share/dutch/errmsg.txt: manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT sql/share/english/errmsg.txt: manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT sql/share/estonian/errmsg.txt: manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT sql/share/french/errmsg.txt: manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT sql/share/german/errmsg.txt: manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT sql/share/greek/errmsg.txt: manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT sql/share/hungarian/errmsg.txt: manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT sql/share/italian/errmsg.txt: manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT sql/share/japanese/errmsg.txt: manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT sql/share/korean/errmsg.txt: manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT sql/share/norwegian-ny/errmsg.txt: manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT sql/share/norwegian/errmsg.txt: manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT sql/share/polish/errmsg.txt: manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT sql/share/portuguese/errmsg.txt: manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT sql/share/romanian/errmsg.txt: manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT sql/share/russian/errmsg.txt: manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT sql/share/serbian/errmsg.txt: manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT sql/share/slovak/errmsg.txt: manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT sql/share/spanish/errmsg.txt: manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT sql/share/swedish/errmsg.txt: manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT sql/share/ukrainian/errmsg.txt: manually resolved conflict with ER_VARIABLE_IS_NOT_STRUCT
| | | | * Merge oak.local:/home/kostja/mysql/mysql-4.1-rootunknown2003-07-0856-1527/+1357
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into oak.local:/home/kostja/mysql/mysql-4.1 scripts/mysql_create_system_tables.sh: Auto merged sql/item_strfunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged
| | | | | * Preliminary support for options --secure-auth, unknown2003-07-0842-125/+264
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --old-passwords Support for option --old-protocol was removed. Some test performed. Tests for SSL and replication are pending. More strict following to specification for --old-passwords is in the TODO. include/mysql_com.h: support for 3.20 passwords removed from scramble_323 include/mysqld_error.h: added error code for --secure-auth mode libmysql/libmysql.c: removed support for 3.20 password and protocol version 9 mysql-test/r/connect.result: added check for new syntax of set password mysql-test/r/func_crypt.result: tests for two-argument of password() were removed. Instead added tests for cooperation of password() and old_passwords session/global variable, passwords() and spaces in argument string mysql-test/t/connect.test: added check for new syntax of set password mysql-test/t/func_crypt.test: tests for two-argument of password() were removed. Instead added tests for cooperation of password() and old_passwords session/global variable, passwords() and spaces in argument string sql-common/client.c: removed support for 3.20 servers and protocol version 9 sql/item_strfunc.h: fixed comment sql/mysql_priv.h: added declarartion for option opt_secure_auth sql/mysqld.cc: added option opt_secure_auth option old-password placed according to sort order sql/password.c: removed support for 3.20 clients and old scrambles sql/set_var.cc: added system variable 'secure_auth' added system/thread variable 'old_passwords' sql/set_var.h: sys_old_passwords needs to be exported because sys_old_passwords.after_update is used in sql_acl.cc sql/sql_acl.cc: support for 3.20 passwords removed now acl_init honors options works properly with options/variables --secure-auth and --old-passwords sql/sql_acl.h: support for 3.20 clients removed sql/sql_class.h: added system/thread variable old_passwords sql/sql_parse.cc: support for 3.20 clients removed now check_user takes into account option secure_auth sql/sql_yacc.yy: global variable use_old_passwords replaced with thread-specific variable old_passwords sql/share/czech/errmsg.txt: error message for --secure-auth added (as suggested by Paul) sql/share/danish/errmsg.txt: error message for --secure-auth added (as suggested by Paul) sql/share/dutch/errmsg.txt: error message for --secure-auth added (as suggested by Paul) sql/share/english/errmsg.txt: error message for --secure-auth added (as suggested by Paul) sql/share/estonian/errmsg.txt: error message for --secure-auth added (as suggested by Paul) sql/share/french/errmsg.txt: error message for --secure-auth added (as suggested by Paul) sql/share/german/errmsg.txt: error message for --secure-auth added (as suggested by Paul) sql/share/greek/errmsg.txt: error message for --secure-auth added (as suggested by Paul) sql/share/hungarian/errmsg.txt: error message for --secure-auth added (as suggested by Paul) sql/share/italian/errmsg.txt: error message for --secure-auth added (as suggested by Paul) sql/share/japanese/errmsg.txt: error message for --secure-auth added (as suggested by Paul) sql/share/korean/errmsg.txt: error message for --secure-auth added (as suggested by Paul) sql/share/norwegian-ny/errmsg.txt: error message for --secure-auth added (as suggested by Paul) sql/share/norwegian/errmsg.txt: error message for --secure-auth added (as suggested by Paul) sql/share/polish/errmsg.txt: error message for --secure-auth added (as suggested by Paul) sql/share/portuguese/errmsg.txt: error message for --secure-auth added (as suggested by Paul) sql/share/romanian/errmsg.txt: error message for --secure-auth added (as suggested by Paul) sql/share/russian/errmsg.txt: error message for --secure-auth added (as suggested by Paul) sql/share/serbian/errmsg.txt: error message for --secure-auth added (as suggested by Paul) sql/share/slovak/errmsg.txt: error message for --secure-auth added (as suggested by Paul) sql/share/spanish/errmsg.txt: error message for --secure-auth added (as suggested by Paul) sql/share/swedish/errmsg.txt: error message for --secure-auth added (as suggested by Paul) sql/share/ukrainian/errmsg.txt: error message for --secure-auth added (as suggested by Paul)
| | | | | * Bug fixes for authenticationunknown2003-07-0413-191/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OLD_PASSWORD made a keyword to allow set password=old_password('abc') constructions. BitKeeper/etc/ignore: Added BitKeeper/post-commit BitKeeper/post-commit-manual build_tags.sh tests/connect_test BUILD/compile-pentium-maintainer to the ignore list include/mysql_com.h: scramble return type changed to void as now it's not used libmysql/libmysql.c: fixed bug with with failed authentification when scramble contained zero byte sql-common/client.c: applied patch from Lycos team fixed bug with scramble containing zero byte sql/item_create.cc: removed create_func_old_password, create_func_password as they are not used any more sql/item_create.h: removed create_func_old_password, create_func_password as they are not used any more sql/item_strfunc.cc: Added alloc() function to Item_func_password, Item_func_old_password, which is used in sql_yacc.yy sql/item_strfunc.h: Added alloc() function to Item_func_password, Item_func_old_password, which is used in sql_yacc.yy sql/lex.h: OLD_PASSWORD now is keyword, to allow statements like set password=old_password('abc') sql/password.c: fixed scramble return value trailing zero now is not written sql/sql_acl.cc: incorporated patch from Lycos team 41 replaced with constant acl_getroot rewritten to support ER_AUTH_... error sql/sql_parse.cc: authenticate merged with check_user check_user return values reversed, support for ER_AUTH in check_user.added sql/sql_yacc.yy: OLD_PASSWORD now is keyword, to allow statements like set password=old_password('abc')
| | | | | * First version of new authentification procedure: now authentification is ↵unknown2003-07-0123-1457/+1138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | one-stage (instead of two-stage in 4.1) For now following tasks have been done: - PASSWORD() function was rewritten. PASSWORD() now returns SHA1 hash_stage2; for new passwords user.password contains '*'hash_stage2; sql_yacc.yy also fixed; - password.c: new functions were implemented, old rolled back to 4.0 state - server code was rewritten to use new authorization algorithm (check_user(), change user, and other stuff in sql/sql_parse.cc) - client code was rewritten to use new authorization algorithm (mysql_real_connect, myslq_authenticate in sql-common/client.c) - now server barks on 45-byte-length 4.1.0 passwords and refuses 4.1.0-style authentification. Users with 4.1.0 passwords are blocked (sql/sql_acl.cc) - mysqladmin.c was fixed to work correctly with new passwords Tests for 4.0-4.1.1, 4.1.1-4.1.1 (with or without db/password) logons was performed; mysqladmin also was tested. Additional check are nevertheless necessary. BitKeeper/etc/ignore: Added start_mysqld.sh mysys/main.cc to the ignore list client/mysqladmin.c: fixed with new password api include/mysql.h: So as scramble_323 accepts only null-terminated message, two scramble buffs are necessary. gotta be fixed include/mysql_com.h: new constants and password.c api changes libmysql/libmysql.c: mysql_change_user rewritten to work with new password api scripts/mysql_create_system_tables.sh: fixed 'Password' column length to 41 scripts/mysql_fix_privilege_tables.sql: fixed 'Password' column length to 41 sql-common/client.c: mysql_real_connect rewritten to support new handshake procedure sql/item_strfunc.cc: Item_func_password and Item_func_old_password rewritten with new password api sql/item_strfunc.h: bit commented, numbers replaced with #defined constants sql/mysql_priv.h: removed unnecessary declaration as now all constants defined is in mysql_com.h sql/mysqld.cc: scramble initialization moved to sql_parce.cc:check_connection sql/password.c: All 4.1 functions were rolled back to 4.0 with attempt to save all possible 4.0-4.1 changes. Names for 4.0 functions were suffixed with '_323' Functions for new handshake were added. sql/slave.cc: Fixed to new constant; Bug #766 remains to be fixed sql/slave.h: fixed to new constant; Buf #766 remains to be fixed sql/sql_acl.cc: rewritten to support new passwords (41 byte-long) and password api sql/sql_acl.h: ditto sql/sql_class.cc: initialization for new members added sql/sql_class.h: same thing as in struct mysql - scramble is used for new family of functions, scramble_323 - for old sql/sql_parse.cc: check_connections was renamed to check_connection as this name reflects better what this function does authorization part of check_connection was rewritten check_user was rewritten with new password and acl api new function 'authenticate', which optionally re-request scramble from client was added fixed some typos COM_CHANGE_USER piece of dipsatch_command() was rewritten sql/sql_repl.h: HASH_PASSWORD_LENGTH replaced with SCRAMBLED_PASSWORD_CHAR_LENGTH bug #766 remains sql/sql_yacc.yy: Two-argument form of PASSWORD() was removed PASSWORD() function was fixed with new password api. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | | | All functions now use the same function to aggregate comparisonunknown2003-07-182-49/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and result types
* | | | | | Merge abarkov@build.mysql.com:/home/bk/mysql-4.1unknown2003-07-181-3/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
| * \ \ \ \ \ Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-181-3/+17
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC
| | * | | | | | Scrum task 425: Added --verbose option for --helpunknown2003-07-181-3/+17
| | | |_|/ / / | | |/| | | |
* | | | | | | IN now aggregates all argument types for comparisonunknown2003-07-184-3/+34
| | | | | | |
* | | | | | | CASE optimizationunknown2003-07-181-28/+30
|/ / / / / /
* | | | | | Some fixes in CASE.unknown2003-07-183-6/+84
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test suit was extended to conver various arguments mixes.
* | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-176-113/+94
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ice.snake.net:/Users/paul/mysql-4.1
| * | | | | CASE now aggregates all argument types instead of using the only one argumentunknown2003-07-172-10/+53
| | | | | |
| * | | | | Merge abarkov@build.mysql.com:/home/bk/mysql-4.1unknown2003-07-171-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
| | * \ \ \ \ Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-171-1/+1
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
| | | * | | | fixed bug with location of mysql_create_sytem_tablesunknown2003-07-171-1/+1
| | | | | | |
| * | | | | | CASE stores first_expr and else_expr in args[] array now.unknown2003-07-174-108/+46
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allowed to reuse a lot of code.
| * | | | | Merge abarkov@build.mysql.com:/home/bk/mysql-4.1unknown2003-07-171-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
| | * | | | | ctype-utf8.c:unknown2003-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stupid bug fix strings/ctype-utf8.c: Stupid bug fix
* | | | | | | Fix openssl_2 test so it passes or fails. (It was being reportedunknown2003-07-164-4/+27
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.)
* | | | | | Error message consistency edits + updates to affected test results.unknown2003-07-1623-60/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-168-87/+100
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ice.snake.net:/Users/paul/mysql-4.1
| * | | | | Item_func_null doesn't have a separate Item for the first argument anymore.unknown2003-07-168-87/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | args[0] is used instead. This allowed to resuse a lot of code.
* | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-1521-47/+47
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ice.snake.net:/Users/paul/mysql-4.1
| * | | | | Modifications to error messages, and affected test results.unknown2003-07-1521-47/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Update openssl_1 test.unknown2003-07-152-4/+6
| |/ / / / |/| | | |
* | | | | Merge abarkov@build.mysql.com:/home/bk/mysql-4.1unknown2003-07-155-58/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
| * | | | | ELT passes the first argument in args[0] instead of having a separate Item.unknown2003-07-155-58/+14
| | | | | |
* | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-151-5/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.r18.ru:/usr/home/ram/work/4.1
| * | | | | bugfix for the bugfix for the bug #539unknown2003-07-151-5/+4
| | | | | |
* | | | | | Item_func_field doesn't have a separate Item to store the first argument.unknown2003-07-155-68/+18
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's now passed as args[0]. This fix allowed to resuse a lot of code.
* | | | | mysql should ignore ' " ` symbols inside comments (Bug #539).unknown2003-07-151-6/+8
| | | | |
* | | | | Fix bug: mysqld crashes on func_sapdb test.unknown2003-07-151-1/+1
| | | | |
* | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-154-18/+17
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | into mysql.r18.ru:/usr/home/ram/work/4.1
| * | | | Fix for the bug #841: wrong number of warningsunknown2003-07-144-18/+17
| | | | |
* | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-1422-40/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into teton.kitebird.com:/home/paul/mysql-4.1
| * \ \ \ \ Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-105-10/+10
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into teton.kitebird.com:/home/paul/mysql-4.1
| * | | | | Error message style consistency edits.unknown2003-07-0922-40/+40
| | |/ / / | |/| | |
* | | | | Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-144-1/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into myvenu.com:/home/venu/work/sql/dev-4.1
| * \ \ \ \ Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-134-6/+18
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into myvenu.com:/home/venu/work/sql/dev-4.1 sql/item_strfunc.cc: Auto merged
| * \ \ \ \ \ Mergeunknown2003-07-114-1/+35
| |\ \ \ \ \ \
| | * | | | | | Add the support of 'SUBSTR' function compatible with Oracle and SAPDB (SCRUM ↵unknown2003-07-114-1/+35
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #872) 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
* | | | | | | COALESCE now aggregates its argument types in this way:unknown2003-07-143-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | A test for character conversion in ALTER TABLE was addedunknown2003-07-142-0/+66
| | | | | | |
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-144-6/+18
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
| * | | | | | Removed unreferenced local variableunknown2003-07-131-1/+0
| | | | | | |