summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* Changed DB_TYPE_INNOBASE to DB_TYPE_INNODBunknown2001-09-0215-239/+321
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix that DROP DATABASE works with all table types Use BULK_INSERT when inserting more than one row Better TRUNCATE TABLE BitKeeper/deleted/.del-compilation_finished.au.gz~70bd14095a918139: Delete: sounds/compilation_finished.au.gz BUILD/FINISH.sh: Removed 'finished' sound as this isn't a general solution. Docs/manual.texi: Added upgrading from 3.23 configure.in: Fixed version number sql/ha_innobase.cc: Default creation of InnoDB tables. sql/ha_myisam.cc: Disable BULK_INSERT of using safe mode sql/handler.cc: Changed DB_TYPE_INNOBASE to DB_TYPE_INNODB sql/handler.h: Changed DB_TYPE_INNOBASE to DB_TYPE_INNODB sql/lock.cc: Added lock_and_wait_for_table_name sql/mysql_priv.h: Better TRUNCATE TABLE sql/sql_db.cc: Fix that DROP DATABASE works with all table types sql/sql_delete.cc: Better TRUNCATE TABLE sql/sql_insert.cc: Use BULK_INSERT when inserting more than one row sql/sql_load.cc: Small bug fix. sql/sql_parse.cc: Better TRUNCATE TABLE sql/sql_select.cc: Change INNOBASE -> INNODB sql/sql_table.cc: Better TRUNCATE TABLE sql/sql_yacc.yy: INNOBASE -> INNODB sql/thr_malloc.cc: Fix for replication
* fixed coredump, and changed mngd->managerunknown2001-08-291-1/+6
| | | | | | | | | | | sql/sql_acl.cc: fixed coredump when running without SSL tools/Makefile.am: mysqlmngd -> mysqlmanager tools/mysqlmanager.c: mngd->manager BitKeeper/etc/ignore: Added tools/mysqlmanager to the ignore list
* OpenSSL workunknown2001-08-302-6/+35
| | | | | | | readline/callback.c: warning removed sql/mysqld.cc: Warning removed abut freeing zero pointer
* Typo fixunknown2001-08-291-1/+1
|
* fixed compile errorunknown2001-08-271-0/+2
|
* OpenSSL changesunknown2001-08-274-15/+186
| | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: Added vio/test-sslclient vio/test-sslserver to the ignore list client/mysql.cc: Let make mysql client tell user about cipher in use sql/mini_client.cc: Synced SSL stuff with libmysql code sql/mysqld.cc: Preaparations to turn replication SSL on Stuff to output SSL variables with SHOW STATUS command sql/sql_show.cc: Stuff to output SSL variables with SHOW STATUS command sql/structs.h: Stuff to output SSL variables with SHOW STATUS command vio/viossl.c: Major modifications vio/viosslfactories.c: SSL fixes
* Merge tonu@work.mysql.com:/home/bk/mysql-4.0unknown2001-08-262-23/+39
|\ | | | | | | | | | | | | into x153.internalnet:/home/tonu/mysql-4.0
| * EXPLAIN on UNION"sunknown2001-08-242-23/+39
| | | | | | | | | | | | | | mysql-test/r/union.result: New result for EXPLAIN UNION's mysql-test/t/union.test: No error when EXPLAIN is done on UNION's
* | Warning fixesunknown2001-08-231-6/+6
|/ | | | | | | | | client/thread_test.c: Removed unused variables warnings sql/mysqld.cc: Fixed freeing null ptr warnings vio/Makefile.am: Make more test programs to compile
* Merge work.mysql.com:/home/bk/mysql-4.0 into white.box:/home/tim/my/4unknown2001-08-211-0/+5
|\
| * Fix some libmysqld problems.unknown2001-08-211-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: Added libmysqld/ha_innobase.cc to the ignore list libmysqld/Makefile.am: Add ha_innobase.cc to libmysqld. libmysqld/lib_sql.cc: Hack to get shutdown working properly in libmysqld. Probably this is not quite correct. sql/mini_client.cc: Remove name collision in embedded libmysqld.
* | Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0unknown2001-08-211-2/+5
|\ \
| * | Remove usage of my_dup(), as this casued error 127 when reading MyISAM tablesunknown2001-08-211-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New definition of WEEK(). Docs/manual.texi: Changelog myisam/mi_cache.c: Better logging on error myisam/mi_open.c: Remove usage of my_dup(), as this casued error 127 when reading tables mysql-test/r/func_time.result: More tests for the WEEK/YEARWEEK function mysql-test/t/func_time.test: More tests for the WEEK/YEARWEEK function sql/time.cc: New definition of WEEK
* | | Merge work:/home/bk/mysql-4.0unknown2001-08-2025-26/+40
|\ \ \ | |/ / | | | | | | | | | | | | | | | into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
| * | Add my_dup.cunknown2001-08-191-1/+0
| | | | | | | | | | | | | | | sql/sql_parse.cc: cleanup
| * | Fix of UNION codeunknown2001-08-1925-25/+40
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added heap_delete_table Added HA_EXTRA_PREPARE_FOR_DELETE Added and use my_dup() for faster open of tables. Removed not working no-mix-table-type BitKeeper/deleted/.del-=6~33f33b0a159dc5d5: Delete: =6 heap/hp_clear.c: Cleanup heap/hp_close.c: Added delayed delete heap/hp_create.c: Added heap_delete_table heap/hp_delete.c: cleanup heap/hp_test2.c: Added heap_delete_table include/heap.h: Added heap_delete_table include/my_base.h: Added HA_EXTRA_PREPARE_FOR_DELETE include/my_sys.h: Adde my_dup and set_prealloc_root isam/extra.c: Added HA_EXTRA_PREPARE_FOR_DELETE myisam/mi_check.c: use my_dup myisam/mi_extra.c: use my_dup myisam/mi_open.c: use my_dup myisam/myisamchk.c: use my_dup myisam/myisamdef.h: use my_dup mysys/Makefile.am: my_dup mysys/hash.c: Add hash_replace mysys/mf_pack.c: cleanup mysys/my_alloc.c: Add set_prealloc_root mysys/my_fstream.c: cleanup mysys/my_lib.c: cleanup mysys/my_seek.c: cleanup sql/ha_heap.cc: Uses heap_delete_table() sql/mysqld.cc: Fix SIGHUP usage Remove no-mix-table-types sql/share/czech/errmsg.txt: new error message sql/share/danish/errmsg.txt: new error message sql/share/dutch/errmsg.txt: new error message sql/share/english/errmsg.txt: new error message sql/share/estonian/errmsg.txt: new error message sql/share/french/errmsg.txt: new error message sql/share/german/errmsg.txt: new error message sql/share/greek/errmsg.txt: new error message sql/share/hungarian/errmsg.txt: new error message sql/share/italian/errmsg.txt: new error message sql/share/japanese/errmsg.txt: new error message sql/share/korean/errmsg.txt: new error message sql/share/norwegian-ny/errmsg.txt: new error message sql/share/norwegian/errmsg.txt: new error message sql/share/polish/errmsg.txt: new error message sql/share/portuguese/errmsg.txt: new error message sql/share/romanian/errmsg.txt: new error message sql/share/russian/errmsg.txt: new error message sql/share/slovak/errmsg.txt: new error message sql/share/spanish/errmsg.txt: new error message sql/share/swedish/errmsg.txt: new error message sql/sql_base.cc: remove no-mix-table-type sql/sql_parse.cc: Fix UNION code
* | fixes in mysqltest and mysqlbinlogunknown2001-08-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trying to understand why --bootstrap option does not create tables on disk, hope the problem will be fixed when I pull, if not will debug, but need to commit in order to pull client/mysqltest.c: added safe_connect() and chaned all calls to mysql_real_connect() to safe_connect() mysql-test/install_test_db.sh: more diagnostic sql/log_event.cc: fixed compile error in mysqlbinlog
* | Merge work:/home/bk/mysql-4.0unknown2001-08-182-116/+220
|\ \ | |/ |/| | | | | | | | | into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
| * make LOAD DATA INFILE replication work with multi-character unknown2001-08-182-116/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delimiters/starters/terminators started work on server management daemon mysql-test/r/rpl_log.result: fixed result sql/log_event.cc: make LOAD DATA INFILE replication work with multi-character delimiters/starters/terminators sql/log_event.h: make LOAD DATA INFILE replication work with multi-character delimiters/starters/terminators
* | New startup options and some cleanupsunknown2001-08-185-12/+25
|/ | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: Added =6 to the ignore list include/mysqld_error.h: Error message for no-mixing of table types.. sql/mysql_priv.h: New option sql/mysqld.cc: New option sql/share/english/errmsg.txt: Error message for no-mixing of table types.. sql/sql_base.cc: Checking of the mixing of table types sql/sql_parse.cc: some fixes
* Merge work:/home/bk/mysql-4.0unknown2001-08-1542-550/+519
|\ | | | | | | | | | | | | | | | | | | | | | | into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0 Docs/manual.texi: Auto merged sql/mysqld.cc: Auto merged sql/sql_repl.cc: Auto merged
| * Fix problem with not getting 'No Database Selected' errorunknown2001-08-152-15/+14
| | | | | | | | | | Docs/manual.texi: Changelog
| * Remove warnings and portability fixesunknown2001-08-1441-535/+505
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New global read lock code Fixed bug in DATETIME with WHERE optimization Made UNION code more general. include/global.h: Remove warning on Linux Alpha include/mysql_com.h: Move some C variables inside extern "C" block. include/mysqld_error.h: New error mesages myisam/mi_write.c: cleanup mysql-test/r/select.result: Fix because of table lists now always has a database argument. mysql-test/r/type_datetime.result: Test for bug with datetime and where optimization mysql-test/r/union.result: Updated result mysql-test/t/type_datetime.test: New test for datetime mysql-test/t/union.test: More testing of error conditions sql/item_sum.cc: Remove warnings on Linux Alpha sql/item_sum.h: Cleanup sql/lock.cc: Cleaned up global lock handling sql/log_event.cc: Removed default arguments from declarations (not allowed in cxx) sql/mysql_priv.h: New prototypes sql/mysqld.cc: Fix for global locks sql/opt_range.cc: Cleanup sql/share/czech/errmsg.txt: New errors sql/share/danish/errmsg.txt: New errors sql/share/dutch/errmsg.txt: New errors sql/share/english/errmsg.txt: New errors sql/share/estonian/errmsg.txt: New errors sql/share/french/errmsg.txt: New errors sql/share/german/errmsg.txt: New errors sql/share/greek/errmsg.txt: New errors sql/share/hungarian/errmsg.txt: New errors sql/share/italian/errmsg.txt: New errors sql/share/japanese/errmsg.txt: New errors sql/share/korean/errmsg.txt: New errors sql/share/norwegian-ny/errmsg.txt: New errors sql/share/norwegian/errmsg.txt: New errors sql/share/polish/errmsg.txt: New errors sql/share/portuguese/errmsg.txt: New errors sql/share/romanian/errmsg.txt: New errors sql/share/russian/errmsg.txt: New errors sql/share/slovak/errmsg.txt: New errors sql/share/spanish/errmsg.txt: New errors sql/share/swedish/errmsg.OLD: New errors sql/share/swedish/errmsg.txt: New errors sql/sql_acl.cc: Use thd->host_or_ip sql/sql_class.cc: Use new global lock code sql/sql_class.h: host_or_ip sql/sql_db.cc: host_or_ip sql/sql_delete.cc: Use now global lock code sql/sql_lex.h: Cleanup of not used states and variables sql/sql_parse.cc: Use now global locks. Made UNION code more general. Change to use thd->hosts_or_ip. TABLE_LIST now always has 'db' set. sql/sql_repl.cc: Portability fixes. Changed wrong usage of my_vsnprintf -> my_snprintf sql/sql_select.cc: Changes for UNION sql/sql_show.cc: Cleanup sql/sql_union.cc: Handle 'select_result' outside of mysql_union(). sql/sql_yacc.yy: Fixes for union
* | merged replication fixes from 3.23unknown2001-08-154-8/+49
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union Docs/manual.texi: merged sql/mini_client.cc: merged sql/mysqld.cc: merged sql/sql_repl.cc: merged
| * improvements for stopping the slave in SLAVE STOP and on shutdownunknown2001-08-153-4/+36
| | | | | | | | | | | | | | | | | | sql/mini_client.cc: alarm around mc_mysql_connect() sql/mysqld.cc: move end_slave() to the earlier part of shutdown sql/sql_repl.cc: retry thr_alarm_kill() in case slave thread missed the signal in SLAVE STOP
| * fixed HUP bug, last fix was not completeunknown2001-08-131-1/+2
| |
| * Merge work:/home/bk/mysqlunknown2001-08-131-3/+10
| |\ | | | | | | | | | | | | | | | | | | into mysql.sashanet.com:/home/sasha/src/bk/mysql
| | * row0sel.c Fix a memory freeing bug when a row which contains an externally ↵unknown2001-08-131-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stored long field in the middle of the row is fetched in a SELECT srv0start.c Allow drive name followed by a ':' in a data file path ha_innobase.cc Allow drive name followed by a ':' in a data file path sql/ha_innobase.cc: Allow drive name followed by a ':' in a data file path innobase/srv/srv0start.c: Allow drive name followed by a ':' in a data file path innobase/row/row0sel.c: Fix a memory freeing bug when a row which contains an externally stored long field in the middle of the row is fetched in a SELECT
* | | Cleanupsunknown2001-08-132-22/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqltest.c: Made mysqltest compatible with 3.23 sql/slave.cc: Marked removable code vio/viossl.c: change to use DBUG_ASSERT
* | | Fix error messages after merge from 3.23unknown2001-08-1321-238/+242
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/mysqld_error.h: Fix error messages mysql-test/t/fulltext.test: Fixed wrong error numbers mysql-test/t/union.test: Update error numbers after merge with 3.23 sql/share/czech/errmsg.txt: Fix of merge sql/share/danish/errmsg.txt: Updated error messages from 3.23 sql/share/dutch/errmsg.txt: Updated error messages from 3.23 sql/share/english/errmsg.txt: Updated error messages sql/share/estonian/errmsg.txt: Fix of merge sql/share/french/errmsg.txt: Fix of merge sql/share/german/errmsg.txt: Fix of merge sql/share/greek/errmsg.txt: Fix of merge sql/share/hungarian/errmsg.txt: Fix of merge sql/share/italian/errmsg.txt: Fix of merge sql/share/japanese/errmsg.txt: Fix of merge sql/share/korean/errmsg.txt: Fix of merge sql/share/norwegian-ny/errmsg.txt: Fix of merge sql/share/norwegian/errmsg.txt: Fix of merge sql/share/polish/errmsg.txt: Fix of merge sql/share/portuguese/errmsg.txt: Updated error messages sql/share/romanian/errmsg.txt: Fix of merge sql/share/russian/errmsg.txt: Fix of merge sql/share/slovak/errmsg.txt: Fix of merge sql/share/spanish/errmsg.txt: Fix of merge sql/share/swedish/errmsg.txt: Fix of merge
* | | Merge sinisa@work.mysql.com:/home/bk/mysql-4.0unknown2001-08-125-75/+142
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0 BitKeeper/etc/ignore: auto-union sql/mysql_priv.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged
| * | | Changes so that CREATE and INSERT work from UNION'sunknown2001-08-125-75/+142
| | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: Added innobase/conftest.s1 innobase/conftest.subs sql/sql_select.cc.orig to the ignore list
* | | | post-merge fixes to make it compile. It still fails the fulltext test,unknown2001-08-1125-10/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (wrong error code) but I'll push it so that Sergei could clean up my merge include/mysqld_error.h: fixed typo mysql-test/r/order_by.result: updated result for merged test sql/Makefile.am: put back sql_union.cc lost during merge sql/mysql_priv.h: restored variables lost in the merge sql/mysqld.cc: put back lost variable declarations sql/share/czech/errmsg.txt: merge fix sql/share/danish/errmsg.txt: merge fix sql/share/dutch/errmsg.txt: merge fix sql/share/english/errmsg.txt: merge fix sql/share/estonian/errmsg.txt: merge fix sql/share/french/errmsg.txt: merge fix sql/share/german/errmsg.txt: merge fix sql/share/greek/errmsg.txt: merge fix sql/share/hungarian/errmsg.txt: merge fix sql/share/italian/errmsg.txt: merge fix sql/share/japanese/errmsg.txt: merge fix sql/share/korean/errmsg.txt: merge fix sql/share/norwegian-ny/errmsg.txt: merge fix sql/share/norwegian/errmsg.txt: merge fix sql/share/polish/errmsg.txt: merge fix sql/share/portuguese/errmsg.txt: merge fix sql/share/romanian/errmsg.txt: merge fix sql/share/russian/errmsg.txt: merge fix sql/share/slovak/errmsg.txt: merge fix sql/share/spanish/errmsg.txt: merge fix sql/share/swedish/errmsg.txt: merge fix sql/sql_acl.cc: merge fix
* | | | mergedunknown2001-08-1110-66/+158
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union BitKeeper/etc/ignore: auto-union acinclude.m4: Auto merged BitKeeper/deleted/.del-rpc_server_ext.h~952741fb85de2b80: Auto merged client/mysqlbinlog.cc: Auto merged mysql-test/r/innodb.result: Auto merged sql-bench/Makefile.am: Auto merged sql/ha_myisam.cc: Auto merged sql/ha_myisammrg.cc: Auto merged sql/sql_list.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged Docs/manual.texi: merge include/mysql_com.h: merge include/mysqld_error.h: merge mysql-test/install_test_db.sh: merge sql/mysql_priv.h: merge sql/mysqld.cc: merge sql/share/czech/errmsg.txt: merge sql/share/danish/errmsg.txt: merge sql/share/dutch/errmsg.txt: merge sql/share/english/errmsg.txt: merge sql/share/estonian/errmsg.txt: merge sql/share/french/errmsg.txt: merge sql/share/german/errmsg.txt: merge sql/share/greek/errmsg.txt: merge sql/share/hungarian/errmsg.txt: merge sql/share/italian/errmsg.txt: merge sql/share/japanese/errmsg.txt: merge sql/share/korean/errmsg.txt: merge sql/share/norwegian-ny/errmsg.txt: merge sql/share/norwegian/errmsg.txt: merge sql/share/polish/errmsg.txt: merge sql/share/portuguese/errmsg.txt: merge sql/share/romanian/errmsg.txt: merge sql/share/russian/errmsg.txt: merge sql/share/slovak/errmsg.txt: merge sql/share/spanish/errmsg.txt: merge sql/share/swedish/errmsg.txt: merge sql/sql_base.cc: merge sql/sql_table.cc: merge
| * | | Merge work:/home/bk/mysqlunknown2001-08-114-488/+24
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.sashanet.com:/home/sasha/src/bk/mysql BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union client/mysqlbinlog.cc: Auto merged
| * | | Portability fix for windowsunknown2001-08-111-0/+4
| | | | | | | | | | | | | | | | | | | | Docs/manual.texi: Changelog
| * | | Merge hundin:/my/mysql into bitch.mysql.fi:/my/mysqlunknown2001-08-111-11/+11
| |\ \ \
| | * | | Made SIGTERM safer for Solarisunknown2001-08-111-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: added */*_pure_*warnings BUILD/compile-solaris-sparc: Optimized build for ultrasparc sql/mysqld.cc: Made SIGTERM safer for Solaris as it sometimes delivered a not catched signal during shutdown
| * | | | Fixed handling of strings in mysqldumpslowunknown2001-08-111-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | scripts/mysqldumpslow.sh: Handling of strings with \ and double '' sql/mysqlbinlog.cc: Fixed type
| * | | Allow myisam-recover="" and --sql-mode=""unknown2001-08-101-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs/manual.texi: Changelog mysql-test/r/distinct.result: new test case mysql-test/r/innodb.result: Fixed result
| * | | mergeunknown2001-08-1033-164/+263
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union innobase/buf/buf0flu.c: Auto merged sql/ha_myisam.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged Docs/manual.texi: Will merge later..
| | * | | Portability fixesunknown2001-08-1030-141/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added record_rnd_buffer Added --safe-user-create Fix for ALTER TABLE RENAME on windows Docs/manual.texi: Changelog and documentation of new features. More information about using threaded client libraries include/mysql_com.h: Added prototype for my_thread_init() include/mysqld_error.h: New error for --safe-create-user innobase/buf/buf0flu.c: Portability fix innobase/include/univ.i: Portability fix mysql-test/t/distinct.test: Test for distinct bug sql/mysql_priv.h: Added record_rnd_buffer sql/mysqld.cc: Added record_rnd_buffer sql/records.cc: Added record_rnd_buffer sql/share/czech/errmsg.txt: New error message for --safe-user-create sql/share/danish/errmsg.txt: New error message for --safe-user-create sql/share/dutch/errmsg.txt: New error message for --safe-user-create sql/share/english/errmsg.txt: New error message for --safe-user-create sql/share/estonian/errmsg.txt: New error message for --safe-user-create sql/share/french/errmsg.txt: New error message for --safe-user-create sql/share/german/errmsg.txt: New error message for --safe-user-create sql/share/greek/errmsg.txt: New error message for --safe-user-create sql/share/hungarian/errmsg.txt: New error message for --safe-user-create sql/share/italian/errmsg.txt: New error message for --safe-user-create sql/share/japanese/errmsg.txt: New error message for --safe-user-create sql/share/korean/errmsg.txt: New error message for --safe-user-create sql/share/norwegian-ny/errmsg.txt: New error message for --safe-user-create sql/share/norwegian/errmsg.txt: New error message for --safe-user-create sql/share/polish/errmsg.txt: New error message for --safe-user-create sql/share/portuguese/errmsg.txt: New error message for --safe-user-create sql/share/romanian/errmsg.txt: New error message for --safe-user-create sql/share/russian/errmsg.txt: New error message for --safe-user-create sql/share/slovak/errmsg.txt: New error message for --safe-user-create sql/share/spanish/errmsg.txt: New error message for --safe-user-create sql/share/swedish/errmsg.txt: New error message for --safe-user-create sql/sql_acl.cc: Checking of privileges for --safe-user-create sql/sql_acl.h: --safe-user-create sql/sql_base.cc: --safe-user-create sql/sql_parse.cc: --safe-user-create sql/sql_show.cc: --safe-user-create sql/sql_table.cc: Fix for ALTER TABLE RENAME on windows
| | * | | Fixed bug in ALTER TABLE for MERGE tablesunknown2001-08-104-22/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Portability fixes Fixed problem when giving wrong arguments to myisam_recover Fix to remove warnings when using purify BUILD/compile-solaris-sparc-purify: Added innodb and berkeleydb to test mysql-test/install_test_db.sh: Portability fix. sql/ha_myisam.cc: Fixed problem when giving wrong arguments to myisam_recover sql/ha_myisammrg.cc: Fixed bug in ALTER TABLE for MERGE tables sql/sql_list.h: Fix to remove warnings when using purify sql/sql_select.cc: Fix to remove warnings from purify BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | | Fixed bug in show variables, it didn't show whether slow-query wasunknown2001-08-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enabled or not. sql/mysqld.cc: Added notification to "show variables" whether slow-query-log is enabled or not.
| * | | | New dutch error message file.unknown2001-08-101-120/+124
| | | | | | | | | | | | | | | | | | | | | | | | | sql/share/dutch/errmsg.txt: New dutch error messages.
| * | | | Merge jamppa@work:/home/bk/mysql into hynda.mysql.fi:/data/my/bk/mysqlunknown2001-08-101-2/+2
| |\ \ \ \
| | * | | | changed variable display from string to int (bits) for myisam-recoverunknown2001-08-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and sql-mode options. sql/mysqld.cc: Changed the sql-mode to be shown as a number (bits) instead of a string.
* | | | | | Merge work:/home/bk/mysql-4.0unknown2001-08-111-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0 BitKeeper/etc/logging_ok: auto-union libmysql/libmysql.c: Auto merged sql/mysqld.cc: Auto merged
| * | | | | | Embedded mysql fixes.unknown2001-08-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is now a mysql_server_init() function which needs to be called at the beginning of the program (and _end() for the end of the program). This routine handles argument parsing for the embedded server. Use the embedded version of mysql_load_file() (ignore the LOCAL argument, since the client and server are the same program). There are now mysql_thread_init/end() functions for the client to use in a multi-threaded app. They are just wrappers for my_thread_init/end(). BitKeeper/deleted/.del-README~434e9cae5fa9a4c4: Delete: libmysqld/README libmysqld/lib_load.cc: minor cleanup include/mysql.h: add mysql_server/thread_init/end() libmysql/libmysql.c: add mysql_server/thread_init/end() libmysqld/lib_sql.cc: add mysql_server/thread_init/end() libmysqld/libmysqld.c: add mysql_server/thread_init/end() sql/mysqld.cc: allow get_options() to be called more than once libmysqld/Makefile.am: use lib_load.cc instead of sql_load.cc BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | | | | temp commit working on a mergeunknown2001-08-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqlbinlog.cc: remove unused variables sql/log_event.h: fix bad merge