into x153.internalnet:/home/tonu/mysql-x
BitKeeper/etc/logging_ok:
auto-union
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
libmysql/libmysql.c:
Auto merged
Makefile.am:
Moved bio dir into server_dirs in acinclude.in
client/Makefile.am:
We need OpenSSL includes here
include/global.h:
Workaround for OPENSSL librar bug with defining crypt()
include/violite.h:
small fixes
libmysql/Makefile.am:
We need OpenSSL includes here
libmysql/Makefile.shared:
Yes, we need to compile more programs whtn --with-openssl is used
libmysql/libmysql.c:
Make it work! (openssl)
libmysql_r/Makefile.am:
We need OpenSSL includes here
sql/mysqld.cc:
Memory was not freed before
sql/sql_parse.cc:
fix
vio/Makefile.am:
Added testprogram compilation and openssl libraries linking
vio/viossl.c:
Cleanups, fixes, etc...
vio/viosslfactories.c:
Copyright was missing. Fixed renamed macros for newer OpenSSL
vio/viotest-ssl.c:
Made testprogram work again
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
myisam/mi_check.c:
Auto merged
myisam/myisamchk.c:
Auto merged
sql/mysqld.cc:
Auto merged
mysql-test/t/bdb.test:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_update.cc:
Auto merged
configure.in:
New version
Fixed problem with UPDATE and BDB tables
Fixed problem with GRANT FILE privilege on database level
mysqld --warnings works now
Fixed problem with SHOW OPEN TABLES when not using BDB
Added some tests for ALTER TABLE to the test scripts
Docs/manual.texi:
Added link to copyleft license.
Updated Changelog
configure.in:
Fixed typo
mysys/thr_lock.c:
Removed wrong warning
sql/ha_berkeley.cc:
Fixed problem with UPDATE
sql/sql_acl.cc:
Fixed problem with GRANT FILE privilege on database level
sql/sql_parse.cc:
Fixed that you don't get aborted connection error if you are not using --warning
sql/sql_show.cc:
Fixed problem with SHOW OPEN TABLES when not using BDB
tests/fork2_test.pl:
Added test of ALTER TABLE
tests/fork_big.pl:
Added test of ALTER TABLE
sql/sql_class.h:
Made some temporary changes for UNION's. Still waiting for Monty's
comments on this.
sql/sql_delete.cc:
Added a comment as Monty suggested
sql/sql_parse.cc:
Some speedups for UNIONs
sql/sql_unions.cc:
First attempts at running UNION's.
Removed header temporarily because of some bug in my pre-processor.
mysql-test/r/show_check.result:
Added back old code
sql/ha_myisam.h:
Removed warning
sql/mysql_priv.h:
Added back old code
sql/sql_base.cc:
Added back old code
sql/sql_parse.cc:
Added back old code
sql/sql_show.cc:
Added back old code
test SHOW OPEN TABLES
mysql-test/r/show_check.result:
updated result
mysql-test/t/show_check.test:
test show open tables
sql/mysql_priv.h:
post-merge fixes
sql/sql_base.cc:
post-merge fixes
sql/sql_parse.cc:
post-merge fixes
include/mysqld_error.h:
new error message
mysql-test/r/rpl_log.result:
updated results
mysql-test/t/rpl_log.test:
test show new master for slave
sql/lex.h:
show new master for slave
sql/share/czech/errmsg.txt:
new error
sql/share/danish/errmsg.txt:
new error
sql/share/dutch/errmsg.txt:
new error
sql/share/english/errmsg.txt:
new error
sql/share/estonian/errmsg.txt:
new error
sql/share/french/errmsg.txt:
new error
sql/share/german/errmsg.txt:
new error
sql/share/greek/errmsg.txt:
new error
sql/share/hungarian/errmsg.txt:
new error
sql/share/italian/errmsg.txt:
new error
sql/share/japanese/errmsg.txt:
new error
sql/share/korean/errmsg.txt:
new error
sql/share/norwegian-ny/errmsg.txt:
new error
sql/share/norwegian/errmsg.txt:
new error
sql/share/polish/errmsg.txt:
new error
sql/share/portuguese/errmsg.txt:
new error
sql/share/romanian/errmsg.txt:
new error
sql/share/russian/errmsg.txt:
new error
sql/share/slovak/errmsg.txt:
new error
sql/share/spanish/errmsg.txt:
new error
sql/share/swedish/errmsg.txt:
new error
sql/sql_lex.h:
show new master for slave
sql/sql_parse.cc:
show new master for slave
sql/sql_repl.cc:
show new master for slave
sql/sql_repl.h:
show new master for slave
sql/sql_yacc.yy:
show new master for slave
fixed log sequence bugs
fixed bugs in handling Slave event
added test case with SHOW BINLOG EVENTS
have not fixed all the bugs - found some that are also in 3.23,
will fix them there first, then do pull and cleanup
will not push this changeset
include/mysqld_error.h:
new error
mysql-test/mysql-test-run.sh:
use quotes in expr
sql/lex.h:
SHOW BINLOG EVENTS
sql/log.cc:
fixed log sequence bugs
sql/log_event.cc:
SHOW BINLOG EVENTS
fixed bugs Slave event handling
sql/log_event.h:
SHOW BINLOG EVENTS
sql/share/english/errmsg.txt:
SHOW BINLOG EVENTS
sql/sql_lex.h:
SHOW BINLOG EVENTS
sql/sql_parse.cc:
SHOW BINLOG EVENTS
sql/sql_repl.cc:
SHOW BINLOG EVENTS
sql/sql_repl.h:
SHOW BINLOG EVENTS
sql/sql_yacc.yy:
SHOW BINLOG EVENTS
Docs/manual.texi:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
mysql-test/t/bdb.test:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
BitKeeper/etc/ignore:
Added libmysqld/hash_filo.cc libmysqld/sql_unions.cc libmysqld/stacktrace.c sql/share/mysql to the ignore list
sql/sql_parse.cc:
Fixing some stuff for UNION's
mysql-test/t/multi_update.test:
Made a test feasible. It will last very long time, so I will change
it again as soon as Monty pull's it
sql/sql_class.h:
Some small changes
sql/sql_delete.cc:
Fixed one bug in my stripping code
sql/sql_parse.cc:
Additional stuff for UNION's
changes. This is mostly a merge between my repository and central
one, so that I can take a test for multi table delete and fix it.
sql/mysql_priv.h:
Added new functions needed for UNIONS, EXCEPT's etc
sql/sql_class.h:
A little change in multi_delete class
sql/sql_lex.h:
Added command for UNION's
sql/sql_parse.cc:
One new function and SQLCOM_UNION_SELECT.
Please do not test UNION's. This is just a start of the work on them
sql/sql_yacc.yy:
Parsing stuff for the UNION's
BitKeeper/etc/logging_ok:
auto-union
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_lex.h:
Added SQLCOM_MULTI_DELETE
sql/sql_parse.cc:
added division of LEX while keeping Monty's code for symlinks
sql/filesort.cc:
removing of some extra comments
sql/sql_class.h:
Clear division between new and old stripping code
sql/sql_delete.cc:
Stripping of unnecessary code and making it more efficient
sql/sql_parse.cc:
Better split of LEX into two and enhancements in multi table delete
sql/sql_yacc.yy:
More efficient division of LEX and optional syntax in multi - table delete
sql/uniques.cc:
fixing some additional bugs
Fixed error number handling bug in mysqltest.
Fixed that error number from insert delayed is reported correctly.
merged new vio code with old violite code.
client/mysqltest.c:
Fixed bug that error numbers wasn't tested properly.
myisam/mi_check.c:
Moved initialization of variables to avoid a bug.
myisam/mi_create.c:
Fixed bug in symlink handling.
myisam/mi_test_all.sh:
Fixed script so that it works.
myisam/myisamchk.c:
Removed --no-symlinks option
mysql-test/mysql-test-run.sh:
Cleaned up error message
mysql-test/t/bdb.test:
Fixed wrong error numbers
mysql-test/t/err000001.test:
Fixed wrong error numbers
mysql-test/t/innodb.test:
Fixed wrong error numbers
mysql-test/t/overflow.test:
Fixed wrong error numbers
mysql-test/t/status.test:
Ensure that we are using myisam tables for the lock test.
mysys/my_delete.c:
cleanup
mysys/my_symlink2.c:
Added option to not overwrite files when using symlinks.
sql/Makefile.am:
Moved vio to avoid link error.
sql/ha_myisam.cc:
Fixed symlink handling.
sql/mysqld.cc:
Changed --skip-symlinks to --skip-symlink
sql/sql_insert.cc:
Fixed that error number from insert delayed is reported correctly
sql/sql_parse.cc:
Fixed symlink handling.
sql/sql_table.cc:
Fixed symlink handling.
vio/vio.c:
cleanup
vio/viosocket.c:
c
the other for multi-table delete
sql/filesort.cc:
Fixed some bugs for Unique class
sql/item.cc:
Changes caused by splitting lex into two parts, in order to
implement UNION's etc
sql/item_sum.cc:
Changes caused by splitting lex into two parts, in order to
implement UNION's etc
sql/mysql_priv.h:
Changes caused by splitting lex into two parts, in order to
implement UNION's etc
sql/sql_class.h:
Adding multi table delete
sql/sql_delete.cc:
Added multi-table delete
sql/sql_lex.cc:
Changes caused by splitting lex into two parts, in order to
implement UNION's etc
sql/sql_lex.h:
Changes caused by splitting lex into two parts, in order to
implement UNION's etc
sql/sql_parse.cc:
Changes caused by splitting lex into two parts, in order to
implement UNION's etc, plus added multi-table delete
sql/sql_select.cc:
Changes caused by splitting lex into two parts, in order to
implement UNION's etc
sql/sql_update.cc:
Changes caused by splitting lex into two parts, in order to
implement UNION's etc
sql/sql_yacc.yy:
Changes caused by splitting lex into two parts, in order to
implement UNION's etc, plus added multi-table delete
sql/uniques.cc:
Fixed some bugs in duplicate stripping
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
BitKeeper/etc/logging_ok:
auto-union
include/my_sys.h:
Auto merged
myisam/myisamchk.c:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/sql_table.cc:
Auto merged
error message if the table open or the index creation failed.
Updated portuguese error messages.
Fix for OS/2 that affected CHECK TABLE.
Docs/manual.texi:
Changelog.
libmysql/errmsg.c:
Updated portuguese error messages
mysys/my_copy.c:
Fix for OS/2
sql/net_pkg.cc:
cleanup
sql/share/portuguese/errmsg.txt:
Updated portuguese error messages
sql/slave.cc:
Cleanup.
Fixed bug that caused client to hang because mysqld never did
send an error message if the table open or the index creation failed.
sql/sql_parse.cc:
Moved handling of 'no_send_ok' to fetch_nx_table.
sql/sql_table.cc:
Cleanup.
myisamchk: Don't force a repair if the only problem was that the
open count wasn't correct.
Added missing error messages.
include/my_sys.h:
Cleanup comments
libmysql/Makefile.shared:
Added symlink library.
myisam/mi_check.c:
Added support for symlinked tables
myisam/mi_delete_table.c:
Added support for symlinked tables
myisam/mi_open.c:
Added support for symlinked tables
myisam/mi_rename.c:
Added support for symlinked tables
myisam/myisamchk.c:
Added support for symlinked tables.
Don't force a repair if the only problem was that the open count
wasn't correct.
pstack/bucomm.c:
use mkstemp() instead of mytemp()
sql/ha_myisam.cc:
Added support for symlinked tables
sql/ha_myisam.h:
Added support for symlinked tables
sql/ha_myisammrg.cc:
Added support for symlinked tables
sql/handler.cc:
Added support for symlinked tables
sql/handler.h:
Added support for symlinked tables
sql/lex.h:
Added support for symlinked tables
sql/share/czech/errmsg.txt:
Added missing error messages
sql/share/danish/errmsg.txt:
Added missing error messages
sql/share/dutch/errmsg.txt:
Added missing error messages
sql/share/estonian/errmsg.txt:
Added missing error messages
sql/share/french/errmsg.txt:
Added missing error messages
sql/share/german/errmsg.txt:
Added missing error messages
sql/share/greek/errmsg.txt:
Added missing error messages
sql/share/hungarian/errmsg.txt:
Added missing error messages
sql/share/italian/errmsg.txt:
Added missing error messages
sql/share/japanese/errmsg.txt:
Added missing error messages
sql/share/korean/errmsg.txt:
Added missing error messages
sql/share/norwegian-ny/errmsg.txt:
Added missing error messages
sql/share/norwegian/errmsg.txt:
Added missing error messages
sql/share/polish/errmsg.txt:
Added missing error messages
sql/share/portuguese/errmsg.txt:
Added missing error messages
sql/share/romanian/errmsg.txt:
Added missing error messages
sql/share/russian/errmsg.txt:
Added missing error messages
sql/share/slovak/errmsg.txt:
Added missing error messages
sql/share/spanish/errmsg.txt:
Added missing error messages
sql/share/swedish/errmsg.OLD:
Added missing error messages
sql/share/swedish/errmsg.txt:
Added missing error messages
sql/sql_db.cc:
Added support for symlinked tables
sql/sql_parse.cc:
Added support for symlinked tables
sql/sql_table.cc:
Added support for symlinked tables with ALTER TABLE
sql/sql_yacc.yy:
Added option to create symlinked tables.
info on how to connect to the slave for the clients that connect to
the master, but would like to know where the slaves are
include/mysql_com.h:
register slaves
mysql-test/mysql-test-run.sh:
parameters to test slave registration
mysql-test/r/rpl000002.result:
test of slave registration
mysql-test/t/rpl000002.test:
test slave registration
sql/mysql_priv.h:
slave registration
sql/mysqld.cc:
slave registration
sql/slave.cc:
slave registration
sql/slave.h:
slave registration
sql/sql_lex.h:
slave registration
sql/sql_parse.cc:
slave registration
sql/sql_repl.cc:
slave registration
sql/sql_repl.h:
slave registration
sql/sql_yacc.yy:
slave registration
include/mysqld_error.h:
new errors
mysql-test/r/rpl000009.result:
test load data from master
mysql-test/t/rpl000009.test:
test load data from master
sql/mini_client.cc:
extra functionality needed for load data from master and other things
sql/mini_client.h:
addition to API
sql/mysql_priv.h:
mysql_create_db()/mysql_rm_db() now return a value
sql/share/english/errmsg.txt:
more error messages
sql/slave.cc:
cleanup of fetch_nx_table()
sql/slave.h:
cleanup of fetch_nx_table()
sql/sql_base.cc:
remove unused code originally written for retrieving a non-existent table in slave thread
sql/sql_class.cc:
remove unused replication variables
sql/sql_class.h:
remove unused replication variabled
sql/sql_db.cc:
make mysql_create_db()/mysql_rm_db() work with thd == 0
(do not write messages to the net) and instead return success/error
sql/sql_lex.h:
added SQLCOM_LOAD_MASTER_DATA
sql/sql_parse.cc:
LOAD MASTER DATA, cleanup of LOAD TABLE FROM MASTER
sql/sql_repl.cc:
LOAD DATA FROM MASTER
sql/sql_repl.h:
LOAD DATA FROM MASTER
sql/sql_yacc.yy:
LOAD DATA FROM MASTER
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
mysql-test/r/innodb.result:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/mysqld.cc:
SCCS merged
Fixed problem with fuzzy dates.
mysql-test/r/func_time.result:
Added test of fuzzy dates
mysql-test/t/func_time.test:
Added test of fuzzy dates
sql/item.cc:
Fixed bug with fuzzy dates
sql/sql_parse.cc:
Remove wrong access check for locks.
(This has to be delayed for 4.0 because there is currently now way
to check for "any of the following privileges"
Docs/manual.texi:
Changelog
Docs/manual.texi:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
SCCS merged
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
acconfig.h:
Auto merged
acinclude.m4:
Auto merged
include/myisam.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7:
Auto merged
BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439:
Auto merged
client/mysqltest.c:
Auto merged
sql/lex.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
Docs/manual.texi:
merged
client/errmsg.c:
merged
configure.in:
merged
sql/mysqld.cc:
merged
sql/sql_select.cc:
merged, needs manual fixing
sql/sql_yacc.yy:
merged, needs manual fixing
DROP DATABASE in mysqladmin asks for confirmation (again)
Added examined_rows to slow query log
SHOW CREATE for TEMPORARY table
BitKeeper/deleted/.del-shw000001.result~8b20b03d8319b9a5:
Delete: mysql-test/r/shw000001.result
BitKeeper/deleted/.del-shw000001.test~770d96a2c1c65b20:
Delete: mysql-test/t/shw000001.test
Docs/manual.texi:
Added information about InnoDB and TEMPORARY tables
acinclude.m4:
Portability fixes
client/errmsg.c:
merge with libmysqd/errmsg.c
client/mysqladmin.c:
DROP DATABASE asks for confirmation (again)
client/mysqltest.c:
Portability fixes
configure.in:
Portability fixes for SGI compiler on Ia64
extra/resolve_stack_dump.c:
Portability fixes
include/global.h:
Portability fixes
isam/_dbug.c:
Portability fixes
mysql-test/mysql-test-run.sh:
Portability fixes
mysql-test/r/show_check.result:
New test for SHOW CREATE
mysql-test/t/show_check.test:
New test for SHOW CREATE
scripts/make_binary_distribution.sh:
Added missing files
sql/filesort.cc:
Added examined_rows to slow query log
sql/log.cc:
Added examined_rows to slow query log
sql/mysql_priv.h:
Added examined_rows to slow query log
sql/mysqlbinlog.cc:
Fixed core dump when using wrong option
sql/mysqld.cc:
Removed not used argument
sql/sql_base.cc:
Fixed name problem with SHOW CREATE for TEMPORARY table
sql/sql_class.h:
Added examined_rows to slow query log
sql/sql_parse.cc:
Added examined_rows to slow query log
sql/sql_select.cc:
Added examined_rows to slow query log
sql/sql_select.h:
Added examined_rows to slow query log
sql/sql_show.cc:
Fixed SHOW CREATE for TEMPORARY table
sql/sql_table.cc:
Added examined_rows to slow query log
Some limit optimization
BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7:
Delete: innobase/ib_config.h.in
BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439:
Delete: innobase/ib_config.h
client/errmsg.c:
Moved error messages from libmysqld/
client/mysql.cc:
Removed warnings
include/errmsg.h:
New info for embedded versions
include/mysql_com.h:
Fixes for embedded MySQL
libmysql/errmsg.c:
Fixes for embedded MySQL
libmysqld/Makefile.am:
Added HANDLER code
libmysqld/lib_sql.cc:
Fixes for embedded MySQL
libmysqld/lib_vio.c:
Fixes for embedded MySQL
BitKeeper/etc/ignore:
Added libmysqld/sql_handler.cc to the ignore list
libmysqld/libmysqld.c:
Fixes for embedded MySQL
mysql-test/r/null_key.result:
Fixed result for 4.0
sql/net_serv.cc:
Fixes for embedded MySQL
sql/sql_parse.cc:
Fixes for embedded MySQL where the query could be a const char*
sql/sql_select.cc:
Added limit optimization
sql/sql_select.h:
Added limit optimization
BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7:
Delete: innobase/ib_config.h.in
BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439:
Delete: innobase/ib_config.h
Docs/manual.texi:
Changelog
myisam/mi_locking.c:
Cleanup
mysql-test/r/bdb.result:
Test for LOCK TABLES
mysql-test/r/innodb.result:
Test for LOCK TABLES
mysql-test/t/bdb.test:
Test for LOCK TABLES
mysql-test/t/innodb.test:
Test for LOCK TABLES
sql-bench/test-insert.sh:
Allow loop to be small
sql/ha_berkeley.cc:
Fixed bug when using LOCK TABLES with BDB
sql/ha_berkeley.h:
Fixed bug when using LOCK TABLES with BDB
sql/handler.h:
Fixed bug when using LOCK TABLES with BDB
sql/sql_base.cc:
Fixed bug when using LOCK TABLES with BDB
sql/sql_parse.cc:
UNLOCK TABLES ends transaction
sql/sql_select.cc:
Fix to not call index_end() twice
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
