summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* bugs #701 and #783 - old .frm files were read in incorrectly in 4.1 (each ↵unknown2003-07-282-8/+7
| | | | field was assigned a charset, BLOBs were converted to TEXT)
* Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1unknown2003-07-285-11/+11
|\ | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_663/mysql-4.1 sql/sql_base.cc: Auto merged
| * changed for AUTO_VALUE_ON_ZEROunknown2003-07-285-11/+11
| | | | | | | | | | | | | | mysql-test/r/auto_increment.result: added test for AUTO_VALUE_ON_ZERO mysql-test/t/auto_increment.test: added test for AUTO_VALUE_ON_ZERO
* | 'mysqld --verbose' should not print help screenunknown2003-07-271-1/+1
| |
* | Merge bk-internal:/home/bk/mysql-4.1/unknown2003-07-277-21/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged
| * | now GRANT db.* ... compares patterns correctly to prevent privilege escalationunknown2003-07-227-21/+20
| | |
* | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-251-9/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into teton.kitebird.com:/home/paul/mysql-4.1
| * | | Bug#909: mysqld --verbose --help != mysqld --help --verboseunknown2003-07-251-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Proposed fix for bug#909
* | | | Print accounts in error messages as 'user'@'host' rather than 'user@host'.unknown2003-07-2423-115/+115
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latter is misleading because differs from the syntax used for GRANT/REVOKE. Fix up test result affected by error message edits. mysql-test/r/grant_cache.result: Fix up test result to match error message edit. sql/share/czech/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/danish/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/dutch/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/english/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/estonian/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/french/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/german/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/greek/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/hungarian/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/italian/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/japanese/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/korean/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/norwegian-ny/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/norwegian/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/polish/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/portuguese/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/romanian/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/russian/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/serbian/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/slovak/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/spanish/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/swedish/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/ukrainian/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE.
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-231-4/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-4.1-local BitKeeper/etc/logging_ok: auto-union
| * | | Fix security bug. mysqld server without ssl support was completly unknown2003-07-231-4/+10
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | ignorant about ssl_type attribute sql/sql_acl.cc: Now acl_getroot() honors ssl_type attribute even if we compile without openssl BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1unknown2003-07-232-0/+65
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1
| * | | On Feb 4th, 2003, Monty said he would push my patch to print replicate-do-tableunknown2003-07-232-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and other replicate-*-table options in SHOW SLAVE STATUS. Seems like it had not been done, so I push it now: there's 4 new columns to SHOW SLAVE STATUS. mysql-test/r/rpl000015.result: Result update (more columns) mysql-test/r/rpl_empty_master_crash.result: Result update (more columns) mysql-test/r/rpl_flush_log_loop.result: Result update (more columns) mysql-test/r/rpl_log.result: Result update (more columns) mysql-test/r/rpl_log_pos.result: Result update (more columns) mysql-test/r/rpl_redirect.result: Result update (more columns) mysql-test/r/rpl_replicate_do.result: Result update (more columns) mysql-test/r/rpl_rotate_logs.result: Result update (more columns) mysql-test/t/rpl_replicate_do.test: Result update (more columns) sql/slave.cc: Print replicate_*_table options in SHOW SLAVE STATUS sql/slave.h: two functions to make a string of replicate_*_table lists.
* | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-237-3/+19
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.2way
| * | | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1unknown2003-07-227-3/+19
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_663/mysql-4.1 sql/field_conv.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_insert.cc: Auto merged
| | * | fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump)unknown2003-07-227-3/+19
| | | |
* | | | SCRUM - adding client into embedded serverunknown2003-07-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error handling fixed fetch_lengths made to work differently in embedded and client cases include/mysql.h: removed 'embedded' error containers - they're unnecessary now added declarations for fetch_lengths to be 'virtual' include/sql_common.h: fetch_lengths declaration removed libmysql/libmysql.c: implementations for fetch_lengths to be 'virtual' added libmysqld/lib_sql.cc: error informations now is moved from thd->net to mysql-net libmysqld/libmysqld.c: error data is in mysql->net now sql-common/client.c: we have to return old fetch_lengths implementation for 'client' case sql/protocol.cc: handling of sqlstate for embedded library added
* | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-222-5/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.2way
| * | | gen_lex_hash sigsegv fixedunknown2003-07-211-2/+3
| | | |
| * | | undo one row warning instead use sql_warnings=1unknown2003-07-211-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_insert.cc: Undo warnings for single row inserts mysql-test/t/warnings.test: undo one row warning instead use sql_warnings=1 mysql-test/r/warnings.result: Fix result file
* | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-213-38/+16
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.2way
| * | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-1830-352/+305
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.2way
| * \ \ \ Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-156-119/+25
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.2way
| * | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-1529-59/+66
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.2way
| * \ \ \ \ Including client code into libmysqldunknown2003-07-143-38/+16
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merging include/mysql.h: Auto merged include/mysql_com.h: Auto merged libmysql/libmysql.c: Auto merged sql/protocol.cc: Auto merged sql/net_serv.cc: #ifndef was removed
| | * | | | | Some mistakes fixedunknown2003-07-141-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libmysql/libmysql.c: was removed by mistake during merging libmysqld/Makefile.am: link should be removed first libmysqld/libmysqld.c: We don't need this line here sql-common/pack.c: Function was moved to old place sql/sql_client.cc: we do need this function
| | * | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-084-37/+18
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.2way
| | | * \ \ \ \ Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-059-135/+118
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.2way
| | | * \ \ \ \ \ Resolving conflictsunknown2003-07-044-37/+18
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union client/mysqltest.c: Auto merged sql-common/client.c: Auto merged sql/protocol.cc: Auto merged sql/sql_client.cc: Auto merged include/mysql.h: Merging (prolly it's the mistake) libmysqld/libmysqld.c: This code seems to be unnecessary
| | | | * | | | | | SCRUMunknown2003-07-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Including client code into embedded library Code trimming (fixes of comments etc) include/mysql_com.h: Comment fixed include/mysql_embed.h: comment fixed include/violite.h: comment fixed libmysql/libmysql.c: #undef should work anyway libmysqld/libmysqld.c: comment fixed sql-common/client.c: #undef should work anyway sql/net_serv.cc: #undef should work anyway
| | | | * | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-06-1918-14/+262
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.2way BitKeeper/etc/logging_ok: auto-union
| | | | * | | | | | | SCRUMunknown2003-06-181-34/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | including client code into embedded server code to guess what library to use added net_field_length moved to pack.c include/mysql.h: typedefinitions moved for suitability mysql_option.methods_to_use added include/mysql_com.h: net_store_length declaration libmysql/libmysql.c: net_store_length moved to sql-common/pack.c libmysqld/libmysqld.c: added code to guess whether to use remote or embedded connection sql-common/client.c: options checking added sql-common/pack.c: net_store_length implementation moved here sql/protocol.cc: net_store_length moved to sql-common/pack.c
| | | | * | | | | | | Last part of resolving conflicts after pullunknown2003-06-182-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some intersections with Monty encountered libmysql/client_settings.h: We don't need the trick with macroses since Monty moved cli_mysql_use_result into sql-common/client.c libmysql/libmysql.c: mysql_use_result moved in sql-common/client.c sql-common/client.c: code simplified with the moving of mysql_use_result here sql/client_settings.h: we don't need this #define anymore sql/sql_client.cc: this function was moved to sql-common/pack.c by me i think the pack.c is the better place for it
| | | | * | | | | | | SCRUMunknown2003-06-1726-315/+535
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merged conflicts about my previous commit it seems there are some errors left - gonna check... BitKeeper/etc/logging_ok: auto-union client/mysqltest.c: Auto merged include/mysql_com.h: Auto merged include/sql_common.h: Auto merged include/mysql.h: conflicts merged libmysql/client_settings.h: conflicts merged libmysql/libmysql.c: conflicts merged sql-common/client.c: conflicts merged sql/client_settings.h: conflicts merged sql/protocol.cc: conflict merged
| | | | * | | | | | | | SCRUMunknown2003-06-173-25/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client capabilities included into libmysqld some API methods became "virtual" lots of duplicated code removed IMHO all the above made library's code way more pleasant to look at, didn't it? BitKeeper/deleted/.del-lib_vio.c~d779731a1e391220: Delete: libmysqld/lib_vio.c BitKeeper/etc/ignore: Added libmysqld/client.c libmysqld/client_settings.h libmysqld/libmysql.c libmysqld/pack.c to the ignore list client/mysqltest.c: we don't need this now include/mysql.h: MYSQL and related structures unified four methods made "virtual" relative wrappers added include/mysql_com.h: todo added include/mysql_embed.h: now we include implementations of Vio structure in libmysqld include/sql_common.h: declarations changed include/violite.h: implementation of Vio included in libmysqld libmysql/client_settings.h: changes to make this working with both client and embedded libmysql/libmysql.c: global variables and my_net_local_init moved to sql-common/pack.c libmysqld/Makefile.am: libmysql.c, client.c, pack.c symlinked and added to sources lib_vio.c removed libmysqld/examples/Makefile.am: now we need CLIENT_LIBS here libmysqld/lib_sql.cc: code duplications removed emb_advanced_command was made from simple_command libmysqld/libmysqld.c: duplicated code removed sql-common/client.c: code trimmed with new model of calling sql-common/pack.c: some code moved here from libmysql.c and protocol.cc sql/client_settings.h: we don't need mysql_use_result for mini_client sql/net_serv.cc: file included in embedded server sql/protocol.cc: code moved to sql-common/pack.c
* | | | | | | | | | | | Enable warnings by default for single value list inserts also when the ↵unknown2003-07-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client protocol is >= 4.1 tests/client_test.c: test for timestamp bug (BR #819) sql/sql_insert.cc: Enable warnings by default for single value list protocol mysql-test/t/warnings.test: Updated test for single value list insert warning mysql-test/r/warnings.result: Updated warnings results
* | | | | | | | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
| * | | | | | | | | | | | errmsg.txt:unknown2003-07-191-1/+1
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix typo sql/share/english/errmsg.txt: fix typo
* | | | | | | | | | | | bug #715: SELECT YEAR+0 FROM foobar is parsed as 'SELECT' 'YEAR' '+0' => ↵unknown2003-07-204-37/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | syntax error mysql-test/r/bigint.result: test results updated mysql-test/r/type_decimal.result: test results updated mysql-test/t/bigint.test: new tests added mysql-test/t/type_decimal.test: error numbers updated sql/item.h: round(9999999999999999999) fixed sql/sql_yacc.yy: bug #715: SELECT YEAR+0 FROM foobar is parsed as 'SELECT' 'YEAR' '+0' => syntax error unary '+' added
* | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1/unknown2003-07-1832-406/+315
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 sql/item_func.h: Auto merged sql/sql_yacc.yy: Auto merged
| * | | | | | | | | | | All functions now use the same function to aggregate comparisonunknown2003-07-181-48/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-182-3/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | CASE optimizationunknown2003-07-181-28/+30
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Some fixes in CASE.unknown2003-07-181-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test suit was extended to conver various arguments mixes.
| * | | | | | | | | | | | CASE now aggregates all argument types instead of using the only one argumentunknown2003-07-172-10/+53
| | | | | | | | | | | | |
| * | | | | | | | | | | | CASE stores first_expr and else_expr in args[] array now.unknown2003-07-174-108/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allowed to reuse a lot of code.
| * | | | | | | | | | | | Error message consistency edits + updates to affected test results.unknown2003-07-1620-57/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.