typo/bad merge fixed
chmod a-x for man/*.1 files
man/isamchk.1:
Change mode to -rw-rw-r--
man/mysqlaccess.1:
Change mode to -rw-rw-r--
man/mysqladmin.1:
Change mode to -rw-rw-r--
man/mysqld.1:
Change mode to -rw-rw-r--
man/mysqldump.1:
Change mode to -rw-rw-r--
man/mysqlshow.1:
Change mode to -rw-rw-r--
man/perror.1:
Change mode to -rw-rw-r--
man/safe_mysqld.1:
Change mode to -rw-rw-r--
mysql-test/r/handler.result:
new tests added
client/mysqltest.c:
bug fixed: errors from handler.test (that is send_error()
after send_fields) weren't catched by expected_errno
mysql-test/t/handler.test:
typo fixed
sql/Makefile.am:
bad merge fixed
sql/sql_yacc.yy:
bad merge (?) fixed
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
acinclude.m4:
Auto merged
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/sql_delete.cc:
Auto merged
do REAL_EMAIL magic
mysql-test/mysql-test-run.sh
added show_failed_diffs
mysql-test/r/bench_count_distinct.result
tired of waiting :-)
mysql-test/r/rpl000001.result
new test results after implementing Monty's Hack (TM)
mysql-test/t/bench_count_distinct.test
tired of waiting
mysql-test/t/rpl000001.test
implemented Monty's Hack (TM) to kill a query in the middle of update
without generating a table with 30,000 rows. This will also avoice the
timing uncertainty
BitKeeper/triggers/post-commit:
do REAL_EMAIL magic
mysql-test/mysql-test-run.sh:
added show_failed_diffs
mysql-test/r/bench_count_distinct.result:
tired of waiting :-)
mysql-test/r/rpl000001.result:
new test results after implementing Monty's Hack (TM)
mysql-test/t/bench_count_distinct.test:
tired of waiting
mysql-test/t/rpl000001.test:
implemented Monty's Hack (TM) to kill a query in the middle of update
without generating a table with 30,000 rows. This will also avoice the
timing uncertainty
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
myisam/mi_search.c:
the ugliest merge I've ever done! And I already see this has introduced a bug - will have to do a fix-up afterwards
start slave thread if master.info is present and server_id is set
updates for rpl000015 and rpl000016 to remove master.info to make sure
master info struct does not get auto-initialized
Docs/manual.texi:
updates for recent changes
mysql-test/r/rpl000001.result:
update for test case change
mysql-test/t/rpl000001.test:
fixed bugs in the test case
mysql-test/t/rpl000015.test:
wrong change - to be reversed
sql/mysqld.cc:
start slave thread if master.info is present and server_id is set
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Docs/manual.texi:
Updated MyODBC section
libmysql/conf_to_src.c:
Fixed wrong typecast
mysql-test/r/func_regexp.result:
Added test case for REGEXP bug
mysql-test/t/func_regexp.test:
Added test case for REGEXP bug
regex/engine.c:
Fixed wrong type
regex/regexec.c:
Fixed wrong type
sql/records.cc:
Fixed test of READ lock
sql/slave.cc:
Cleanup
PSTACK, libmysqld and MySQL filesystem
UPDATE ... ORDER BY
DELETE ... ORDER BY
New faster fulltext handling
Faster compressed keys
Makefile.am:
Added support for pstack and libmysqld_dir
acconfig.h:
MySQL filesystem and PSTACK
acinclude.m4:
MySQL File system
client/mysql.cc:
Support for --xml
configure.in:
Pstack, MySQL FS and libmysqld_dir
include/ft_global.h:
Faster fulltext
include/my_pthread.h:
Made c++ safe
include/myisam.h:
Update for faster fulltext
include/mysql_com.h:
new my_net_read()
include/violite.h:
libmysqld
libmysql/net.c:
New protocol that supports big packets
myisam/Makefile.am:
Faster fulltext
myisam/ft_parser.c:
Faster fulltext
myisam/ft_search.c:
Faster fulltext
myisam/ft_update.c:
Faster fulltext
myisam/ftdefs.h:
Faster fulltext
myisam/mi_check.c:
Faster fulltext
myisam/mi_open.c:
Faster compressed keys
myisam/mi_search.c:
Faster compressed keys
myisam/mi_update.c:
Faster compressed keys
myisam/myisamdef.h:
Faster compressed keys
myisam/sort.c:
Faster compressed keys
mysql-test/mysql-test-run.sh:
--skip-innobase and --skip-bdb
sql/ChangeLog:
Changelog
sql/Makefile.am:
PSTACK
sql/mysql_priv.h:
New ORDER BY options and libmysqld
sql/mysqld.cc:
PSTACK
sql/net_serv.cc:
New protocol that supports big packets
sql/share/estonian/errmsg.txt:
New error messages
sql/sql_base.cc:
Better list_open_tabels
sql/sql_delete.cc:
ORDER BY for delete
sql/sql_lex.cc:
Added language convertation of all strings
sql/sql_parse.cc:
Changes for libmysqld
Use new ORDER BY options
sql/sql_show.cc:
Character set convertations
Use new list_open_tables function.
sql/sql_update.cc:
UPDATE ... ORDER BY
sql/sql_yacc.yy:
Clean up symbol definitions
DELETE .. ORDER BY
UPDATE .. ORDER BY
sql/table.h:
new OPEN_TABLE_LIST structure
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
mark killed partially completed updates with an error code in binlog
stop replication if the master reports a possible partial/killed update
test partially killed update
mysql-test/r/rpl000001.result:
updated result
mysql-test/r/rpl000012.result:
updated result
mysql-test/t/rpl000001.test:
test handing a killed partial update
mysql-test/t/rpl000012.test:
test temporary table replication more thoroughly
sql/log_event.h:
mark killed partially completed updates with an error code
BitKeeper/etc/ignore:
Added bdb/btree/btree_auto.c bdb/build_vxworks/db_int.h bdb/build_win32/db_int.h bdb/build_win32/include.tcl bdb/build_win32/libdb.rc bdb/db/crdel_auto.c bdb/db/db_auto.c bdb/dist/config.hin to the ignore list
sql/slave.cc:
stop replication if the master reports a possible partial/killed update
sql/sql_base.cc:
do not log the drop internal temporary tables into the binary log
Docs/manual.texi:
Updated replication section
mysql-test/r/null_key.result:
Added test UPDATE/DELETE with IS NULL on unique key
mysql-test/t/null_key.test:
Added test UPDATE/DELETE with IS NULL on unique key
mysys/Makefile.am:
Removed -f from $CP as this is not portable
Fixed rule for testhash
sql/field.cc:
Safety fix
sql/opt_range.cc:
Fixed bug with UPDATE/DELETE on UNIQUE key which could be NULL
sql/opt_range.h:
Fixed bug with UPDATE/DELETE on UNIQUE key which could be NULL
Fix for shutdown on NT
Fixed bug when using wrong dates from blob field.
BitKeeper/deleted/.del-df_crash.result~4a3dbee64843953d:
Delete: mysql-test/r/df_crash.result
BitKeeper/deleted/.del-df_crash.test~4c365178fe437f6:
Delete: mysql-test/t/df_crash.test
Docs/manual.texi:
Changelog
innobase/ib_config.h.in:
automatic changed file
innobase/ib_config.h:
automatic changed file
mysql-test/r/func_time.result:
Test case for bug in time functions
mysql-test/r/innobase.result:
Test for INSERT DELAYED
mysql-test/t/func_time.test:
Test case for bug in time functions
mysql-test/t/innobase.test:
Test for INSERT DELAYED
scripts/mysql_convert_table_format.sh:
Added --socket and --port
sql/ha_innobase.cc:
Fix bug when compiling with SAFE_MUTEX
Cleaner comment when using SHOW TABLE STATUS
sql/mysqld.cc:
Fix for shutdown on NT
sql/sql_insert.cc:
Fixed problem with Innobase and INSERT DELAYED
sql/sql_udf.cc:
Support for UDF on windows
sql/time.cc:
Fixed bug when using wrong dates from blob field.
strings/ctype-tis620.c:
Removed not used variable
support-files/mysql-max.spec.sh:
Removed old not used section
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
fixed bug in variable assignment in mysqltest
fixed coredump on conversion from empty blob/text to date
added test case for empty blob conversion to date
BUILD/compile-pentium-debug:
move bdb/innobase to compile-pentium-debug-max
client/mysqltest.c:
fixed bug in variable assignment
sql/time.cc:
fixed coredump on conversion from empty blob/text to date
Docs/manual.texi:
Fixed nodes and menus with xemacs
Moved some C API sections to subsections
mysql-test/r/alter_table.result:
Test result for new test case
once after the lock. Now changed test case and added eval support to
mysqltest to make it easier to debug
client/mysqltest.c:
added eval query command to be able to use variables in a query
mysql-test/r/rpl000016.result:
updates for new test case
mysql-test/t/rpl000016.test:
changed test case to make it easier to debug
Removed usage of @r/result as this made life hard when testing different
table handlers.
Allow concurrent inserts if no update/binary log.
Don't remove key_cache at flush tables.
Fixed bug in SELECT DISTINCT SUM()...
BitKeeper/deleted/.del-rpl000012.status.result~bbbd650b5beea32f:
Delete: mysql-test/r/rpl000012.status.result
BitKeeper/deleted/.del-rpl000013.status.result~6bee190c298cc9fd:
Delete: mysql-test/r/rpl000013.status.result
Docs/manual.texi:
Changelog
client/mysqltest.c:
Fixed bug in 'send' that Sasha had introduced.
Make database, port and socket optional parameters to connect()
mysql-test/r/rpl000005.result:
Removed usage of @r/result as this made life hard when doing
test for multiple table handlers.
mysql-test/r/rpl000006.result:
Removed usage of @r/result as this made life hard when doing
test for multiple table handlers.
mysql-test/r/rpl000012.result:
Removed usage of @r/result as this made life hard when doing
test for multiple table handlers.
mysql-test/r/rpl000013.result:
Removed usage of @r/result as this made life hard when doing
test for multiple table handlers.
mysql-test/r/sel000033.result:
Removed usage of @r/result as this made life hard when doing
test for multiple table handlers.
mysql-test/t/backup.test:
Use default port and socket.
mysql-test/t/dirty-close.test:
Use default port and socket.
mysql-test/t/flush.test:
Use default port and socket.
mysql-test/t/kill.test:
Use default port and socket.
mysql-test/t/overflow.test:
Use default port and socket.
mysql-test/t/rpl000003.test:
Removed usage of @r/result as this made life hard when doing
test for multiple table handlers.
mysql-test/t/rpl000005.test:
Removed usage of @r/result as this made life hard when doing
test for multiple table handlers.
mysql-test/t/rpl000006.test:
Removed usage of @r/result as this made life hard when doing
test for multiple table handlers.
mysql-test/t/rpl000007.test:
Removed usage of @r/result as this made life hard when doing
test for multiple table handlers.
mysql-test/t/rpl000008.test:
Removed usage of @r/result as this made life hard when doing
test for multiple table handlers.
mysql-test/t/rpl000009.test:
Removed usage of @r/result as this made life hard when doing
test for multiple table handlers.
mysql-test/t/rpl000010.test:
Removed usage of @r/result as this made life hard when doing
test for multiple table handlers.
mysql-test/t/rpl000011.test:
Removed usage of @r/result as this made life hard when doing
test for multiple table handlers.
mysql-test/t/rpl000012.test:
Removed usage of @r/result as this made life hard when doing
test for multiple table handlers.
mysql-test/t/rpl000013.test:
Removed usage of @r/result as this made life hard when doing
test for multiple table handlers.
mysql-test/t/sel000001.test:
Removed usage of @r/result as this made life hard when doing
test for multiple table handlers.
mysql-test/t/sel000002.test:
Removed usage of @r/result as this made life hard when doing
test for multiple table handlers.
mysql-test/t/sel000003.test:
Removed usage of @r/result as this made life hard when doing
test for multiple table handlers.
mysql-test/t/sel000031.test:
Removed usage of @r/result as this made life hard when doing
test for multiple table handlers.
mysql-test/t/sel000032.test:
Removed usage of @r/result as this made life hard when doing
test for multiple table handlers.
mysql-test/t/sel000033.test:
Removed usage of @r/result as this made life hard when doing
test for multiple table handlers.
mysql-test/t/sel000100.test:
Removed usage of @r/result as this made life hard when doing
test for multiple table handlers.
mysql-test/t/shw000001.test:
Removed usage of @r/result as this made life hard when doing
test for multiple table handlers.
mysql-test/t/status.test:
Use default port and socket.
sql/gen_lex_hash.cc:
Smaller hash table
sql/mysql_priv.h:
Allow concurrent inserts if no update/binary log
sql/mysqld.cc:
Allow concurrent inserts if no update/binary log
Don't remove key_cache at flush tables
sql/sql_base.cc:
Don't remove key_cache at flush tables
sql/sql_select.cc:
Fix bug in SELECT DISTINCT SUM().
sql/sql_yacc.yy:
Allow concurrent inserts if no update/binary log
tests/export.pl:
C
Fixed bug in CONCAT_WS()
Print the default ISOLATION level.
Change lock type for CREATE ... SELECT and INSERT/REPLACE ... SELECT
Docs/manual.texi:
Changelog
mysql-test/r/func_str.result:
Added tests for CONCAT_WS()
mysql-test/r/update.result:
Test case for bug when updating on key
mysql-test/t/func_str.test:
Added tests for CONCAT_WS()
mysql-test/t/update.test:
Test case for bug when updating on key
sql/gen_lex_hash.cc:
Better hash values
sql/handler.cc:
Added missig NullS
sql/item_strfunc.cc:
Fixed bug in CONCAT_WS()
sql/mysql_priv.h:
Print the default ISOLATION level.
sql/mysqld.cc:
Print the default ISOLATION level.
sql/sql_insert.cc:
Remove unnecessary call to setup_tables()
sql/sql_parse.cc:
Change lock type for CREATE ... SELECT and INSERT/REPLACE ... SELECT
sql/sql_yacc.yy:
Change lock type for CREATE ... SELECT and INSERT/REPLACE ... SELECT
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
added flush test case, but had to comment the fun part out because it
does not work for some reason - will investigate why.
sql/sql_base.cc:
fixed bugs on re-open of temp tables after FLUSH in the middle of open
Fix bug when read return error
acconfig.h:
Add Gemini to configure
acinclude.m4:
Add Gemini to configure
include/my_base.h:
Add error codes for tables handlers
mysql-test/t/select.test:
Force temporary tables to MyISAM
sql-bench/server-cfg.sh:
Allow Gemini to run sql-bench
sql/Makefile.am:
Add Gemini to configure
sql/handler.cc:
Add support for Gemini table handler
sql/handler.h:
Add support for Gemini table handler
sql/lex.h:
Add support for Gemini table handler
sql/mysqld.cc:
Add support for Gemini table handler
sql/opt_range.cc:
Fix bug when read return error
sql/records.cc:
Fix bug when read return error
sql/sql_class.cc:
Add support for Gemini table handler
sql/sql_class.h:
Add support for Gemini table handler
sql/sql_lex.h:
Add support for Gemini table handler
sql/sql_rename.cc:
Add commit for table rename
sql/sql_table.cc:
Add commit for table rename
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Docs/manual.texi:
Updated info about some common problems.
mysql-test/r/user_var.result:
Added tests of using user variables.
mysql-test/t/user_var.test:
Added tests of using user variables.
Docs/manual.texi:
Updated links
client/mysqltest.c:
Added 'ping' method
configure.in:
Upgraded version number
mysql-test/r/user_var.result:
Added test for using variables with distinct
mysql-test/t/kill.test:
Use 'ping' to force reconnect
mysql-test/t/user_var.test:
Added test for using variables with distinct
sql-bench/run-all-tests.sh:
Fixed argument passing
added support for kill expr
fixed coredump in set @a := foo;
added testcase for user_var
added testcase for kill
sql/slave.cc:
fd -> vio
sql/sql_class.cc:
fd->vio, fixed coredump on set @a := foo;
sql/sql_class.h:
fd -> vio
sql/sql_repl.cc:
fd -> vio
sql/sql_yacc.yy:
added support for kill expr - needed this for a clean test case of kill
Docs/manual.texi:
Updated changelog
mysql-test/README:
Added reference to manual
mysql-test/r/bdb.result:
Added test for MAX() bug
mysql-test/r/innobase.result:
Added test for MAX() bug
mysql-test/t/bdb.test:
Added test for MAX() bug
mysql-test/t/innobase.test:
Added test for MAX() bug
sql-bench/server-cfg.sh:
Don't create big blobs with innobase
sql/ha_berkeley.cc:
Fixed bug in MAX() optimizing
BitKeeper/etc/ignore:
Added sql/.gdbinit to the ignore list
sql/ha_innobase.h:
Fixed bug in MAX() optimizing
sql/handler.h:
Fixed bug in MAX() optimizing
sql/opt_sum.cc:
Fixed bug in MAX() optimizing
Docs/manual.texi:
Splitted INSERT syntax to different sub-sections
mysql-test/r/delayed.result:
Added new test that hanged INSERT DELAYED
mysql-test/t/delayed.test:
Added new test that hanged INSERT DELAYED
scripts/mysqldumpslow.sh:
Fix for new slow query log format
sql/field_conv.cc:
cleanup
Fixed bug introduced with last ORDER BY optimization
Changed log position to longlong to avoid warnings.
Docs/manual.texi:
Update for innobase
mysql-test/r/innobase.result:
Fixed test cases
mysql-test/t/bdb.test:
Removed not used tables
mysql-test/t/innobase.test:
Fixed test cases
sql/field.h:
Fixed bug introduced with last ORDER BY optimization
sql/ha_berkeley.cc:
Fixed bug when index_init() was called twice.
sql/mysql_priv.h:
Added option to not get stack trace (when using gdb)
sql/mysqld.cc:
Added option to not get stack trace (when using gdb)
sql/slave.cc:
Changed log position to longlong to avoid warnings.
sql/slave.h:
Changed log position to longlong to avoid warnings.
sql/sql_parse.cc:
Removed warnings
sql/sql_select.cc:
Cleanups
tables.
Merged maxsql.spec with mysql.spec
mysql-test/r/innobase.result:
Almost up to date test results
mysql-test/t/innobase.test:
Added testing of error codes
sql-bench/test-insert.sh:
Added testing of key-only-read
sql/ha_berkeley.cc:
Added DBUG_PRINT
sql/sql_select.cc:
Removed duplicated index_init() calls
support-files/maxsql.spec.sh:
Merge with mysql.spec. Take into account that BDB and Innobase is
in the MySQL source tree
support-files/mysql.spec.sh:
Removed usage of innobase in standard RPM
Print full command name to log files
Convert table type to supported onces on ALTER TABLE
Docs/manual.texi:
Updates from user comments
bdb/log/log_rec.c:
Patch from sleepycat to fix problem with log files
innobase/ibuf/Makefile.am:
Don't let make do bk get
innobase/include/Makefile.am:
Don't let make do bk get
man/Makefile.am:
Don't let make do bk get
myisam/mi_dbug.c:
Print warning to debug log
mysql-test/mysql-test-run.sh:
Don't use innobase in replica
mysql-test/r/null_key.result:
Fix for new key lengths
sql/ha_innobase.cc:
Free hash cache at end
sql/log.cc:
Print full command name to log files
sql/sql_table.cc:
Convert table type to supported onces on ALTER TABLE
Remember UNION for ALTER TABLE
Added test for if we are supporting transactions.
Don't allow REPLACE to replace a row when we have generated an auto_increment key
Fixed bug when using BLOB keys
Fixed bug in SET @variable=user.
Docs/manual.texi:
Added some examples and moved the Error access denied section to the
error section.
client/mysqltest.c:
Changed to use the new mysql_send_query()
include/mysql.h:
Changed mysql_reap_query() to mysql_send_query().
libmysql/libmysql.c:
Changed mysql_reap_query() to mysql_send_query()
Merged some functions and removed some unused functions.
mysql-test/r/bdb.result:
New test case
mysql-test/r/distinct.result:
New test case
mysql-test/r/key.result:
New test case
mysql-test/r/merge.result:
New test case
mysql-test/r/replace.result:
New test case
mysql-test/t/bdb.test:
New test case
mysql-test/t/key.test:
New test case
mysql-test/t/merge.test:
New test case
mysql-test/t/replace.test:
New test case
mysys/my_lock.c:
Moved global lock variable to static
sql-bench/test-insert.sh:
Added test case for index-read only
sql/field.h:
Fixed that one can optimize ORDER BY with ISAM and GEMINI
sql/ha_berkeley.cc:
Added type casts needed for Windows
sql/ha_innobase.cc:
Removed reference to manual from comment.
sql/ha_myisammrg.cc:
Remember UNION for ALTER TABLE
sql/ha_myisammrg.h:
Remember UNION for ALTER TABLE
sql/handler.cc:
Added test for if we are supporting transactions.
Don't allow REPLACE to replace a row when we have generated an auto_increment key.
sql/handler.h:
Remember UNION for ALTER TABLE
sql/key.cc:
Fixed bug when using BLOB keys
sql/mysql_priv.h:
Added new variables
sql/mysqld.cc:
Added new variables
sql/opt_range.cc:
Fixed problem with BLOB keys
sql/opt_sum.cc:
Fix for BLOB keys
sql/sql_class.cc:
Added test if we need to init/clean transaction variables
sql/sql_insert.cc:
Fix for REPLACE and auto_increment keys
sql/sql_parse.cc:
Fixed bug in max_user_connections
sql/sql_select.cc:
Fixed problem with key on BLOB
sql/sql_yacc.yy:
Fixed bug in SET @variable=user.
sql/table.cc:
Fixed problem with keys on BLOB
Fixed bug when using TEXT columns with BDB tables
Allow LOAD DATA INFILE to use numbers with ENUM and SET columns
BUILD/compile-pentium:
Added --with-innobase-db
Docs/manual.texi:
Added more documentation to Innobase and KILL
client/mysqladmin.c:
Quote database names for CREATE and DROP
mysql-test/install_test_db.sh:
Don't use innobase, bdb or gemini when installing privilege tables
mysql-test/mysql-test-run.sh:
Added testing of innobase tables
mysql-test/r/bdb.result:
Added test of TEXT column bug
mysql-test/t/bdb.test:
Added test of TEXT column bug
mysql-test/t/innobase.test:
Cleanup innobase tests
scripts/mysql_install_db.sh:
Added testing of innobase tables
sql/field.cc:
Allow LOAD DATA INFILE to use numbers with ENUM and SET columns
sql/filesort.cc:
Fixed typo
sql/ha_berkeley.cc:
Fixed problem with TEXT columns in BDB tables
sql/mysqld.cc:
Always support the --innobase-data-file-path option
sql/share/swedish/errmsg.OLD:
Added swedish error messages
sql/share/swedish/errmsg.txt:
Added swedish error messages
sql/sql_base.cc:
Reset tables after usage (to fix problem with BDB and TEXT columns)
sql/sql_delete.cc:
Use generate table if --skip-innobase is used
item_func.cc MATCH ... AGAINST (NULL) bug fixed
fulltext.test MATCH ... AGAINST (NULL) bug fixed
fulltext.result MATCH ... AGAINST (NULL) bug fixed
mysql-test/r/fulltext.result:
MATCH ... AGAINST (NULL) bug fixed
mysql-test/t/fulltext.test:
MATCH ... AGAINST (NULL) bug fixed
sql/item_func.cc:
MATCH ... AGAINST (NULL) bug fixed
sql/sql_select.cc:
MATCH ... AGAINST (NULL) bug fixed
Docs/manual.texi:
updates from Matthias Urlichs
mysql-test/r/rpl000016.result:
position sanity check - hope to catch the timing bug
mysql-test/t/rpl000016.test:
position sanity check - hope to catch timing bug
sql/log_event.cc:
limit event length by max_allowed_packet
sql/log_event.h:
abolish MAX_EVENT_LEN
sql/sql_repl.cc:
error for events larger than max_allowed_packet
