configure.in:
Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
Auto merged
client/Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
heap/hp_test2.c:
Auto merged
include/global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/myisam.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysql/net.c:
Auto merged
myisam/sort.c:
Auto merged
sql-bench/test-create.sh:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/lock.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mini_client.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/net_serv.cc:
Auto merged
mysql-test/t/merge.test:
Auto merged
sql/ha_innobase.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
mysql-test/t/bdb.test:
Auto merged
Docs/manual.texi:
merge
myisam/myisampack.c:
merge
Fix DBUG_ASSERT()
Optimization for BDB tables
Fix for BDB under Win98
Docs/manual.texi:
Removed wrong info
bdb/os_win32/os_rename.c:
Fix for windows 98
configure.in:
Better options for MAC OS X
include/dbug.h:
Fix DBUG_ASSERT()
mysys/thr_lock.c:
More DBUG messages
sql/ha_berkeley.cc:
Use cursor in remove_key
sql/lock.cc:
Fix possible problem when pre-unlocking tables in SELECT
sql/sql_select.cc:
More DBUG messages
sql/violite.c:
Fix DBUG messages
configure.in:
Auto merged
sql/ha_innobase.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
config.guess:
Auto merged
config.sub:
Auto merged
ltconfig:
Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
Auto merged
client/Makefile.am:
Auto merged
include/errmsg.h:
Auto merged
include/global.h:
Auto merged
include/heap.h:
Auto merged
include/my_sys.h:
Auto merged
include/mysql_com.h:
Auto merged
isam/isamlog.c:
Auto merged
libmysql/libmysql.c:
Auto merged
merge/open.c:
Auto merged
myisam/ft_search.c:
Auto merged
myisam/ftdefs.h:
Auto merged
myisam/mi_test_all.sh:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisamlog.c:
Auto merged
myisam/myisampack.c:
Auto merged
myisam/sort.c:
Auto merged
myisammrg/myrg_open.c:
Auto merged
mysys/hash.c:
Auto merged
mysys/mf_casecnv.c:
Auto merged
mysys/mf_format.c:
Auto merged
mysys/my_lib.c:
Auto merged
mysys/tree.c:
Auto merged
sql-bench/bench-init.pl.sh:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/bdb.test:
Auto merged
mysql-test/t/err000001.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/overflow.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
strings/ctype.c:
Auto merged
Docs/manual.texi:
Change to 3.23 manual.
(I will later add the changes for 4.0 to this copy)
client/mysql.cc:
merge
client/mysqlbinlog.cc:
merge
client/mysqldump.c:
merge
client/mysqltest.c:
merge
client/thread_test.c:
merge
configure.in:
merge
include/my_pthread.h:
merge
include/mysqld_error.h:
merge
libmysql/net.c:
merge
myisam/mi_cache.c:
merge
myisam/mi_check.c:
merge
mysql-test/t/fulltext.test:
merge
mysys/mf_qsort.c:
merge
sql/lock.cc:
merge
sql/md5.c:
merge
sql/mini_client.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_load.cc:
merge
sql/sql_repl.cc:
merge
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
Patches required by Gemini
Fix to properly detect if there is an active transaction in InnoDB
Fix to not lock thread structure when doing automatic rollback when thread ends
Allow -O lower_case_names=0 on UNIX
Docs/manual.texi:
Some updates from mailing list.
Changelog
client/mysqlbinlog.cc:
Removed variables declared in net.c
configure.in:
Added test for strtoll and fixed test for gethostname_r for AIX
mysql-test/t/innodb.test:
Added test of active transactions
sql/field.cc:
Patch required by Gemini
sql/field.h:
Patch required by Gemini
sql/filesort.cc:
Patch required by Gemini
sql/gen_lex_hash.cc:
Update to support new syntax
sql/ha_gemini.cc:
Patch required by Gemini
sql/ha_gemini.h:
Patch required by Gemini
sql/ha_innobase.cc:
Fix to properly detect if there is an active transaction in InnoDB
sql/handler.cc:
Fix to properly detect if there is an active transaction in InnoDB
sql/handler.h:
Fix to properly detect if there is an active transaction in InnoDB.
Fix for Gemini
sql/lex.h:
SHOW LOCKS
sql/mysqld.cc:
Fix to not lock thread structure when doing automatic rollback when thread ends.
sql/share/portuguese/errmsg.txt:
Update
sql/sql_class.cc:
Fix to not lock thread structure when doing automatic rollback when thread ends.
sql/sql_class.h:
Fix to properly detect if there is an active transaction in InnoDB
sql/sql_delete.cc:
Fix for Gemini
sql/sql_parse.cc:
Allow -O lower_case_names=0 on UNIX
sql/sql_select.cc:
Fix for Gemini
sql/sql_table.cc:
Allow -O lower_case_names=0 on UNIX
sql/sql_update.cc:
Fix for Gemini
sql/sql_yacc.yy:
For SHOW LOCKS
strings/strto.c:
Portability fix
Patches required by Gemini
Fix to properly detect if there is an active transaction in InnoDB
Fix to not lock thread structure when doing automatic rollback when thread ends
Allow -O lower_case_names=0 on UNIX
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
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 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
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/etc/ignore:
auto-union
Makefile.am:
Auto merged
ltmain.sh:
Auto merged
libmysql/Makefile.shared:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/t/bdb.test:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Docs/manual.texi:
New option, --sql-mode=option[,option[,option]]
sql/ha_myisam.cc:
Fixed a segmentation fault -bug with myisam-recover which
occurred if option specified was not a legal one.
sql/mysql_priv.h:
New option --sql-mode
sql/mysqld.cc:
New option --sql-mode
sql/sql_class.cc:
New option --sql-mode
sql/sql_class.h:
New option --sql-mode
sql/sql_lex.cc:
option --sql-mode, ansi_quotes and ignore_space
sql/sql_parse.cc:
option --sql-mode, ignore_space
sql/sql_select.cc:
option --sql-mode, mode only_full_group_by
sql/sql_yacc.yy:
option --sql-mode, modes pipes_as_concat and real_as_float
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
New faster list iterators
Change list code to be simpler and faster
Optimize count(distinct)
New error messages for UNION
Make create_tmp_table more general to be usable by UNION
Docs/manual.texi:
Changelog
include/mysqld_error.h:
Add new error messages needed for UNION
mysql-test/r/union.result:
New tests for UNION
mysql-test/t/analyse.test:
Add missing drop table
mysql-test/t/union.test:
new tests for UNION
sql/Makefile.am:
Change name of sql_unions.cc to sql_union.cc
sql/item.cc:
Use List_iterator_fast
sql/item_cmpfunc.cc:
Use List_iterator_fast
sql/item_func.cc:
Use List_iterator_fast
sql/item_sum.cc:
Use List_iterator_fast
Optimize count(distinct)
Cleanup of indentation and comments
sql/item_sum.h:
Optimize count(distinct)
sql/key.cc:
Use List_iterator_fast
sql/mysql_priv.h:
Add new option bits
sql/opt_sum.cc:
Use List_iterator_fast
sql/share/Makefile.am:
Add 'fix_errors' label
sql/share/czech/errmsg.txt:
Add new error messages needed for UNION
sql/share/danish/errmsg.txt:
Add new error messages needed for UNION
sql/share/dutch/errmsg.txt:
Add new error messages needed for UNION
sql/share/english/errmsg.txt:
Add new error messages needed for UNION
sql/share/estonian/errmsg.txt:
Add new error messages needed for UNION
sql/share/french/errmsg.txt:
Add new error messages needed for UNION
sql/share/german/errmsg.txt:
Add new error messages needed for UNION
sql/share/greek/errmsg.txt:
Add new error messages needed for UNION
sql/share/hungarian/errmsg.txt:
Add new error messages needed for UNION
sql/share/italian/errmsg.txt:
Add new error messages needed for UNION
sql/share/japanese/errmsg.txt:
Add new error messages needed for UNION
sql/share/korean/errmsg.txt:
Add new error messages needed for UNION
sql/share/norwegian-ny/errmsg.txt:
Add new error messages needed for UNION
sql/share/norwegian/errmsg.txt:
Add new error messages needed for UNION
sql/share/polish/errmsg.txt:
Add new error messages needed for UNION
sql/share/portuguese/errmsg.txt:
Add new error messages needed for UNION
sql/share/romanian/errmsg.txt:
Add new error messages needed for UNION
sql/share/russian/errmsg.txt:
Add new error messages needed for UNION
sql/share/slovak/errmsg.txt:
Add new error messages needed for UNION
sql/share/spanish/errmsg.txt:
Add new error messages needed for UNION
sql/share/swedish/errmsg.txt:
Add new error messages needed for UNION
sql/sql_analyse.cc:
Use List_iterator_fast
sql/sql_base.cc:
Use List_iterator_fast
Add new argument to setup_fields
sql/sql_class.cc:
Use List_iterator_fast
sql/sql_class.h:
Create new class for UNION
sql/sql_handler.cc:
Use List_iterator_fast
sql/sql_insert.cc:
Use List_iterator_fast
sql/sql_lex.h:
Cleanup
sql/sql_list.cc:
Faster iteration of lists
sql/sql_list.h:
Faster iterations of lists
sql/sql_load.cc:
Use List_iterator_fast
sql/sql_parse.cc:
Fix UNION code
sql/sql_select.cc:
Use List_iterator_fast
Make create_tmp_table more general to be usable by UNION
sql/sql_select.h:
Changes to speed up copy_fields()
sql/sql_show.cc:
Use List_iterator_fast
sql/sql_table.cc:
Use List_iterator_fast
sql/sql_union.cc:
Fix UNION code
sql/sql_update.cc:
Use List_iterator_fast
sql/sql_yacc.yy:
Fix UNION code
New faster list iterators
Change list code to be simpler and faster
Optimize count(distinct)
New error messages for UNION
Make create_tmp_table more general to be usable by UNION
Extended default arguments to be up to 4095 characters
Docs/manual.texi:
Update lof LOCK TABLES
mysql-test/r/order_by.result:
Test for optimizer bug in ORDER BY
mysql-test/t/order_by.test:
Test for optimizer bug in ORDER BY
mysys/default.c:
Extended default arguments to be up to 4095 characters
sql/sql_select.cc:
Fixed optimizer bug in ORDER BY
mysql-test/t/multi_update.test:
Making a test change the order of the tables, so that initalize_tables
would be tested properly
mysys/my_compress.c:
Just changed my e-mail address .... ;o)
sql/filesort.cc:
Making sure that merge_buffers can not be killed
sql/sql_class.h:
Added initialize_tables
sql/sql_delete.cc:
Making final changes for multi table delete, beta version !!
sql/sql_select.cc:
same as above
BitKeeper/etc/ignore:
Added locked to the ignore list
Docs/manual.texi:
Update with changes from old version of the 4.0 manual.
mysql-test/r/order_by.result:
New tests for ORDER BY ... DESC
mysql-test/t/order_by.test:
New tests for ORDER BY ... DESC
sql/sql_delete.cc:
Removed DEBUG code
