summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-04-053-61/+45
|\ | | | | | | | | | | | | | | 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-053-61/+45
| | | | | | | | | | | | | | | | | | | | | | 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-052-4/+6
|\ \ | |/ |/| | | | | | | | | | | | | | | 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-052-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | 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
| | | |
* | | | And got rid of signess warnings...unknown2003-04-031-4/+4
| | | |
* | | | 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-034-26/+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-038-24/+64
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-038-24/+64
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+6
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-031-1/+6
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-031-0/+5
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-251-0/+5
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * | | | | | Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0unknown2003-04-032-1/+2
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-032-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hammer) mysys/my_vsnprintf.c: safety fix sql/log.cc: safety fix
| | * | | | | | | Merge with 3.23 to get fixes for:unknown2003-04-032-9/+10
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | / / / / / | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | Fixed bug that binary log was not locked during a DELETE FROM TABLE_NAME;unknown2003-03-241-1/+4
| | | | | | | |
| | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-04-031-1/+1
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.0
| | | * | | | | Safer stack checkingunknown2003-04-031-1/+1
| | | | | | | |
| | * | | | | | Sprint task #856 : make table exclusion rules (in replication)unknown2003-04-011-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apply to GRANT and REVOKE too. For example if replicate-wild-ignore-table=mysql.%, GRANT and REVOKE will not be replicated on the slave.
| | * | | | | | truncating REPLACE result bug fixunknown2003-03-301-2/+2
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/func_str.result: test result for truncating REPLACE result mysql-test/t/func_str.test: test with long arguments for REPLACE sql/item_strfunc.cc: fix for counting REPLACE result length
| | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-03-271-4/+6
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.0 sql/mysqld.cc: Auto merged
| | * | | | | | mysqld.cc:unknown2003-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the default value of innodb_flush_log_at_trx_commit 1, not 0 which compromises the Durability of a transaction sql/mysqld.cc: Make the default value of innodb_flush_log_at_trx_commit 1, not 0 which compromises the Durability of a transaction
| | * | | | | | fixed problem of port without host in SHOW PROCESSLIST (bug 189)unknown2003-03-261-1/+1
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_show.cc: fixed problem of port without host in SHOW PROCESSLIST
| | * | | | | Fix for small bug #186 (If a connection has temporary tables and doesunknown2003-03-251-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RESET MASTER, this breaks replication). In the slave SQL thread, any DROP TEMPORARY TABLE is silently converted to DROP TEMPORARY TABLE IF EXISTS, not to have irrelevant "table does not exist". See comments in code or bug #186 for an example of how irrelevant errors like this can arise.
* | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-04-035-0/+37
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp
| * | | | | | | AsWKB() function has been added.unknown2003-04-035-0/+37
| | | | | | | |
* | | | | | | | sql_cache.cc:unknown2003-04-031-7/+5
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows compilation fix sql/sql_cache.cc: Windows compilation fix
* | | | | | | mysqld.cc:unknown2003-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | missing comma sql/mysqld.cc: missing comma
* | | | | | | resolve new updates group_concatunknown2003-04-024-40/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/mysqld_error.h: resolve error message sql/mysqld.cc: resolve option sql/set_var.cc: resolve variable sql/share/english/errmsg.txt: resolve error message sql/sql_class.h: resolve
* | | | | | | Auto mergedunknown2003-04-0210-38/+637
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union
| * | | | | | | SCRUMunknown2003-04-022-183/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correct sql_alloc, ORDER BY and NULL value in group_concat add comments move test msg_arg add test on NULL mysql-test/r/func_gconcat.result: change work with NULL mysql-test/t/func_gconcat.test: add test on NULL sql/item_sum.cc: correct sql_alloc, ORDER BY and NULL value add comments sql/sql_class.h: move test msg_arg
| * | | | | | | This is full commit of group_concat with support subselectsunknown2003-03-1812-13/+602
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/mysqld_error.h: add warning sql/field.h: add friend class sql/item_sum.cc: add function sql/item_sum.h: add class sql/lex.h: add lex sql/mysql_priv.h: change push_warning sql/mysqld.cc: add new option sql/set_var.cc: add new system variable sql/share/english/errmsg.txt: add new message text sql/sql_class.h: change MY_ERROR class sql/sql_error.cc: change push_warning sql/sql_lex.h: add qorder_list for function sql/sql_yacc.yy: add structure of group_concat BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
View Lorry Controller Status