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
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.
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
Reverted the change which allowed use of HA_READ_PREFIX_LAST in InnoDB
sql/ha_innodb.cc:
Reverted the change which allowed use of HA_READ_PREFIX_LAST in InnoDB
sql/ha_innodb.h:
Reverted the change which allowed use of HA_READ_PREFIX_LAST in InnoDB
Add some comments
ha_innodb.h:
Remove the flag HA_NOT_READ_PREFIX_LAST from ha_innodb.h: InnoDB has supported this from the start, but not tested yet
sql/ha_innodb.h:
Remove the flag HA_NOT_READ_PREFIX_LAST from ha_innodb.h: InnoDB has supported this from the start, but not tested yet
sql/ha_innodb.cc:
Add some comments
Some optimization to reduce rules number in sql_yacc.yy
mysql-test/r/create.result:
Now table and database inhirited a character set from a level above at CREATE time
mysql-test/r/fulltext.result:
Now table and database inhirited a character set from a level above at CREATE time
mysql-test/r/innodb.result:
Now table and database inhirited a character set from a level above at CREATE time
mysql-test/r/merge.result:
Now table and database inhirited a character set from a level above at CREATE time
mysql-test/r/show_check.result:
Now table and database inhirited a character set from a level above at CREATE time
mysql-test/r/symlink.result:
Now table and database inhirited a character set from a level above at CREATE time
mysql-test/r/type_enum.result:
Now table and database inhirited a character set from a level above at CREATE time
mysql-test/r/type_set.result:
Now table and database inhirited a character set from a level above at CREATE time
sql/sql_yacc.yy:
Now table and database inhirited a character set from a level above at CREATE time
Some optimization to reduce rules number
Fix the crash in InnoDB when WHERE primarykey < x ORDER BY primarykey is used
sql/opt_range.cc:
Fix the crash in InnoDB when WHERE primarykey < x ORDER BY primarykey is used
Build-tools/Do-compile:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
innobase/trx/trx0undo.c:
Auto merged
sql/ha_innodb.h:
Auto merged
Docs/manual.texi:
merge
sql/ha_innodb.cc:
merge
sql/mysqld.cc:
merge
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
update help innobase_flush_log_at_trx_commitcan have vals 0, 1, 2
ha_innobase.h, ha_innobase.cc:
make innobase_flush_log_at_trx_commit a long, like other params
sql/ha_innobase.cc:
make innobase_flush_log_at_trx_commit a long, like other params
sql/ha_innobase.h:
make innobase_flush_log_at_trx_commit a long, like other params
sql/mysqld.cc:
update help innobase_flush_log_at_trx_commitcan have vals 0, 1, 2
innodb_flush_log_at_trx_commit can have values 0, 1, 2 starting from 3.23.52
sql/ha_innobase.h:
innodb_flush_log_at_trx_commit can have values 0, 1, 2 starting from 3.23.52
sql/ha_innobase.cc:
innodb_flush_log_at_trx_commit can have values 0, 1, 2 starting from 3.23.52
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
Fix a typo in last night's push
sql/ha_innodb.cc:
Fix a typo in last night's push
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
ha_innodb.cc Remove gaps in auto-inc in multi-row inserts, more space for foreign key listings in SHOW TABLE STATUS, move resetting of active_trx to amore logical place
dict0dict.h Remove gaps from auto-inc sequence if errors in multi-row insert
dict0dict.c Remove gaps from auto-inc sequence if errors in multi-row insert
innobase/dict/dict0dict.c:
Remove gaps from auto-inc sequence if errors in multi-row insert
innobase/include/dict0dict.h:
Remove gaps from auto-inc sequence if errors in multi-row insert
sql/ha_innodb.cc:
Remove gaps in auto-inc in multi-row inserts, more space for foreign key listings in SHOW TABLE STATUS, move resetting of active_trx to amore logical place
innobase/btr/btr0btr.c:
Add more documentation about B-tree latching
into mashka.mysql.fi:/home/my/mysql-4.0
Docs/manual.texi:
Auto merged
mysql-test/r/distinct.result:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_table.cc:
Auto merged
(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)
Better fix for ALTER TABLE on BDB tables
(Both of the above fixes are already in 4.0)
Docs/manual.texi:
Changelog
sql/item_cmpfunc.cc:
Check if AND/OR expression can be NULL
sql/sql_table.cc:
Better fix for ALTER TABLE on BDB tables
