summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* Replication: give the slave I/O thread a higher priority than the slave SQL ↵unknown2003-03-012-4/+8
| | | | | | | | | | | | | | | | | thread so that it has fetched the most from the master's binlog before the master accidently dies. SCRUM task #756. sql/slave.cc: Replication: give the slave I/O thread a higher priority than the slave SQL thread so that it has fetched the most from the master's binlog before the master accidently dies. sql/slave.h: Replication: give the slave I/O thread a higher priority than the slave SQL thread so that it has fetched the most from the master's binlog before the master accidently dies.
* Merge work:/home/bk/mysql-4.1unknown2003-03-011-1/+1
|\ | | | | | | | | | | | | | | | | | | into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1 BitKeeper/etc/ignore: auto-union sql/sql_select.cc: Auto merged
| * error message fixedunknown2003-02-261-1/+1
| | | | | | | | | | BitKeeper/etc/ignore: Added scripts/make_win_src_distribution to the ignore list
* | Added GeometryFromText, MultiPointFromText aliases.unknown2003-02-282-1/+6
| | | | | | | | | | | | | | Added GeometryCollection type.
* | item_func.cc:unknown2003-02-281-4/+23
| | | | | | | | | | | | | | | | Fix for coercibility of function sql/item_func.cc: Fix for coercibility of function
* | item_strfunc.cc:unknown2003-02-281-0/+1
| | | | | | | | | | | | | | | | Charset conversion function changes coercibility to IMPLICIT sql/item_strfunc.cc: Charset conversion function changes coercibility to IMPLICIT
* | sql_yacc.yy:unknown2003-02-282-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | _charset cast changes coercibility to implicit item_strfunc.cc: Collation cast change coercibility to EXPLICIT sql/item_strfunc.cc: Collation cast change coercibility to EXPLICIT sql/sql_yacc.yy: _charset cast changes coercibility to implicit
* | Many files:unknown2003-02-288-6/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Coercibility, initial stage item_func.h: Coercibility, initial stage sql/item_func.h: Coercibility, initial stage sql/item.cc: Coercibility, initial stage sql/item_create.cc: Coercibility, initial stage sql/item_create.h: Coercibility, initial stage sql/item.h: Coercibility, initial stage sql/item_func.cc: Coercibility, initial stage sql/lex.h: Coercibility, initial stage sql/sql_yacc.yy: Coercibility, initial stage
* | Merge work:/my/mysql-4.1 into narttu.mysql.fi:/my/mysql-4.1unknown2003-02-287-9/+9
|\ \
| * \ Merge with 3.23 -> 4.0unknown2003-02-287-9/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in: Auto merged include/config-win.h: Auto merged include/thr_lock.h: Auto merged mysql-test/Makefile.am: Auto merged sql/repl_failsafe.cc: Auto merged sql/slave.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_show.cc: Auto merged sql/log_event.cc: merge sql/mysqld.cc: merge
| | * | Added detection if pthread_attr_getstacksize() existsunknown2003-02-277-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug in RAND() usage in mysqlbinlog configure.in: Added detection if pthread_attr_getstacksize() exists include/thr_lock.h: Fixed wrong comment sql/log_event.cc: Fixed bug in RAND() usage in mysqlbinlog sql/mysqld.cc: Portablity fix sql/repl_failsafe.cc: Set host_or_ip for system threads (to make other code simpler) sql/slave.cc: Set host_or_ip for system threads (to make other code simpler) sql/sql_class.cc: Set host_or_ip for system threads (to make other code simpler) sql/sql_insert.cc: Set host_or_ip for system threads (to make other code simpler) sql/sql_show.cc: Set host_or_ip for system threads (to make other code simpler)
* | | | func_group.result:unknown2003-02-281-30/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new tests for better coverage of min/max optimization code. func_group.test: Added new tests for better coverage of min/max optimization code. opt_sum.cc: Fixed wrong previous manual merge. Fixed bugs concerning fields used in min/max functions for which there are conditions of the form field=const. sql/opt_sum.cc: Fixed wrong previous manual merge. Fixed bugs concerning fields used in min/max functions for which there are conditions of the form field=const. mysql-test/t/func_group.test: Added new test for better coverage of min/max optimization code. mysql-test/r/func_group.result: Added new tests for better coverage of min/max optimization code.
* | | | sql_yacc.yy:unknown2003-02-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set names binary didn't work , sql/sql_yacc.yy: set names binary didn't work ,
* | | | sql_yacc.yy, item_strfunc.cc:unknown2003-02-273-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two separate functions charset() and collatio() item_strfunc.h: Two separate functions charset() and collation() sql/item_strfunc.cc: Two separate functions charset() and collatio() sql/item_strfunc.h: Two separate functions charset() and collation() sql/sql_yacc.yy: Two separate functions charset() and collatio()
* | | | fixed bug on case insensetive file systemsunknown2003-02-271-2/+2
| | | |
* | | | Merge ibabaev@work.mysql.com:/home/bk/mysql-4.1unknown2003-02-271-1/+45
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/igor/dev/mysql-4.1
| * | | | field.cc:unknown2003-02-271-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now all text fields convert data into proper charset before storing sql/field.cc: Now all text fields convert data into proper charset before storing
* | | | | Merge ibabaev@work.mysql.com:/home/bk/mysql-4.1unknown2003-02-271-285/+615
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/igor/dev/mysql-4.1
| * | | | func_group.result, func_group.test:unknown2003-02-271-285/+615
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tests for extended max/min optimization opt_sum.cc: Extended min/max optimization sql/opt_sum.cc: Extended min/max optimization mysql-test/t/func_group.test: Added tests for extended max/min optimization mysql-test/r/func_group.result: Added tests for extended max/min optimization
* | | | field.cc:unknown2003-02-271-5/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | rename len -> length, to look in common style sql/field.cc: rename len -> length, to look in common style
* | | Merge work:/my/mysql-4.1 into narttu.mysql.fi:/my/mysql-4.1unknown2003-02-2711-37/+92
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/item_func.cc: Auto merged sql/lex.h: Auto merged sql/sql_show.cc: Auto merged
| * \ \ Merge with 4.0unknown2003-02-274-9/+21
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/bigint.result: Auto merged mysql-test/t/bigint.test: Auto merged sql/ha_innodb.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_load.cc: Auto merged sql/item.h: merge (use local copy) sql/sql_show.cc: merge
| | * | Integer values between 9223372036854775807 and 9999999999999999999 are nowunknown2003-02-272-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | regarded as unsigned longlongss, not as floats. This make these values work similar to values between 10000000000000000000 and 18446744073709551615. mysql-test/r/bigint.result: Fixed results for bigints mysql-test/t/bigint.test: Fixed results for bigints sql/item.h: Mark unsigned big ints as unsigned sql/sql_lex.cc: Returns numbers between 9223372036854775807 and 9999999999999999999 as unsigned 64 bit numbers
| | * | Code cleanupunknown2003-02-271-8/+3
| | | |
| | * | Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0unknown2003-02-261-1/+2
| | |\ \
| | | * \ Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0unknown2003-02-261-1/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_show.cc: Auto merged
| | | | * | Fix for SHOW TABLE STATUS with empty .frm fileunknown2003-02-261-1/+1
| | | | | |
| | | | * | Comment column in SHOW TABLE STATUS now reports that it canunknown2003-02-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contain NULL values (which is the case for a crashed .frm file).
| | * | | | ha_innodb.cc:unknown2003-02-261-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove DEBUG_ASSERT if MySQL internally names a UNIQUE index as the PRIMARY KEY, but inside InnoDB there is no primary key for the table sql/ha_innodb.cc: Remove DEBUG_ASSERT if MySQL internally names a UNIQUE index as the PRIMARY KEY, but inside InnoDB there is no primary key for the table
| | * | | | ha_innodb.cc:unknown2003-02-261-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs to store_lock() sql/ha_innodb.cc: Add docs to store_lock()
| | * | | | Merge sinisa@work.mysql.com://home/bk/mysql-4.0unknown2003-02-261-2/+9
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.0
| | | * | | A fix for a crashing bug with unspecified database in this type ofunknown2003-02-261-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | command: load data infile 'filename' into table db.table;
| * | | | | Portability fixesunknown2003-02-278-28/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't define crc32 if we are not linking with gzip cmd-line-utils/libedit/libedit_term.h: Rename: cmd-line-utils/libedit/term.h -> cmd-line-utils/libedit/libedit_term.h BitKeeper/etc/ignore: added scripts/make_win_src_distribution client/connect_test.c: Removed wrong include file (my_global.h should never be included by an external client) client/insert_test.c: Removed wrong include file (my_global.h should never be included by an external client) client/select_test.c: Removed wrong include file (my_global.h should never be included by an external client) cmd-line-utils/libedit/Makefile.am: Portability fixes (for HPUX11 and AIX) cmd-line-utils/libedit/el.h: Portability fixes (for HPUX11 and AIX) cmd-line-utils/libedit/key.h: Portability fixes (for HPUX11 and AIX) cmd-line-utils/libedit/makelist: Portability fixes (for HPUX11 and AIX) cmd-line-utils/libedit/read.c: Portability fixes (for HPUX11 and AIX) cmd-line-utils/libedit/readline.c: Portability fixes (for HPUX11 and AIX) cmd-line-utils/libedit/readline/readline.h: Systems that has sys/cdefs may not have __BEGIN_DECLS cmd-line-utils/libedit/sig.c: sig_t is not portable cmd-line-utils/libedit/sig.h: sig_t is not portable cmd-line-utils/libedit/term.c: Portablity fixes Fixed core dump when using a terminal without arrow key definitions heap/_check.c: Portability fix heap/hp_hash.c: Portability fix heap/hp_rkey.c: Portability fix include/my_global.h: Portability fixes for HPUX11 libmysql/libmysql.c: Removed wrong cast mysql-test/r/union.result: New union tests mysql-test/t/union.test: New union tests sql/gen_lex_hash.cc: Fixed portability bug. sql/gstream.h: Portablity fix sql/item_create.cc: Don't define crc32 if we are not linking with gzip sql/item_create.h: Don't define crc32 if we are not linking with gzip sql/item_func.cc: Don't define crc32 if we are not linking with gzip sql/item_func.h: Don't define crc32 if we are not linking with gzip sql/lex.h: Don't define crc32 if we are not linking with gzip sql/sql_show.cc: Name can't be NULL
* | | | | | Minor changes from 4.0->4.1 by Novell (Rob Lyon)unknown2003-02-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | netware/mw/mwenv: MW environment for 4.1 (add zlib dir, change path) netware/nwconfigure: with-extra-charsets changed to latin1_de sql/mysqld.cc: Removed duplicate call to pthread_exit(0)
* | | | | | All segments of SPATIAL keys MUST be NOT NULL.unknown2003-02-2624-27/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow NULL geometry fields. include/mysqld_error.h: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/czech/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/danish/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/dutch/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/english/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/estonian/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/french/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/german/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/greek/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/hungarian/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/italian/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/japanese/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/korean/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/norwegian-ny/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/norwegian/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/polish/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/portuguese/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/romanian/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/russian/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/serbian/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/slovak/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/spanish/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/swedish/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL" sql/share/ukrainian/errmsg.txt: new error message: "All parts of a SPATIAL KEY must be NOT NULL"
* | | | | | Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1unknown2003-02-2647-156/+244
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.r18.ru:/usr/home/ram/work/mysql-4.1 sql/spatial.cc: Auto merged
| * | | | | | sql_yacc.yy, lex.h:unknown2003-02-262-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SET NAMES is now working sql/lex.h: SET NAMES is now working sql/sql_yacc.yy: SET NAMES is now working
| * | | | | | set_var.cc, set_var.h:unknown2003-02-262-0/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New thread variable client_character_set sql/set_var.h: New thread variable client_character_set sql/set_var.cc: New thread variable client_character_set
| * | | | | | sql_show.cc:unknown2003-02-261-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Less default_charset_info sql/sql_show.cc: Less default_charset_info
| * | | | | | sql_class.h:unknown2003-02-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New method to simplify access to thd charset sql/sql_class.h: New method to simplify access to thd charset
| * | | | | | sql_test.cc:unknown2003-02-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Less default_charset_info sql/sql_test.cc: Less default_charset_info
| * | | | | | sql_udf.cc, protocol.cc:unknown2003-02-262-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Less default_charset_info sql/protocol.cc: Less default_charset_info sql/sql_udf.cc: Less default_charset_info
| * | | | | | set_var.cc, sql_table.cc, handler.cc, field.cc:unknown2003-02-264-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Less default_charset_info sql/field.cc: Less default_charset_info sql/handler.cc: Less default_charset_info sql/sql_table.cc: Less default_charset_info sql/set_var.cc: Less default_charset_info
| * | | | | | sql_analyse.cc, spatial.cc:unknown2003-02-263-33/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some default_charset_info were removed sql_select.cc: Some default_charset_info were removed. sql/spatial.cc: Some default_charset_info were removed sql/sql_select.cc: Some default_charset_info were removed. sql/sql_analyse.cc: Some default_charset_info were removed
| * | | | | | item_func.cc:unknown2003-02-262-17/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some reoganization Fixed that binary arguments do not affect result charset anymore For example, the second argument doesn't affect charset of result in LEFT(string,10) sql_string.h: Strings are binary by default now sql/sql_string.h: Strings are binary by default now sql/item_func.cc: Some reoganization Fixed that binary arguments do not affect result charset anymore For example, the second argument doesn't affect charset of result in LEFT(string,10)
| * | | | | | item_sum.cc:unknown2003-02-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed that MIN() didn't return proper charset for CREATE from SELECT sql/item_sum.cc: Fixed that MIN() didn't return proper charset for CREATE from SELECT
| * | | | | | Merge abarkov@work.mysql.com:/home/bk/mysql-4.1unknown2003-02-261-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
| | * | | | | Fix for MIX and MAX. Item must be checked against binary().unknown2003-02-261-1/+1
| | | | | | |
| * | | | | | Merge with 4.0.11unknown2003-02-2631-86/+100
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BUILD/FINISH.sh: Auto merged client/mysqldump.c: Auto merged include/my_base.h: Auto merged include/my_pthread.h: Auto merged innobase/row/row0sel.c: Auto merged innobase/ut/ut0mem.c: Auto merged myisam/myisamchk.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/bigint.result: Auto merged mysql-test/r/handler.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/innodb_handler.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/t/bigint.test: Auto merged mysql-test/t/handler.test: Auto merged mysql-test/t/innodb.test: Auto merged mysql-test/t/innodb_handler.test: Auto merged mysql-test/t/query_cache.test: Auto merged sql/mysqld.cc: Auto merged sql/opt_sum.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: 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/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/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/table.h: Auto merged
| | * | | | merge with 3.23 to get corrected error message files and rename of files in ↵unknown2003-02-2623-70/+77
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test innobase/ibuf/ibuf0ibuf.c: Auto merged sql/share/english/errmsg.txt: Auto merged sql/share/french/errmsg.txt: Auto merged sql/share/german/errmsg.txt: Auto merged sql/share/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/sql_analyse.cc: Auto merged sql/sql_analyse.h: 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/slovak/errmsg.txt: Auto merged sql/share/spanish/errmsg.txt: Auto merged sql/share/ukrainian/errmsg.txt: Auto merged mysql-test/t/rpl000015.slave-mi: Auto merged mysql-test/t/rpl_rotate_logs.slave-mi: Auto merged mysql-test/mysql-test-run.sh: merge with 3.23 scripts/make_binary_distribution.sh: merge with 3.23 sql/share/czech/errmsg.txt: merge with 3.23 sql/share/danish/errmsg.txt: merge with 3.23 sql/share/dutch/errmsg.txt: merge with 3.23 sql/share/estonian/errmsg.txt: merge with 3.23 sql/share/swedish/errmsg.txt: merge with 3.23 sql/sql_class.cc: merge with 3.23 (Keep local copy)
View Lorry Controller Status