summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* SCRUMunknown2003-09-191-5/+0
| | | | | | | | | | | | | | | | | | | | prepared statements in embedded library. some fixes after testing include/mysql.h: virtual method added libmysql/client_settings.h: declaration added libmysql/libmysql.c: implementation added mysql_fetch changed to work in both libraries libmysqld/lib_sql.cc: implementation added sql-common/client.c: added items in methods table sql/client_settings.h: decided to remove such defines - i placed single #ifdef in client.c
* SCRUMunknown2003-09-185-23/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | embedded library some dirty places cleaned: uint removed from mysql.h as Miguel suggested empty_string renamed as my_empty_string to get rid of name's intersections using embedded library include/mysql.h: uint -> unsigned int include/mysql_com.h: this caused warnings when not in expression libmysqld/lib_sql.cc: uint -> unsigned int sql-common/client.c: uint -> unsigned int sql/item_strfunc.cc: empty_string -> my_empty_string sql/mysql_priv.h: empty_string -> my_empty_string sql/set_var.cc: empty_string -> my_empty_string sql/sql_class.cc: empty_string -> my_empty_string sql/sql_prepare.cc: net_flush ifdef-ed
* Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-09-182-10/+26
|\ | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
| * Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-09-172-10/+26
| |\ | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1 sql/sql_parse.cc: Auto merged
| | * fixed proccesing global LIMIT in last SELECT of UNIONunknown2003-09-142-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/subselect.result: correct results mysql-test/r/union.result: correct results mysql-test/t/subselect.test: to be sure that results are correct sql/sql_parse.cc: comment + TODO
* | | SCRUMunknown2003-09-183-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prepared statements in embedded library include/mysql_com.h: to make net_flush() working in expressions libmysqld/lib_sql.cc: some bugs fixed libmysqld/libmysqld.c: we already have the define in client_settings.h sql/protocol.cc: net_store_data should work that way in Protocol_prep (embedded server) sql/protocol.h: definition for net_store_data sql/sql_prepare.cc: now it works in embedded library
* | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-09-172-1/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.stmt
| * | Charset number is now stored into error.sys by comp_err and loaded by mysqld.unknown2003-09-172-1/+12
| | |
* | | SCRUM:unknown2003-09-176-6/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prepared statements in embedded library include/mysql.h: Another 'virtual' method libmysql/client_settings.h: client implementation declared libmysql/libmysql.c: mysql_execute edited to work with embedded implementation libmysqld/lib_sql.cc: one error fixed (we do need parameter's buffer in embedded library) embedded recordset transfer methods implementations added sql-common/client.c: method added to the table sql/client_settings.h: no prepared statements in mimiclient sql/mysql_priv.h: these functions became global sql/protocol.cc: the stub added sql/protocol.h: had to change Protocol's interface for embedded library sql/sql_class.h: i changed this only for embedded case, but i think it's better to do the same for remote server also sql/sql_prepare.cc: parts of code #ifndef-ed
* | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-09-173-3/+16
|\ \ \ | |/ / |/| | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.stmt
| * | SCRUMunknown2003-09-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prepared statements in embedded library include/mysql.h: stmt_execute 'virtual' method added include/sql_common.h: two functions became global libmysql/client_settings.h: declaration for cli_stmt_execute libmysql/libmysql.c: some functions changed to be usable from embedded library libmysqld/lib_sql.cc: code for embedded stmt_execute added sql-common/client.c: cli_stmt_execute added to the methods table sql/client_settings.h: no need for prepared statements in miniclient
| * | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-09-163-3/+15
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.stmt
| | * \ Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-09-163-3/+15
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.stmt sql/sql_class.h: Auto merged
| | | * | SCRUMunknown2003-09-162-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepared statements in embedded server Several changes in library code with two goals: to make mysql_prepare_stmt working in embedded server to get rid of #define mysql_interface_func mysql->methods->interface_func in user's interface include/mysql.h: modifications of interface two goals: to implement prepared statements and to get rid of #define mysql_proc (mysql->smth) in interface include/sql_common.h: read_rows function got 'virtual' libmysql/client_settings.h: interface of some functions declared in client.c moved here libmysql/libmysql.c: several functions changed with declared goals libmysqld/embedded_priv.h: libmysqld.c <--> lib_sql.cc interface moved here libmysqld/lib_sql.cc: all embedded 'virtual' functions moved here so they can be static libmysqld/libmysqld.c: embedded 'virtual' function was moved out of here sql-common/client.c: several changes with the declared goal sql/sql_class.h: place to store statement data added to THD sql/sql_prepare.cc: storing of prepare_statement result for embedded server added
| | | * | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-09-122-3/+11
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.stmt include/mysql.h: Auto merged libmysql/libmysql.c: Auto merged libmysqld/libmysqld.c: Auto merged
| | | | * | SCRUM:unknown2003-09-122-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #977 Prepared statements in embedded library include/mysql.h: read_prepare_result function moved to 'virtual' libmysql/client_settings.h: declare proper function for libmysql libmysql/libmysql.c: some code moved from implementation of read_prepare_result to mysql_prepare_result to make creating separate (remote and embedded-server) versions easier libmysqld/libmysqld.c: emb_read_prepare_result prototype sql-common/client.c: cli_read_prepare_result added to the client_methods sql/client_settings.h: we don't need prepared statements in mini_client sql/sql_prepare.cc: embedded send_prep_stmt added
* | | | | | Preparing to support character set in error messagesunknown2003-09-1723-0/+48
| | | | | |
* | | | | | Bug fix: unknown2003-09-161-0/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SET character_set_connection=newcharset; SELECT hex('text'); The above sequence failed in some cases.
* | | | | Bug fix:unknown2003-09-161-6/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | http://bugs.mysql.com/bug.php?id=1264
* | | | Bug fix:unknown2003-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | http://bugs.mysql.com/bug.php?id=1264
* | | | Bug fix:unknown2003-09-164-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://bugs.mysql.com/bug.php?id=1129 From: Georg Richter Description: there is a problem with special chars like umlauts in comments
* | | | minor authentification optimisationunknown2003-09-161-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | sql/sql_parse.cc: authentification fix: one constructor and two variables optimised
* | | | Merge abarkov@build.mysql.com:/home/bk/mysql-4.1unknown2003-09-159-30/+126
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1 sql/sql_yacc.yy: Auto merged
| * | | | New SQL variables "collation_server" and "collation_database"unknown2003-09-159-30/+126
| | | | |
* | | | | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1unknown2003-09-154-3/+53
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1
| * | | | Merge abarkov@build.mysql.com:/home/bk/mysql-4.1unknown2003-09-152-3/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
| | * | | | In CREATE syntax: KEY a (field_name(10))unknown2003-09-152-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10 now means "number of characters", not number of bytes.
| * | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-09-152-0/+44
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
| | * | | | Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-08-262-0/+44
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1 sql/sql_cache.cc: Auto merged sql/sql_cache.h: Auto merged
| | | * \ \ \ Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-08-122-0/+44
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1 sql/sql_cache.cc: Auto merged
| | | | * | | | fixed query cache intercommunication with innodb engineunknown2003-08-122-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/innodb_cache.result: new results
* | | | | | | | Accept SLAVE START and STOP, even if deprecated.unknown2003-09-152-8/+16
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/log_event.cc: undoing a wrong change (the case is handled in Rotate_log_event::exec_event)
* | | | | | | New syntax:unknown2003-09-152-0/+4
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CREATE TABLE t1(a NVARCHAR(10)) This is for compatibility with MSSQL, DB2, Informix and some other DBMSs. Note, standard SQL doesn't have "NVARCHAR" syntax. There are only these syntaxes in SQL2003: NATIONAL VARCHAR NCHAR VARCHAR NATIONAL CHARACTER VARYING NCHAR VARYING - Tests were added for all the above syntaxes. sql/lex.h: New syntax: CREATE TABLE t1(a NVARCHAR(10)) This is for compatibility with MSSQL, DB2, Informix and some other DBMSs. Note, standard SQL doesn't have "NVARCHAR" syntax. There are only these syntaxes in SQL2003: NATIONAL VARCHAR NCHAR VARCHAR NATIONAL CHARACTER VARYING NCHAR VARYING sql/sql_yacc.yy: New syntax: CREATE TABLE t1(a NVARCHAR(10)) This is for compatibility with MSSQL, DB2, Informix and some other DBMSs. Note, standard SQL doesn't have "NVARCHAR" syntax. There are only these syntaxes in SQL2003: NATIONAL VARCHAR NCHAR VARCHAR NATIONAL CHARACTER VARYING NCHAR VARYING
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-09-144-39/+41
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-4.1-868
| * | | | | | renamed join_types (as was suggested by Peter Gulutzan)unknown2003-09-144-39/+41
| | | | | | |
* | | | | | | Manual merge after commiting START SLAVE UNTILunknown2003-09-1431-61/+436
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/lex.h: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/repl_failsafe.cc: Auto merged include/mysqld_error.h: Manual merge mysql-test/r/rpl000015.result: Manual merge mysql-test/r/rpl_empty_master_crash.result: Manual merge mysql-test/r/rpl_flush_log_loop.result: Manual merge mysql-test/r/rpl_log.result: Manual merge mysql-test/r/rpl_log_pos.result: Manual merge mysql-test/r/rpl_redirect.result: Manual merge mysql-test/r/rpl_replicate_do.result: Manual merge mysql-test/r/rpl_rotate_logs.result: Manual merge sql/share/czech/errmsg.txt: Manual merge sql/share/danish/errmsg.txt: Manual merge sql/share/dutch/errmsg.txt: Manual merge sql/share/english/errmsg.txt: Manual merge sql/share/estonian/errmsg.txt: Manual merge sql/share/french/errmsg.txt: Manual merge sql/share/german/errmsg.txt: Manual merge sql/share/greek/errmsg.txt: Manual merge sql/share/hungarian/errmsg.txt: Manual merge sql/share/italian/errmsg.txt: Manual merge sql/share/japanese/errmsg.txt: Manual merge sql/share/korean/errmsg.txt: Manual merge sql/share/norwegian-ny/errmsg.txt: Manual merge sql/share/norwegian/errmsg.txt: Manual merge sql/share/polish/errmsg.txt: Manual merge sql/share/portuguese/errmsg.txt: Manual merge sql/share/romanian/errmsg.txt: Manual merge sql/share/russian/errmsg.txt: Manual merge sql/share/serbian/errmsg.txt: Manual merge sql/share/slovak/errmsg.txt: Manual merge sql/share/spanish/errmsg.txt: Manual merge sql/share/swedish/errmsg.txt: Manual merge sql/share/ukrainian/errmsg.txt: Manual merge sql/slave.cc: Manual merge sql/slave.h: Manual merge sql/sql_repl.cc: Manual merge sql/sql_yacc.yy: Manual merge
| * | | | | | Implemented support for START SLAVE UNTIL (WL#868)unknown2003-09-1431-58/+431
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/mysqld_error.h: Added error codes for warnings and error messages for START SLAVE UNTIL mysql-test/r/rpl000015.result: Fixed test because 3 new columns to SHOW SLAVE STATUS output were added mysql-test/r/rpl_empty_master_crash.result: Fixed test because 3 new columns to SHOW SLAVE STATUS output were added mysql-test/r/rpl_flush_log_loop.result: Fixed test because 3 new columns to SHOW SLAVE STATUS output were added mysql-test/r/rpl_log.result: Fixed test because 3 new columns to SHOW SLAVE STATUS output were added mysql-test/r/rpl_log_pos.result: Fixed test because 3 new columns to SHOW SLAVE STATUS output were added mysql-test/r/rpl_redirect.result: Fixed test because 3 new columns to SHOW SLAVE STATUS output were added mysql-test/r/rpl_replicate_do.result: Fixed test because 3 new columns to SHOW SLAVE STATUS output were added mysql-test/r/rpl_rotate_logs.result: Fixed test because 3 new columns to SHOW SLAVE STATUS output were added sql/lex.h: Added UNTIL symbol sql/log.cc: Invalidating until_log_name comparison result if group_relay_log_name is changed sql/log_event.cc: Invalidating until_log_name comparison result if group_master_log_name is changed sql/repl_failsafe.cc: Cancel until condition if LOAD MASTER DATA is executed sql/share/czech/errmsg.txt: Added error and warning message for START SLAVE UNTIL sql/share/danish/errmsg.txt: Added error and warning message for START SLAVE UNTIL sql/share/dutch/errmsg.txt: Added error and warning message for START SLAVE UNTIL sql/share/english/errmsg.txt: Added error and warning message for START SLAVE UNTIL sql/share/estonian/errmsg.txt: Added error and warning message for START SLAVE UNTIL sql/share/french/errmsg.txt: Added error and warning message for START SLAVE UNTIL sql/share/german/errmsg.txt: Added error and warning message for START SLAVE UNTIL sql/share/greek/errmsg.txt: Added error and warning message for START SLAVE UNTIL sql/share/hungarian/errmsg.txt: Added error and warning message for START SLAVE UNTIL sql/share/italian/errmsg.txt: Added error and warning message for START SLAVE UNTIL sql/share/japanese/errmsg.txt: Added error and warning message for START SLAVE UNTIL sql/share/korean/errmsg.txt: Added error and warning message for START SLAVE UNTIL sql/share/norwegian-ny/errmsg.txt: Added error and warning message for START SLAVE UNTIL sql/share/norwegian/errmsg.txt: Added error and warning message for START SLAVE UNTIL sql/share/polish/errmsg.txt: Added error and warning message for START SLAVE UNTIL sql/share/portuguese/errmsg.txt: Added error and warning message for START SLAVE UNTIL sql/share/romanian/errmsg.txt: Added error and warning message for START SLAVE UNTIL sql/share/russian/errmsg.txt: Added error and warning message for START SLAVE UNTIL sql/share/serbian/errmsg.txt: Added error and warning message for START SLAVE UNTIL sql/share/slovak/errmsg.txt: Added error and warning message for START SLAVE UNTIL sql/share/spanish/errmsg.txt: Added error and warning message for START SLAVE UNTIL sql/share/swedish/errmsg.txt: Added error and warning message for START SLAVE UNTIL sql/share/ukrainian/errmsg.txt: Added error and warning message for START SLAVE UNTIL sql/slave.cc: Fixed wrong locking order in init_relay_log_pos() Added until condition fields to SHOW SLAVE STATUS Added checking if UNTIL condition is reached (added proper method, added its invocation, reorganized locking in exec_relay_log_event() and next_event()) sql/slave.h: Members in RELAY_LOG_INFO for storing UNTIL condition. Also methods for for invalidation of cached UNTIL condition comparison results sql/sql_repl.cc: Now honoring UNTIL clause then starting slave thread. Proper errors and warnings. sql/sql_yacc.yy: Added support for UNTIL clause in START SLAVE. This involved extraction of some of master_defs to separate master_file_def non-terminal.
* | | | | | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-09-1323-14/+117
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.1
| * | | | | | | error messages from english/errmsg.txt added to other languages.unknown2003-09-1322-1/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug#1269 sql/share/czech/errmsg.txt: error messages from english/errmsg.txt added to other languages. bug##1269 sql/share/danish/errmsg.txt: error messages from english/errmsg.txt added to other languages. bug##1269 sql/share/dutch/errmsg.txt: error messages from english/errmsg.txt added to other languages. bug##1269 sql/share/estonian/errmsg.txt: error messages from english/errmsg.txt added to other languages. bug##1269 sql/share/french/errmsg.txt: error messages from english/errmsg.txt added to other languages. bug##1269 sql/share/german/errmsg.txt: error messages from english/errmsg.txt added to other languages. bug##1269 sql/share/greek/errmsg.txt: error messages from english/errmsg.txt added to other languages. bug##1269 sql/share/hungarian/errmsg.txt: error messages from english/errmsg.txt added to other languages. bug##1269 sql/share/italian/errmsg.txt: error messages from english/errmsg.txt added to other languages. bug##1269 sql/share/japanese/errmsg.txt: error messages from english/errmsg.txt added to other languages. bug##1269 sql/share/korean/errmsg.txt: error messages from english/errmsg.txt added to other languages. bug##1269 sql/share/norwegian-ny/errmsg.txt: error messages from english/errmsg.txt added to other languages. bug##1269 sql/share/norwegian/errmsg.txt: error messages from english/errmsg.txt added to other languages. bug##1269 sql/share/polish/errmsg.txt: error messages from english/errmsg.txt added to other languages. bug##1269 sql/share/portuguese/errmsg.txt: error messages from english/errmsg.txt added to other languages. bug##1269 sql/share/romanian/errmsg.txt: error messages from english/errmsg.txt added to other languages. bug##1269 sql/share/russian/errmsg.txt: error messages from english/errmsg.txt added to other languages. bug##1269 sql/share/serbian/errmsg.txt: error messages from english/errmsg.txt added to other languages. bug##1269 sql/share/slovak/errmsg.txt: error messages from english/errmsg.txt added to other languages. bug##1269 sql/share/spanish/errmsg.txt: error messages from english/errmsg.txt added to other languages. bug##1269 sql/share/swedish/errmsg.txt: error messages from english/errmsg.txt added to other languages. bug##1269 sql/share/ukrainian/errmsg.txt: error messages from english/errmsg.txt added to other languages. bug##1269
| * | | | | | | removed double procedure deletetionunknown2003-09-131-8/+4
| | | | | | | |
| * | | | | | | fixed memory leak (now JOIN cleaning procedure always called)unknown2003-09-131-5/+2
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_select.cc: always clean JOIN
* | | | | | | Fixes for OPTION_FOUND_ROWS in UNION'sunknown2003-09-132-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/subselect.result: A warning added to subselect test due to the recent changes. UNION in sub-select returns the empty set, which is why this warning is a mistery to me. mysql-test/r/union.result: two changes. First one is due to the proper handling of LIMIT offset, limit in UNION without all. Second is a change in behaviour due to the fact that ORDER by in a UNION without braces is not now applicable to the last SELECT node. It can not be applied until one bug is fixed (after my vacation). Should be documented.
* | | | | | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-09-121-3/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.1 sql/sql_yacc.yy: Auto merged
| * | | | | | Fix for a bug #1231unknown2003-09-121-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parse error caused global ORDER BY to be initialized although it should not have been.
* | | | | | | Fix results for mix_innodb_myisam_binlogunknown2003-09-121-34/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize calls to current_thd mysql-test/r/mix_innodb_myisam_binlog.result: updated results mysql-test/t/mix_innodb_myisam_binlog.test: Fix for 4.1 sql/ha_innodb.cc: Don't call current_thd in an assert that is not deleted in release version (Because current_thd is slow)
* | | | | | | Optimize thai character handlingunknown2003-09-122-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove sel000xxxx tests After merge fixes BitKeeper/deleted/.del-sel000033.test~3971fbe746eec069: Delete: mysql-test/t/sel000033.test BitKeeper/deleted/.del-sel000033.result~56d1d02d72b94602: Delete: mysql-test/r/sel000033.result BitKeeper/deleted/.del-sel000100.result~84ed46856cb3a69f: Delete: mysql-test/r/sel000100.result BitKeeper/deleted/.del-sel000100.test~548501cad19a1a59: Delete: mysql-test/t/sel000100.test mysql-test/r/distinct.result: Merge test with sel000100 mysql-test/r/grant.result: Update result after merge mysql-test/r/range.result: After merge fix Merge test with sel000033 mysql-test/t/distinct.test: Merge test with sel000100 mysql-test/t/range.test: Merge test with sel000033 sql/log_event.cc: Remove duplicate allocation sql/sql_select.cc: After merge fixes strings/ctype-tis620.c: Remove usage of strnlen Optimize code and make it \0 safe
* | | | | | | merge with 4.1 treeunknown2003-09-1139-654/+975
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqltest.c: Auto merged include/mysql.h: Auto merged libmysql/errmsg.c: Auto merged libmysql/libmysql.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged sql/field.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/share/portuguese/errmsg.txt: Auto merged sql/share/spanish/errmsg.txt: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged tests/client_test.c: Auto merged
| * \ \ \ \ \ \ merge with 4.0.15unknown2003-09-116-23/+45
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql: Delete: scripts/mysql_fix_privilege_tables.sql include/mysql.h: Auto merged myisam/mi_open.c: Auto merged myisam/mi_update.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/r/bdb.result: Auto merged mysql-test/r/grant.result: Auto merged mysql-test/t/bdb.test: Auto merged mysql-test/t/grant.test: Auto merged mysql-test/t/range.test: Auto merged scripts/make_win_src_distribution.sh: Auto merged sql/ha_berkeley.cc: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged support-files/mysql.spec.sh: Auto merged
| | * | | | | | | Cleaned up last bug fixesunknown2003-09-092-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug in SHOW GRANTS when there is a column privilege but no table privilege include/mysql.h: Make server_inited external libmysqld/libmysqld.c: Remove reference to (wrong) external variable mysql-test/r/grant.result: Fixed up grant test to not user 'user1' or 'user2' Check for bug in SHOW GRANTS when there is a column privilege but no table privilege mysql-test/r/mix_innodb_myisam_binlog.result: Change to use tables t1 and t2 mysql-test/t/grant.test: Fixed up grant test to not user 'user1' or 'user2' Check for bug in SHOW GRANTS when there is a column privilege but no table privilege mysql-test/t/mix_innodb_myisam_binlog.test: Change to use tables t1 and t2 sql/sql_acl.cc: Fix bug in SHOW GRANTS when there is a column privilege but no table privilege sql/sql_parse.cc: Use HAVE_REPLICATION instead of EMBEDDED_LIBRARY
| | * | | | | | | fix for #1211unknown2003-09-081-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_parse.cc: Replication's commands were allowed, but didn't have proper implementations for embedded library
View Lorry Controller Status