summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Collapse)AuthorAgeFilesLines
* Added code to flush a bulk_insert index.unknown2002-09-182-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug when doing multi-row inserts on table with an auto_increment key that is not in the first key segment. Docs/manual.texi: Changelog include/my_base.h: Added code to flush a bulk_insert index myisam/mi_extra.c: Added code to flush a bulk_insert index mysql-test/r/insert.result: test of auto_increment and bulk_insert mysql-test/t/insert.test: test of auto_increment and bulk_insert sql/ha_myisam.cc: Added code to flush a bulk_insert index sql/sql_insert.cc: Mark that bulk_insert is used sql/sql_load.cc: Mark that bulk_insert is used Remove duplicated call to initialize bulk insert sql/table.h: Mark that bulk_insert is used vio/viosslfactories.c: Remove compiler warning
* Update mysql-test results after mergeunknown2002-09-181-0/+10
| | | | | | | | | | | | | include/my_sys.h: Portability fix include/sslopt-longopts.h: Better help for --ssl mysql-test/r/binary.result: Update results after merge mysys/my_malloc.c: Portability fix sql/udf_example.cc: Use longlong instead of 'long long' to make things works on windows
* merge with 3.23.53 (only code cleanup and new test case)unknown2002-09-181-0/+10
|\ | | | | | | | | | | | | | | | | | | | | Docs/manual.texi: Auto merged mysql-test/t/binary.test: Auto merged mysql-test/r/binary.result: merge with 3.23.53 sql/item_strfunc.h: Code cleanup
| * Fixed bug with BINARY NULLunknown2002-09-182-0/+14
| | | | | | | | | | | | | | | | | | Docs/manual.texi: ChangeLog mysql-test/r/binary.result: Test of binary NULL mysql-test/t/binary.test: Test of binary NULL
| * Mergeunknown2002-09-031-1/+2
| |\ | | | | | | | | | | | | Docs/manual.texi: SCCS merged
| | * Fixed bug introduces by last changesetunknown2002-09-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Fixing of problem with ALTER TABLE on BDB tables) mysql-test/r/distinct.result: Fixed results after bug fix sql/mysql_priv.h: Split close_thread_tables() into two functions. (Needed for bug fix from 4.0) sql/sql_base.cc: Split close_thread_tables() into two functions. (Needed for bug fix from 4.0)
| * | LOCK+modify+OPTIMIZE bugfixunknown2002-08-312-0/+13
| |/
* | Mergeunknown2002-09-182-0/+29
|\ \ | | | | | | | | | | | | Docs/manual.texi: SCCS merged
| * \ Mergeunknown2002-09-172-0/+29
| |\ \ | | | | | | | | | | | | | | | | Docs/manual.texi: SCCS merged
| | * | ft-boolean + ORDER BY (ftb tree reusing) bugunknown2002-09-172-0/+29
| | | |
* | | | fixed so that --ssl and --skip-ssl works with the MySQL clients.unknown2002-09-172-0/+14
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed core dump bug when sending wrong string to AES_DECRYPT() BitKeeper/deleted/.del-explain_log.sh~e570be5f63576fe1: Delete: scripts/explain_log.sh Docs/manual.texi: Updated bug reporting. Added somew new changelog entries and changed some old client/mysql.cc: Fixed so that --ssl and --skip-ssl works client/mysqladmin.c: Fixed so that --ssl and --skip-ssl works client/mysqlcheck.c: Fixed so that --ssl and --skip-ssl works client/mysqldump.c: Fixed so that --ssl and --skip-ssl works client/mysqlimport.c: Fixed so that --ssl and --skip-ssl works client/mysqlshow.c: Fixed so that --ssl and --skip-ssl works include/sslopt-case.h: Fixed so that --ssl and --skip-ssl works mysql-test/r/func_str.result: Test of problem with AES_DECRYPT() mysql-test/t/func_str.test: Test of problem with AES_DECRYPT() mysys/my_aes.c: Fixed problem with wrong decrypt string. scripts/mysql_explain_log.sh: Applied missed patch sql/item_strfunc.cc: Fixed aes_encrypt() and aes_decrypt() to be safer and avoid some mallocs() sql/net_pkg.cc: Return ER_UNKNOWN_ERROR instead of errocode 0 in some cases.
* | | Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0unknown2002-09-166-3/+80
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs/manual.texi: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_innodb.h: Auto merged
| * | | Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tablesunknown2002-09-166-3/+80
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug in SELECT ... ORDER BY ... LIMIT Fixed bug in ALTER TABLE and RENAME TABLE with --lower-case-table-names Fixed hang when using --with-openssl Docs/manual.texi: Updated SHOW VARIABLES Changelog Moved some missplaced changelog entries include/violite.h: updated prototypes libmysqld/lib_sql.cc: Moved init_update_queries() to sql_parse.cc mysql-test/install_test_db.sh: Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tables mysql-test/r/grant.result: Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tables mysql-test/t/grant.test: Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tables scripts/mysql_fix_privilege_tables.sh: Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tables scripts/mysql_install_db.sh: Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tables sql/filesort.cc: Fixed bug in SELECT ... ORDER BY ... LIMIT sql/mysql_priv.h: New prototypes sql/mysqld.cc: Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tables sql/sql_acl.cc: Moved init_update_queries() to sql_parse.cc Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host sql/sql_acl.h: Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host sql/sql_parse.cc: Moved init_update_queries() to sql_parse.cc sql/sql_show.cc: Fixed wrong output in SHOW TABLE STATUS for compressed tables. sql/sql_table.cc: Fixed bug in ALTER TABLE and RENAME TABLE with --lower-case-table-names vio/viosocket.c: Fixed hang when using --with-openssl vio/viossl.c: Fixed hang when using --with-openssl
* | | Fix MySQL Test so it will not depend on current host in log file naming.unknown2002-09-153-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/rpl_flush_log_loop.result: Fix result mysql-test/t/rpl_flush_log_loop-master.opt: Fix master options mysql-test/t/rpl_flush_log_loop-slave.opt: Fix slave options
* | | Merge mysql.com:/home/pz/mysql/mysql-4.0-rootunknown2002-09-1421-107/+183
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/pz/mysql/mysql-4.0 BitKeeper/deleted/.del-rpl_flush_log_loop-master.opt: Delete: mysql-test/t/rpl_flush_log_loop-master.opt BitKeeper/deleted/.del-rpl_flush_log_loop-slave.opt: Delete: mysql-test/t/rpl_flush_log_loop-slave.opt BitKeeper/deleted/.del-rpl_flush_log_loop.test: Delete: mysql-test/t/rpl_flush_log_loop.test
| * | mergeunknown2002-09-1119-95/+169
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysys/thr_alarm.c: Auto merged sql/sql_table.cc: Auto merged Docs/manual.texi: merge (Removed bug fix comments for not relesed version)
| | * | Portability fixes.unknown2002-09-1119-95/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve mysql-test to be more robust. Fix that GRANT doesn't delete SSL options Change innobase_flush_log_at_trx_commit to uint. Don't rotate logs if we read a rotate log entry from the master. Docs/manual.texi: Changelog client/mysqlbinlog.cc: Handle empty binlogfiles gracefully client/mysqltest.c: Do a sleep after 'sync_with_master' Cleaned up sleep() handling. Free all memory on exit configure.in: Fix for Mac OS 10.2 include/my_sys.h: Added my_strdup_with_length() innobase/btr/btr0cur.c: Fixed wrong printf() libmysql/libmysql.c: Added DBUG_PRINT statements. Assume that mysql_...send() functions has correct query length. mysql-test/mysql-test-run.sh: Properly remove log files before starting new tests. mysql-test/r/grant.result: Update for new test results mysql-test/r/innodb.result: Update for new test results mysql-test/r/myisam.result: Update for new test results mysql-test/r/rpl_log.result: Update for new test results mysql-test/r/rpl_rotate_logs.result: Update for new test results mysql-test/r/variables.result: Update for new test results mysql-test/t/grant.test: Test that GRANT doesn't delete SSL options mysql-test/t/myisam.test: Test long key usage mysql-test/t/rpl_log.test: Disable 'show new master' mysql-test/t/rpl_mystery22.test: Longer sleep for more safety. mysql-test/t/rpl_rotate_logs.test: More comments mysys/my_malloc.c: Added my_strdup_with_length() mysys/safemalloc.c: Added my_strdup_with_length() mysys/thr_alarm.c: Fix of alarms for windows. sql/ha_innodb.cc: Change innobase_flush_log_at_trx_commit to uint mysql-test/r/rpl_redirect.result: Updated test results mysql-test/t/rpl_redirect.test: Added more tests to improve code coverage. sql/ha_innodb.h: Change innobase_flush_log_at_trx_commit to uint sql/item_func.cc: Return GLOBAL and SESSION as part of column names sql/log.cc: Only write STOP events when server goes down. sql/log_event.cc: Don't rotate logs if we read a rotate log entry from the master. sql/log_event.h: Change ident_len to uint (more efficient) sql/mysqld.cc: Change innobase_flush_log_at_trx_commit to uint sql/net_serv.cc: More debug output sql/repl_failsafe.cc: More DEBUG Search until we find next position in binary log (and not only =) sql/slave.cc: More DBUG & comments Don't rotate the binary log on master flush logs sql/slave.h: indentation change sql/sql_acl.cc: Test that GRANT doesn't delete SSL options sql/sql_parse.cc: Disable show_new_master. sql/sql_repl.cc: Chamger show_binlog_events() to use my_error() sql/sql_table.cc: Fixed check for too long keys in MyISAM sql/sql_udf.cc: Fix udf handling
| * | | bugfix: DISTINCT with const_item in ORDER BYunknown2002-09-102-8/+31
| |/ /
* | | Merge mysql.com:/home/pz/mysql/mysql-4.0-rootunknown2002-09-065-0/+30
|\ \ \ | |/ / |/| | | | | | | | | | | | | | into mysql.com:/home/pz/mysql/mysql-4.0
| * | Repeatable test case in mysql-test format for flush-logs problem withunknown2002-09-055-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | bi-directional replication. No result file provided as there is no good one known :)
* | | Mergeunknown2002-09-053-7/+69
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged Docs/manual.texi: SCCS merged
| * | | Fixed searching after ssl directories.unknown2002-09-053-7/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed that GRANT ... REQUIRE options are not forgot when doing new GRANT Changed fn_ext to point at first '.' after directory. FLUSH LOGS removed numerical extension for all future update logs. Fixed the mysqld --help reports right values for --datadir and --bind-address --log-binary=a.b.c now properly strips of .b.c Fix that one can DROP UDF functions that was not loaded at startup Made AND optional in REQUIRE Added REQUIRE NONE BitKeeper/deleted/.del-CodingStyle~1ba7ff62d4cd0ea: Delete: vio/docs/CodingStyle BitKeeper/deleted/.del-COPYING.dbug~ca0c017a4d7e8609: Delete: vio/docs/COPYING.dbug BitKeeper/deleted/.del-COPYING.mysql~471498c82977cd3a: Delete: vio/docs/COPYING.mysql BitKeeper/deleted/.del-README~947354991dc882f8: Delete: vio/docs/README Docs/manual.texi: Changelog acinclude.m4: Fixed searching after ssl directories. client/Makefile.am: Moved openssl include to avoid problem with installed readline include/Makefile.am: Install my_global.h include/violite.h: Fixed that GRANT ... REQUIRE options are not forgot when doing new grant libmysqld/examples/Makefile.am: Moved openssl include to avoid problem with installed readline mysql-test/mysql-test-run.sh: Improved 'which' handling to give error if command is not found mysys/mf_fn_ext.c: Changed fn_ext to point at first '.' after directory. sql/Makefile.am: More comments sql/lex.h: Added NONE as keyword sql/log.cc: FLUSH LOGS removed numerical extension for all future update logs. Simple code cleanup sql/mysqld.cc: Fixed the --help reports right values for --datadir and --bind-address --log-binary=a.b.c now properly strips of .b.c Removed option --skip-external-locking (not needed as this is automatic) sql/repl_failsafe.cc: Moved some common THD initalization to store_globals() sql/slave.cc: Moved openssl include to avoid problem with installed readline sql/sql_acl.cc: Moved openssl include to avoid problem with installed readline sql/sql_acl.h: Updated function prototypes sql/sql_base.cc: Added comment sql/sql_class.cc: Moved openssl include to avoid problem with installed readline. Changed THD::thd to make things work for main thread. sql/sql_class.h: Fixed wrongly removed line (fixes compiler problem on MacOSX) sql/sql_insert.cc: Moved openssl include to avoid problem with installed readline sql/sql_lex.cc: Moved save_to_cache_query=0 to udf detection function to make sql_yacc.yy simpler sql/sql_lex.h: Indentation cleanup sql/sql_parse.cc: Moved openssl include to avoid problem with installed readline. Added THD argument to acl_reload() sql/sql_repl.h: Made opt_bin_logname static sql/sql_udf.cc: Fix that one can DROP UDF functions that was not loaded at startup sql/sql_yacc.yy: made AND optional in REQUIRE Added REQUIRE NONE Fixed that old SSL options are not forgotten when doing new GRANT. sql/udf_example.cc: Improved comments
* | | | Fixed typo in Heikkis last push.unknown2002-09-051-1/+1
| |/ / |/| | | | | | | | | | | | | | | | | mysql-test/r/innodb.result: Fixed Innodb results after Heikki's last push sql/ha_innodb.cc: Fixed type in Heikki's last push
* | | a small bug fixunknown2002-09-042-0/+8
| | |
* | | Change of test caseunknown2002-09-042-18/+12
|/ /
* | a fix for a bug with all_fields.elements not being changed by unknown2002-09-032-0/+20
| | | | | | | | | | | | | | expansion of the wildcards
* | Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0unknown2002-09-0311-16/+54
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs/manual.texi: Auto merged sql/mysqld.cc: Auto merged sql/sql_table.cc: Auto merged
| * | Some trivial optimzationsunknown2002-09-0311-16/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if AND/OR expression can be NULL; Fixed bug in GROUP BY and-or-expression where expression could be NULL Bug fix for SHOW OPEN TABLES when user didn't have privilege to access all open tables. Better fix for ALTER TABLE on BDB tables. Docs/manual.texi: Changelog client/mysql.cc: Simple optimization libmysql/libmysql.c: Removed initialization of varibles that are already set to zero myisam/myisamchk.c: Fixed comment for extend-check mysql-test/r/bdb-alter-table-1.result: Updated results mysql-test/r/bdb-alter-table-2.result: Updated results mysql-test/r/distinct.result: Updated results after bug fix mysql-test/r/handler.result: Updated results mysql-test/r/innodb_handler.result: Updated results mysql-test/r/select.result: Updated results mysql-test/r/varbinary.result: Updated results mysql-test/t/bdb-alter-table-1.test: Added comments mysql-test/t/bdb-alter-table-2.test: Added comments mysql-test/t/select.test: Remove OPTION in SET OPTION Added tests for ORDER BY key LIMIT sql/item_cmpfunc.cc: Check if AND/OR expression can be NULL sql/mysqld.cc: mysqld --help now shows value of datadir sql/share/english/errmsg.txt: Better error message for syntax error sql/sql_base.cc: Bug fix for SHOW OPEN TABLES sql/sql_class.cc: Moved virtual function to .cc file to avoid that we have to include assert.h everywhere. sql/sql_class.h: Moved virtual function to .cc file to avoid that we have to include assert.h everywhere. sql/sql_parse.cc: Removed old dead code from 3.23 sql/sql_select.cc: Improved optimization of ORDER BY key LIMIT sql/sql_table.cc: More comments, Better fix for ALTER TABLE on BDB tables.
* | | protected close_cached_table() call in REPAIR ... USE_FRM with a mutexunknown2002-09-012-0/+15
|/ / | | | | | | | | | | | | | | test for REPAIR ... USE_FRM added sql/sql_table.cc: protected close_cached_table() call in REPAIR ... USE_FRM with a mutex
* | mergedunknown2002-08-314-0/+23
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union Build-tools/Do-compile: Auto merged Docs/manual.texi: Auto merged innobase/configure.in: Auto merged innobase/os/os0file.c: Auto merged innobase/os/os0thread.c: Auto merged innobase/pars/lexyy.c: Auto merged innobase/pars/pars0grm.c: Auto merged innobase/pars/pars0grm.y: Auto merged innobase/pars/pars0lex.l: Auto merged innobase/row/row0mysql.c: Auto merged
| * Mergeunknown2002-08-314-0/+23
| |\ | | | | | | | | | | | | Docs/manual.texi: SCCS merged
| | * Little but nasty bug with BDB and alter tableunknown2002-08-284-0/+23
| | |
* | | LOCK+change+OPTIMIZE MyISAM bugunknown2002-08-314-21/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | myisam/mi_delete_all.c: reverting the wrong bugfix mysql-test/r/delete.result: moving the test case to where it belongs mysql-test/t/delete.test: moving the test case to where it belongs
* | | Merge sinisa@work.mysql.com:/home/bk/mysql-4.0unknown2002-08-302-0/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.0
| * | | A nasty fix when all rows are deleted with a write lockunknown2002-08-302-0/+21
| | | | | | | | | | | | | | | | | | | | sql/mysqld.cc: Some spelling checking error corrections a la Paul Dubois
* | | | fixed tests to be independed from environmentunknown2002-08-3029-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/binary.result: fixed test to be independed from environment mysql-test/r/delayed.result: fixed test to be independed from environment mysql-test/r/fulltext_left_join.result: fixed test to be independed from environment mysql-test/r/func_group.result: fixed test to be independed from environment mysql-test/r/func_in.result: fixed test to be independed from environment mysql-test/r/key_primary.result: fixed test to be independed from environment mysql-test/r/lock_multi.result: fixed test to be independed from environment mysql-test/r/odbc.result: fixed test to be independed from environment mysql-test/r/type_set.result: fixed test to be independed from environment mysql-test/r/type_time.result: fixed test to be independed from environment mysql-test/r/type_timestamp.result: fixed test to be independed from environment mysql-test/r/type_year.result: fixed test to be independed from environment mysql-test/r/varbinary.result: fixed test to be independed from environment mysql-test/r/warnings.result: fixed test to be independed from environment mysql-test/t/binary.test: fixed test to be independed from environment mysql-test/t/delayed.test: fixed test to be independed from environment mysql-test/t/flush_table.test: fixed test to be independed from environment mysql-test/t/fulltext_left_join.test: fixed test to be independed from environment mysql-test/t/func_group.test: fixed test to be independed from environment mysql-test/t/func_in.test: fixed test to be independed from environment mysql-test/t/key_primary.test: fixed test to be independed from environment mysql-test/t/lock_multi.test: fixed test to be independed from environment mysql-test/t/odbc.test: fixed test to be independed from environment mysql-test/t/type_set.test: fixed test to be independed from environment mysql-test/t/type_time.test: fixed test to be independed from environment mysql-test/t/type_timestamp.test: fixed test to be independed from environment mysql-test/t/type_year.test: fixed test to be independed from environment mysql-test/t/varbinary.test: fixed test to be independed from environment mysql-test/t/warnings.test: fixed test to be independed from environment
* | | | truncate test made independed from environmentunknown2002-08-302-0/+2
|/ / /
* | | Give better error from reconnect()unknown2002-08-243-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed hang in start_slave_threads() when thread dies quickly. Docs/manual.texi: Changelog client/mysqltest.c: Indentation cleanup More DBUG info libmysql/libmysql.c: More DBUG info Give better error from reconnect() mysql-test/r/rpl_rotate_logs.result: Update results mysql-test/t/rpl_log_pos.test: Fix for fast machines mysql-test/t/rpl_rotate_logs.test: Updated test to be more portable scripts/mysql_zap.sh: Update for MacOSX sql/mini_client.cc: Better error messages from reconnect. Indentation cleanups sql/slave.cc: Fixed hang in start_slave_threads() when thread dies quickly. sql/slave.h: Fixed hang in start_slave_threads() when thread dies quickly.
* | | merge with 3.23unknown2002-08-246-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union mysql-test/t/rpl_rotate_logs.test: Auto merged mysql-test/t/rpl_rotate_logs-master.opt: Auto merged mysql-test/t/rpl_rotate_logs-slave-master-info.opt: Auto merged mysql-test/t/rpl_rotate_logs-slave.sh: Auto merged
| * | Added testing of temporary tables with replicationunknown2002-08-236-11/+57
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/rpl_rotate_logs-master.opt: Rename: mysql-test/t/rpl000016-master.opt -> mysql-test/t/rpl_rotate_logs-master.opt mysql-test/t/rpl_rotate_logs-slave.sh: Rename: mysql-test/t/rpl000016-slave.sh -> mysql-test/t/rpl_rotate_logs-slave.sh mysql-test/t/rpl_rotate_logs-slave-master-info.opt: Rename: mysql-test/t/rpl000016-slave-master-info.opt -> mysql-test/t/rpl_rotate_logs-slave-master-info.opt BitKeeper/etc/ignore: Added mit-pthreads/include/bits mit-pthreads/include/pthread/machdep.h mit-pthreads/include/pthread/posix.h mit-pthreads/include/sys mit-pthreads/machdep.c mit-pthreads/pg++ mit-pthreads/pgcc sql-bench/innotest1 sql-bench/innotest1a sql-bench/innotest1b sql-bench/innotest2 sql-bench/innotest2a sql-bench/innotest2b to the ignore list mysql-test/r/rpl_rotate_logs.result: Added testing of temporary tables mysql-test/t/rpl000018.test: Commented test mysql-test/t/rpl_rotate_logs.test: Added testing of temporary tables
* | Removed wrong mutex lock (hangup in kill on HPUX)unknown2002-08-242-14/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | all free_defaults() on exit in mysql.cc; Should fix problem with SSL Docs/manual.texi: Added information about --skip-innodb client/mysql.cc: Call free_defaults() on exit client/mysqladmin.c: Call free_defaults() on exit client/mysqlimport.c: Call free_defaults() on exit mysql-test/r/rpl000016.result: Added testing of temporary tables with binary log rotation mysql-test/t/rpl000016.test: Added testing of temporary tables with binary log rotation sql/log.cc: Remove not used variable sql/sql_class.h: Removed wrong mutex lock (hangup in kill on HPUX)
* | Changed relay_log_space to ulonglongunknown2002-08-231-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed compiler warnings. Build-tools/Do-compile: Simple cleanup include/mysql.h: Use #include "" instead of include <> mysql-test/t/innodb_handler.test: Documented test Change to be runnable from mysql sql/mini_client.cc: Removed dead code sql/mysqld.cc: Changed relay_log_space to ulonglong sql/slave.cc: Changed relay_log_space to ulonglong Removed dead code sql/slave.h: Changed relay_log_space to ulonglong sql/sql_acl.cc: Removed not used variables sql/sql_base.cc: Removed not used variables sql/sql_cache.cc: Removed not used variables sql/sql_select.cc: Removed not used variables vio/vio.c: Re-order include files to remove compiler warnings
* | Fixed bug in wait_for_update() that I had introduced.unknown2002-08-223-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed option variables to my_bool (to avoid bugs in my_getopt()) Added new thread specific mutex LOCK_delete to be able to free LOCK_thread_count early. Changed usage of LOCK_thread_count -> LOCK_status for statistics variables libmysqld/lib_sql.cc: Removed not needed LOCK mysql-test/mysql-test-run.sh: Log name of running test mysql-test/r/rpl_sporadic_master.result: Cleaned up test mysql-test/t/rpl_sporadic_master.test: cleaned up test sql/log.cc: Cleanup. Fixed bug in wait_for_update() that I had introduced. sql/mini_client.cc: Indentation changes. sql/mysql_priv.h: Changed option variables to my_bool. sql/mysqld.cc: Changed option variables to my_bool. Removed not used LOCK_server_id Minor code cleanups. sql/repl_failsafe.cc: Minor code cleanups sql/slave.cc: Minor code cleanups. Fixed usage of wait_for_update(). sql/slave.h: Changed option variables to my_bool. sql/sql_class.cc: Added new thread specific mutex LOCK_delete to be able to free LOCK_thread_count early sql/sql_class.h: Added new thread specific mutex LOCK_delete to be able to free LOCK_thread_count early sql/sql_insert.cc: Do broadcast after unlock() sql/sql_parse.cc: Removed not needed LOCK Changed usage of LOCK_thread_count -> LOCK_status for statistics variables Changed killing of threads to not lock LOCK_thread_count for long. sql/sql_repl.cc: Changed options variables to my_bool Fixed usage of wait_for_update() Fixed loop to kill slaves to not lock LOCK_thread_count for long. Code optimization. sql/sql_repl.h: bool -> my_bool Fixed KICK_SLAVE to use LOCK_delete
* | Merge work:/home/bk/mysql-4.0unknown2002-08-214-13/+209
|\ \ | | | | | | | | | | | | | | | | | | into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
| * \ Merge work:/home/bk/mysql-4.0unknown2002-08-214-13/+209
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
| | * | InnoDB support for HANDLERunknown2002-08-214-13/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/innodb.result: remove handler test from innodb.test mysql-test/t/innodb.test: remove handler test from innodb.test sql/ha_innodb.cc: HANDLER support sql/ha_innodb.h: HANDLER support sql/handler.h: HANDLER support for InnoDB sql/sql_handler.cc: HANDLER support for InnoDB
* | | | Use our version of RWLOCKS on UNIXWARE 7unknown2002-08-215-28/+57
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More DBUG info for replication Better error messages from replication Fixed bug in replication code when connecting to 'localhost' (time was not released properly) Block ALARM signal on Linux for signal handler thread (Fixes problem with running mysqld with --debug) Removed warning when setting an AUTO_INCREMENT field to NULL Build-tools/Do-compile: Always run test with --warnings during build Docs/manual.texi: Changelog configure.in: Use our version of RWLOCKS on UNIXWARE 7 include/my_pthread.h: Use our version of RWLOCKS on UNIXWARE 7 include/mysql_version.h.in: Fixed warning when compiling embedded server include/mysqld_error.h: New error messages libmysql/libmysql.c: Give connect error message on reconnect if it fails. Fixed possible buffer overflow in expand_error() Added error messages for some error conditions. mysql-test/mysql-test-run.sh: Portability fixes: - Search after 'time' in path. - Search after mysqld in libexec - Remove end / when doing rm -r (fix for BSD) Clean up skip_test handling. mysql-test/r/rpl_empty_master_crash.result: New results mysql-test/t/rpl_empty_master_crash.test: Extended test mysys/mf_iocache.c: Remember file position on failed read. mysys/mf_iocache2.c: Fixed bug in filelength() call. mysys/thr_alarm.c: Made alarm handling more threadsafe when use with DBUG. mysys/thr_mutex.c: More debug info sql/log_event.cc: More DBUG_PRINT statements. sql/mini_client.cc: Better error reporting on failures. Return connect error on reconnect failure (instead of SERVER_GONE_ERROR) Fixed critical bug in alarm handling on connect (could leave an alarm event on indefinitely) sql/mysql_priv.h: Fixed arguments to mysql_binlog_send() sql/mysqld.cc: Block ALARM signal on Linux for signal handler thread (Fixes problem with running mysqld with --debug) sql/net_pkg.cc: Removed dead code sql/net_serv.cc: Ensure that last_errno is set in net_real_write() sql/repl_failsafe.cc: Code cleanup. Better error handling. sql/share/czech/errmsg.txt: New error messages. sql/share/danish/errmsg.txt: New error messages. sql/share/dutch/errmsg.txt: New error messages. sql/share/english/errmsg.txt: New error messages. sql/share/estonian/errmsg.txt: New error messages. sql/share/french/errmsg.txt: New error messages. sql/share/german/errmsg.txt: New error messages. sql/share/greek/errmsg.txt: New error messages. sql/share/hungarian/errmsg.txt: New error messages. sql/share/italian/errmsg.txt: New error messages. sql/share/japanese/errmsg.txt: New error messages. sql/share/korean/errmsg.txt: New error messages. sql/share/norwegian-ny/errmsg.txt: New error messages. sql/share/norwegian/errmsg.txt: New error messages. sql/share/polish/errmsg.txt: New error messages. sql/share/portuguese/errmsg.txt: New error messages. mysql-test/r/rpl_log_pos.result: Updated results mysql-test/t/rpl_log_pos.test: Added 'sleep' commands to make tests repeatable. sql/share/romanian/errmsg.txt: New error messages. sql/share/russian/errmsg.txt: New error messages. sql/share/slovak/errmsg.txt: New error messages. sql/share/spanish/errmsg.txt: New error messages. sql/share/swedish/errmsg.txt: New error messages. sql/share/ukrainian/errmsg.txt: New error messages. sql/slave.cc: Code optimization and cleanup. More DBUG statements. Better cleanup if start slave fails. Better error messages from 'fetch_master_table' Thread safer handling of 'wait_for_pos' sql/slave.h: Better handling of wait_for_pos sql/sql_load.cc: Removed warning when setting an AUTO_INCREMENT field to NULL sql/sql_parse.cc: Fixed calling of function that has changed. sql/sql_repl.cc: More DBUG statements Give a proper error number from mysql_binlog_send() so that we know when we have to abort slaves.
* | | Fixed timing problem with rpl000001 replication test.unknown2002-08-184-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed configure problems with HPUX and openbsd SHOW SLAVE STATUS returns empty set if slave is not initialized SHOW MASTER STATUS returns empty set if binary logging is not enabled. Fixed shutdown problem on Solaris. BitKeeper/deleted/.del-set_var.cc~5374527de1955359: Delete: libmysqld/set_var.cc BitKeeper/etc/ignore: added libmysqld/set_var.cc Build-tools/Do-compile: Remove warnings from touch during compilation Docs/manual.texi: Changelog client/mysqltest.c: Added real_sleep command configure.in: Fixed type for HPUX10 innobase/configure.in: Fixed type for openbsd libmysql/libmysql.c: Fix for new SHOW SLAVE STATUS myisam/mi_update.c: Update key file if using external locking mysql-test/mysql-test-run.sh: Safety fix mysql-test/r/rpl000015.result: Update for new SHOW SLAVE STATUS mysql-test/r/rpl_empty_master_crash.result: Update for new SHOW SLAVE STATUS mysql-test/t/rpl000001.test: sleep -> real_sleep to avoid timing problem sql/mysqld.cc: Fixed bug with SIGTERM on Solaris sql/slave.cc: SHOW SLAVE STATUS returns empty sets if slave is not initialized. sql/sql_repl.cc: SHOW MASTER STAT returns empty set if no binary logging.
* | | Fixed bug in SAFEMALLOC for systems that requires longlong data to be ↵unknown2002-08-172-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aligned on 8 byte boundaries (like sparc) Removed thread marking of safemalloc blocks (becasue of alignment problems) Temporary fix for bigint comparison. configure.in: Added size checking of char* BitKeeper/etc/ignore: Added sql-bench/innotest1 sql-bench/innotest1a sql-bench/innotest1b sql-bench/innotest2 sql-bench/innotest2a sql-bench/innotest2b to the ignore list mysql-test/r/select.result: Cleaned up test mysql-test/t/select.test: Cleaned up test mysys/my_static.h: Fixed bug in SAFEMALLOC for systems that requires longlong data to be aligned on 8 byte boundaries (like sparc) mysys/safemalloc.c: Fixed bug in SAFEMALLOC for systems that requires longlong data to be aligned on 8 byte boundaries (like sparc) sql/field.h: Temporary fix for bigint comparison. sql/gen_lex_hash.cc: Smaller hash table sql/item_cmpfunc.cc: Cleanup sql/mysqld.cc: Removed thread marking of safemalloc blocks (becasue of alignment problems) sql/opt_range.cc: Comment
* | | mergeunknown2002-08-172-0/+23
|\ \ \ | |/ /