summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add mysys specific error messagesunknown2003-04-165-5/+642
| | | | | | | | | | | | | Make RELAY_THREAD and alias for IO_THREAD Added new interface for string -> (unsigned) long long. include/my_sys.h: Add mysys specific error messages sql/lex.h: Make RELAY_THREAD an alias for IO_THREAD sql/sql_yacc.yy: Make RELAY_THREAD an alias for IO_THREAD
* A better fix for UNION and slow query log.unknown2003-04-081-27/+44
| | | | | | sql/sql_union.cc: A better fix for UNION and slow query log. This patch also fixes some indentation issues
* All collation names are now fit into convensionunknown2003-04-0715-80/+40
|
* sys_var_collation is now abstract classunknown2003-04-0711-62/+113
| | | | | | | | Two separate classes sys_var_client_collation and sys_var_literal_collation have been added for "literal_collation" and "client_collation" variables.
* New methods to store strings with "convert to" argimumentunknown2003-04-073-15/+64
|
* fixed bug with locales in libeditunknown2003-04-064-133/+140
| | | | | configure.in: fixed bug with external libedit
* Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-04-057-85/+49
|\ | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1 sql/sql_yacc.yy: Auto merged
| * Some optimization in SET NAMESunknown2003-04-057-85/+49
| | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ctype_collate.result: SET NAMES charset COLLATE collation is new syntax mysql-test/r/variables.result: SET NAMES charset COLLATE collation is new syntax mysql-test/t/ctype_collate.test: SET NAMES charset COLLATE collation is new syntax mysql-test/t/variables.test: SET NAMES charset COLLATE collation is new syntax
* | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-04-053-14/+46
|\ \ | |/ | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1 sql/sql_yacc.yy: Auto merged
| * sql_yacc.yy:unknown2003-04-051-1/+1
| | | | | | | | | | | | | | | | I wonder how it happend that I compiled this! sql/sql_yacc.yy: I wonder how it happend that I compiled this!
| * sql_yacc.yy, set_var.h, set_var.cc:unknown2003-04-053-14/+46
| | | | | | | | | | | | | | | | | | | | | | | | Optimization of SET NAMES sql/set_var.cc: Optimization of SET NAMES sql/set_var.h: Optimization of SET NAMES sql/sql_yacc.yy: Optimization of SET NAMES
* | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-04-054-4/+40
|\ \ | |/ |/| | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1 mysql-test/r/subselect.result: Auto merged sql/sql_yacc.yy: Auto merged
| * fixed st_select_lex initializationunknown2003-04-054-4/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed mustiupdate subselect compatibility (bug 217) mysql-test/r/subselect.result: test of multi-update & subselect mysql-test/t/subselect.test: test of multi-update & subselect sql/sql_update.cc: added subselect compatibility to query cache sql/sql_yacc.yy: right st_select_lex initialization layout fix
* | sql_cache.cc:unknown2003-04-051-2/+2
| | | | | | | | | | | | | | | | Cast to unsigned char sql/sql_cache.cc: Cast to unsigned char
* | Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-04-0422-1/+22
|\ \ | | | | | | | | | | | | | | | | | | into mysql.com:/home/pem/work/mysql-4.1
| * | Added missing error message (was only added in english/).unknown2003-04-0422-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed extraneous error message from german/errmsg.txt. sql/share/czech/errmsg.txt: Added missing error message (was only added in english/). sql/share/danish/errmsg.txt: Added missing error message (was only added in english/). sql/share/dutch/errmsg.txt: Added missing error message (was only added in english/). sql/share/estonian/errmsg.txt: Added missing error message (was only added in english/). sql/share/french/errmsg.txt: Added missing error message (was only added in english/). sql/share/german/errmsg.txt: Added missing error message (was only added in english/). Removed extraneous error message. sql/share/greek/errmsg.txt: Added missing error message (was only added in english/). sql/share/hungarian/errmsg.txt: Added missing error message (was only added in english/). sql/share/italian/errmsg.txt: Added missing error message (was only added in english/). sql/share/japanese/errmsg.txt: Added missing error message (was only added in english/). sql/share/korean/errmsg.txt: Added missing error message (was only added in english/). sql/share/norwegian-ny/errmsg.txt: Added missing error message (was only added in english/). sql/share/norwegian/errmsg.txt: Added missing error message (was only added in english/). sql/share/polish/errmsg.txt: Added missing error message (was only added in english/). sql/share/portuguese/errmsg.txt: Added missing error message (was only added in english/). sql/share/romanian/errmsg.txt: Added missing error message (was only added in english/). sql/share/russian/errmsg.txt: Added missing error message (was only added in english/). sql/share/serbian/errmsg.txt: Added missing error message (was only added in english/). sql/share/slovak/errmsg.txt: Added missing error message (was only added in english/). sql/share/spanish/errmsg.txt: Added missing error message (was only added in english/). sql/share/swedish/errmsg.txt: Added missing error message (was only added in english/). sql/share/ukrainian/errmsg.txt: Added missing error message (was only added in english/).
* | | Merge abarkov@build.mysql.com:/home/bk/mysql-4.1unknown2003-04-041-8/+8
|\ \ \ | |/ / |/| | | | | | | | | | | | | | into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
| * | Index.xml:unknown2003-04-041-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Type sql/share/charsets/Index.xml: Type
* | | Updating subselect results after SUBSELECT was changed into SUBQUERY.unknown2003-04-041-24/+24
| | | | | | | | | | | | | | | mysql-test/r/subselect.result: Updating results after SUBSELECT was changed into SUBQUERY.
* | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-04-041-8/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp sql/item_strfunc.cc: Auto merged
| * | | Fixed envelope() function.unknown2003-04-041-8/+9
| | | |
* | | | Sync string in EXPLAIN code with phrasing of manual (subquery, not subselect).unknown2003-04-041-3/+3
| | | |
* | | | gis.txt deleted - updated text merged into manual (mysqldoc tree).unknown2003-04-041-874/+0
| | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-gis.txt~2dde6d55b3075921: Delete: Docs/gis.txt
* | | | And got rid of signess warnings...unknown2003-04-031-4/+4
| | | |
* | | | Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-04-031-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/pem/work/mysql-4.1
| * \ \ \ Merge akishkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-04-041-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/walrus/bk/41
| | * | | test-transactions.sh:unknown2003-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correct misprint in the sub test_update sql-bench/test-transactions.sh: correct misprint in the sub test_update
* | | | | Got rid of silly compiler errors on HP-UX and SGI Irix.unknown2003-04-031-3/+5
|/ / / /
* | | | field.cc:unknown2003-04-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Geometry is now large blob sql/field.cc: Geometry is now large blob
* | | | Fixed bug in warning handling (Memory was allocated from wrong MEM_ROOT)unknown2003-04-035-27/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/item_sum.cc: Fixed bug in warning handling. sql/item_sum.h: Fixed bug in warning handling. sql/sql_class.h: Fixed bug in warning handling. sql/sql_error.cc: Fixed bug in warning handling. strings/my_vsnprintf.c: After merge fix
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-04-0327-75/+300
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.1 BitKeeper/etc/logging_ok: auto-union sql/item_strfunc.cc: Auto merged sql/mysqld.cc: Auto merged
| * | | Merge with 4.0unknown2003-04-0327-75/+300
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c: Auto merged BitKeeper/deleted/.del-mysql.xdc: Delete: netware/mysql.xdc BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716: Auto merged BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e: Auto merged BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9: Auto merged client/mysql.cc: Auto merged include/my_pthread.h: Auto merged libmysqld/examples/Makefile.am: Auto merged mysql-test/r/func_str.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/t/backup.test: Auto merged mysql-test/t/myisam.test: Auto merged mysys/default.c: Auto merged mysys/my_init.c: Auto merged mysys/my_pthread.c: Auto merged mysys/thr_mutex.c: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/ha_myisam.cc: Auto merged sql/log.cc: Auto merged sql-bench/crash-me.sh: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_show.cc: Auto merged strings/my_vsnprintf.c: Auto merged sql/sql_parse.cc: Merge with 4.0 (Ignore not existing tables with DROP TEMPOARAY TABLE on slave) mysql-test/r/rpl_loaddata.result: Auto merged
| | * | | After merge fixunknown2003-04-031-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | sql/log_event.cc: Fixed a wrong && test -> &
| | * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-04-031-0/+8
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.0
| | | * | | add test file for rpl_loaddata.testunknown2003-04-031-0/+8
| | | | | |
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-04-034-2/+37
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.0 BitKeeper/etc/logging_ok: auto-union sql/log_event.cc: Auto merged
| | | * | | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-04-034-2/+37
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
| | | | * | | added test for replication load data into temporary table with additional ↵unknown2003-04-033-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | options sql/log_event.cc: fix bug #183 (Replication of temporary tables not working)
| | | | * | | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0unknown2003-04-032-0/+6
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
| | | | | * \ \ Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0unknown2003-03-252-0/+6
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0 BitKeeper/etc/logging_ok: auto-union sql/log_event.cc: Auto merged
| | | | | | * | | fix bug with parameters of LOAD DATA INFILE in exec_eventunknown2003-03-252-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * | | | | | | Updated results after mergeunknown2003-04-031-2/+2
| | | | | | | | |
| | * | | | | | | Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0unknown2003-04-033-2/+9
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysys/my_vsnprintf.c: Auto merged sql/ha_myisam.cc: Auto merged sql/log.cc: Auto merged
| | | * | | | | | | Fixed bug in memory allocation that could affect 64 bit systems (affected ↵unknown2003-04-033-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hammer) mysys/my_vsnprintf.c: safety fix sql/log.cc: safety fix
| | * | | | | | | | Merge with 3.23 to get fixes for:unknown2003-04-036-18/+31
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | / / / / / / | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysqldump --delete-master-logs Portability fix for hammer Memory overrun for MyISAM LOAD DATA LOCAL replication bug fix. BitKeeper/etc/logging_ok: auto-union sql/log.cc: Auto merged client/client_priv.h: Merge with 3.23 client/mysqldump.c: Merge with 3.23 myisam/mi_dynrec.c: Merge with 3.23 mysql-test/t/myisam.test: Merge with 3.23 sql/log_event.cc: Merge with 3.23 sql/slave.cc: Merge with 3.23 sql/sql_delete.cc: Merge with 3.23
| | | * | | | | | Portability fix (for AMD hammer)unknown2003-04-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/log.cc: Portability fix (for hammer)
| | | * | | | | | Small-and-safe fix for bug #218: "LOAD DATA INFILE IGNORE is wellunknown2003-04-012-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | logged, but read as LOAD DATA INFILE REPLACE" This was just bad && instead of &, but nasty consequences. This should be merged to 4.0 BUT it will not be automatic (some code has moved from log_event.h to log_event.cc, and log_event.cc has changed); please Merging Man, do 'bk grep REPLACE_FLAG' in 4.0/sql to find all the new places. sql/log_event.cc: & instead of && when testing flags sql/slave.cc: & instead of && when testing flags
| | | * | | | | | A fix for a bug in MyISAM with large number of NULL columns and atunknown2003-03-252-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | least one BLOB column.
| | | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-3.23unknown2003-03-241-1/+4
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-3.23
| | | | * | | | | | Fixed bug that binary log was not locked during a DELETE FROM TABLE_NAME;unknown2003-03-241-1/+4
| | | | | | | | | |
View Lorry Controller Status