summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* changed syntax from SHOW MASTER LOGS to SHOW BINARY LOGSunknown2002-10-247-13/+27
|
* altered syntax from SLAVE START|STOP to START|STOP SLAVEunknown2002-10-2444-206/+167
| | | | | mysql-test/mysql-test-run.sh: Added --rpl option which tests all t/rpl*.test tests.
* Added Rand_log_eventunknown2002-10-247-5/+122
|
* Moved rand initialization from mysqld.cc to sql_class.cc:THD::THD()unknown2002-10-242-10/+15
|
* Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1unknown2002-10-234-8/+18
|\ | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/work-distinct-4.1
| * fixed DISTINCT in subselect bugunknown2002-10-234-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | small Item_ref fix mysql-test/r/subselect.result: DISTINCT in subselect test mysql-test/t/subselect.test: DISTINCT in subselect test sql/sql_class.cc: fixed DISTINCT in subselect bug
* | All these syntaxes now work:unknown2002-10-231-2/+7
| | | | | | | | | | | | | | | | | | CREATE TABLE a (...) TYPE isam CHARSET latin1 MAX_ROWS 1000; CREATE TABLE a (...) TYPE=isam CHARSET=latin1 MAX_ROWS=1000; CREATE TABLE a (...) TYPE isam, CHARSET latin1, MAX_ROWS 1000; CREATE TABLE a (...) TYPE=isam, CHARSET=latin1, MAX_ROWS=1000;
* | Both syntaxes are now working:unknown2002-10-231-20/+24
| | | | | | | | | | | | | | CREATE TABLE a (...) TYPE isam CHARSET latin1 MAX_ROWS 1000; CREATE TABLE a (...) TYPE=isam CHARSET=latin1 MAX_ROWS=1000;
* | Preparing to use my_charset_bin instead of binary_flagunknown2002-10-233-4/+7
|/
* ctype-bin.c:unknown2002-10-231-1/+1
| | | | | | | | max_sort_char is 255 for binary strings/ctype-bin.c: max_sort_char is 255 for binary
* sql_yacc.yy:unknown2002-10-231-1/+9
| | | | | | | | character set binary didn't work sql/sql_yacc.yy: character set binary didn't work
* Merge abarkov@work.mysql.com:/home/bk/mysql-4.1unknown2002-10-234-4/+189
|\ | | | | | | | | | | into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
| * ctype.c, Makefile.am, Makefile.shared:unknown2002-10-234-4/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | binary charset ctype-bin.c: new file libmysql/Makefile.shared: binary charset strings/Makefile.am: binary charset strings/ctype.c: binary charset
* | binary charsetunknown2002-10-231-0/+2
|/
* New cp1256 charsetunknown2002-10-232-0/+95
|
* Merge work:/home/bk/mysql-4.1unknown2002-10-225-4/+22
|\ | | | | | | | | | | | | | | | | | | | | | | into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1 BitKeeper/etc/gone: auto-union BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-skipkeys~56cb758b36258d1c: 'Auto converge rename'
| * BK automatic LOD removal.unknown2002-10-223-1092/+1102
| | | | | | | | | | | | | | BitKeeper/etc/skipkeys: auto add BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * make REPAIR killableunknown2002-10-225-2/+20
| |
| * ha_myisam::repair should not touch file->save_state (directly, that is)unknown2002-10-151-2/+2
| |
* | Merge sinisa@work.mysql.com:/home/bk/mysql-4.1unknown2002-10-213-1092/+1102
|\ \ | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.1
| * | BK automatic LOD removal.unknown2002-10-203-1092/+1102
| | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/skipkeys: auto add BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Small addition to COM_DEBUGunknown2002-10-211-3/+20
| | | | | | | | | | | | | | | sql/sql_test.cc: small addition to COM_DEBUG
* | | Merge sinisa@work.mysql.com:/home/bk/mysql-4.1unknown2002-10-182-3/+7
|\ \ \ | |/ / | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.1
| * | Fixed heap_btree test to make it repeatableunknown2002-10-182-3/+7
| | | | | | | | | | | | | | | | | | | | | mysql-test/r/heap_btree.result: Make test repeatable mysql-test/t/heap_btree.test: Make test repeatable
* | | added a test case.unknown2002-10-172-0/+5
|/ / | | | | | | | | | | | | | | | | | | And I am not able to find a Changelog for 4.1 mysql-test/r/union.result: added a test case mysql-test/t/union.test: added a test case
* | mergeunknown2002-10-1714-138/+336
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs/world.sql: Auto merged sql/mysql_priv.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged
| * | fix of the small bug in UNION'sunknown2002-10-162-6/+8
| | | | | | | | | | | | | | | | | | | | | mysql-test/r/heap_btree.result: I donno why this changed, aint my fault sql/sql_union.cc: fix of the small bug
| * | Some small accelerations ...unknown2002-10-163-45/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I intend to do some more accelerations in mysql_execute_command and in SQLCOM_SELECT part for which I need to fix EXPLAIN with derived tables plus few additional items. If this proves to be much I wil just make it a new SCRUM task sql/sql_lex.h: Some small accelerations ... sql/sql_parse.cc: Some small accelerations ... sql/sql_yacc.yy: Some small accelerations ...
| * | Merge sinisa@work.mysql.com:/home/bk/mysql-4.1unknown2002-10-1629-102/+260
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.1 sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged
| | * \ Merge work.mysql.com:/home/bk/mysql-4.1/unknown2002-10-161-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | into fred.bitbike.com:/home/arjen/mysql-4.1
| | | * | Name fix.unknown2002-10-161-1/+1
| | | |/
| | * | Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1unknown2002-10-166-45/+116
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/work-distinct-4.1 sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged
| | | * fixed subselect explain bugunknown2002-10-166-45/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/subselect.result: test for subselect explain bug mysql-test/t/subselect.test: test for subselect explain bug
| * | | some fixes for SELECT INTO @vars ..unknown2002-10-165-105/+118
| | | | | | | | | | | | | | | | | | | | sql/sql_parse.cc: Simplification of code
| * | | Merge sinisa@work.mysql.com:/home/bk/mysql-4.1unknown2002-10-143-3/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.1
| * \ \ \ Merge sinisa@work.mysql.com:/home/bk/mysql-4.1unknown2002-10-147-26/+136
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.1 sql/sql_lex.h: Auto merged
| | * \ \ \ Merge sinisa@work.mysql.com:/home/bk/mysql-4.1unknown2002-10-123-6/+20
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.1
| | * \ \ \ \ Merge sinisa@work.mysql.com:/home/bk/mysql-4.1unknown2002-10-117-26/+136
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.1 sql/sql_class.cc: Auto merged
| | | * | | | | SCRUM taskunknown2002-10-117-26/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/select.result: SELECT ... INTO user_variables mysql-test/t/select.test: SELECT ... INTO user_variables sql/sql_class.cc: SELECT ... INTO user_variables sql/sql_class.h: SELECT ... INTO user_variables sql/sql_lex.h: SELECT ... INTO user_variables sql/sql_parse.cc: SELECT ... INTO user_variables sql/sql_yacc.yy: SELECT ... INTO user_variables
* | | | | | | | Fix after mergeunknown2002-10-164-5/+26
| | | | | | | |
* | | | | | | | Merge hundin.mysql.fi:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.1unknown2002-10-16400-6461/+76774
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/null_key.result: Auto merged sql/ha_innodb.cc: Auto merged sql/sql_parse.cc: Auto merged
| * \ \ \ \ \ \ \ merge with 4.0.5unknown2002-10-16400-6461/+76774
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged Docs/manual.texi: Auto merged myisam/mi_open.c: Auto merged mysql-test/r/null_key.result: Auto merged mysql-test/r/select.result: Auto merged sql/field.h: Auto merged sql/field_conv.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/log.cc: Auto merged sql/sql_parse.cc: Auto merged sql/table.cc: Auto merged
| | * | | | | | | | Added THD as parameter to filesort. Removed not used 'special' argument.unknown2002-10-167-44/+28
| | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/mysql_priv.h: Fix for changed parameters to filesort sql/sql_delete.cc: Fix for changed parameters to filesort sql/sql_select.cc: Fix for changed parameters to filesort sql/sql_table.cc: Fix for changed parameters to filesort sql/sql_test.cc: Removed not used special parameter sql/sql_update.cc: Fix for changed parameters to filesort
| | * | | | | | | Merge work:/my/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1unknown2002-10-1523-53/+136
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | sql/sql_select.cc: Auto merged
| | | * | | | | | Mergeunknown2002-10-1423-53/+136
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/client/mysqlclient.dsp: Auto merged VC++Files/libmysql/libmysql.dsp: Auto merged VC++Files/mysys/mysys.dsp: Auto merged VC++Files/sql/mysqld.dsp: Auto merged client/mysql.cc: Auto merged heap/_check.c: Merge: Fixed DBUG_PRINT() usage
| | | | * | | | | mergeunknown2002-10-1446-1137/+1258
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysql.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_union.cc: Auto merged
| | | | * | | | | | Portability fixes to be able to compile MySQL with VC++unknown2002-10-0823-63/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/client/mysqlclient.dsp: Updated VC++ files for 4.1 VC++Files/libmysql/libmysql.dsp: Updated VC++ files for 4.1 VC++Files/libmysqld/libmysqld.dsp: Updated VC++ files for 4.1 VC++Files/myisam/myisam.dsp: Updated VC++ files for 4.1 VC++Files/mysys/mysys.dsp: Updated VC++ files for 4.1 VC++Files/sql/mysqld.dsp: Updated VC++ files for 4.1 VC++Files/strings/strings.dsp: Updated VC++ files for 4.1 client/mysql.cc: Update for windows heap/_check.c: Fixed wrong DBUG_PRINT() usage include/mysql.h: Portability fix (uint -> unsigned int) libmysql/libmysql.def: Removed old my_casecmp function sql/ha_innodb.cc: Update for windows sql/init.cc: Removed not used variable sql/log.cc: Removed not used variable sql/net_pkg.cc: Portability fix sql/sql_db.cc: Portability fixes. Removed not used variables sql/sql_lex.h: Portability fix sql/sql_parse.cc: Portability fix sql/sql_prepare.cc: Removed not used variables sql/sql_select.cc: Portability fix sql/sql_show.cc: Portability fix sql/sql_union.cc: Portability fix
| | * | | | | | | | removed annecessary assignment found by Montyunknown2002-10-141-3/+1
| | | | | | | | | |
| | * | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1unknown2002-10-143-3/+4
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/work-distinct-4.1
| | | * | | | | | | fix 4.1 buildunknown2002-10-143-3/+4
| | | |/ / / / / /