more efficient reference creation
fixed table_name of Field in temporary table
mysql-test/r/subselect.result:
test of 2 references bugs
mysql-test/t/subselect.test:
test of 2 references bugs
sql/field.h:
fixed layout
fixed table name of fields of temporary table (derived table)
sql/item.cc:
more efficient reference creation
sql/sql_base.cc:
fixed layout
supported possiblity of item substitute (fixed bug)
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-skipkeys~207548ca813d5081:
'Auto converge rename'
libmysqld/lib_sql.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
New variables @@rand_seed1 and @@rand_seed2 (used by replication)
DROP TEMPORARY TABLE
mysql-test/r/rpl_log.result:
Update of results after last replication change
mysql-test/r/variables.result:
Test of new variables @@rand_seed1 and @@rand_seed2
mysql-test/t/variables.test:
Test of new variables @@rand_seed1 and @@rand_seed2
sql/field.cc:
Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
sql/field.h:
Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
sql/item_func.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/log.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
More debug information
sql/log_event.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/log_event.h:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/set_var.cc:
Add system variables @@rand_seed1 and @@rand_seed2
sql/set_var.h:
Add system variables @@rand_seed1 and @@rand_seed2
sql/slave.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_acl.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_base.cc:
Store DROP of temporary tables in binlog cache
sql/sql_class.h:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_db.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_delete.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_insert.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_lex.h:
DROP TEMPORARY TABLE
sql/sql_load.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_parse.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_rename.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_repl.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_repl.h:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_table.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_update.cc:
Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_yacc.yy:
DROP TEMPORARY
sql/table.cc:
Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
sql/unireg.cc:
Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
Some simple optimizations
Docs/manual.texi:
Updted how binary log works
mysql-test/mysql-test-run.sh:
Added usage of --port to mysqltest
mysql-test/r/func_test.result:
Moved test of datetime comparison to func_time
mysql-test/r/func_time.result:
New test
mysql-test/t/func_test.test:
Moved test of datetime comparison to func_time
mysql-test/t/func_time.test:
Test of DATE BETWEEN TIMESTAMPS
sql/field.h:
Removed wrong patch
sql/item_cmpfunc.cc:
Removed wrong patch
(Need to be fixed by taking into account all arguments to between)
sql/lock.cc:
Removed call to current_thd
sql/set_var.cc:
Don't show 'socket' variable if sockets are not used
sql/sql_base.cc:
Simple optimisation
Will be properly fixed in 4.1 and 5.0
sql/field.h:
Removed wrong (not used code)
sql/item_cmpfunc.cc:
Removed wrong bug fix for problem with timestamp and BETWEEN.
my_charset_latin1
include/m_ctype.h:
my_charset_latin1 is now visible all around the program
sql/field.cc:
date and time fields now have charset arg in constructor
sql/field.h:
date and time fields now have charset arg in constructor
sql/item_timefunc.h:
date and time fields now have charset arg in constructor
strings/ctype.c:
my_charset_latin1 is now visible all around the program
into genie.(none):/home/hf/work/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
include/mysql.h:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/net_pkg.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/r/null_key.result:
Auto merged
mysql-test/r/select.result:
Auto merged
sql/field.h:
Auto merged
sql/field_conv.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/log.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.cc:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-LICENSE~4cfaff8de837acb8:
Auto merged
BitKeeper/deleted/.del-MySQLEULA.txt:
Delete: Docs/MySQLEULA.txt
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
Auto merged
Build-tools/mysql-copyright-2:
Auto merged
Build-tools/mysql-copyright:
Auto merged
heap/heapdef.h:
Auto merged
heap/hp_open.c:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/os/os0thread.c:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/t/null_key.test:
Auto merged
mysys/safemalloc.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
scripts/mysqlhotcopy.sh:
Auto merged
sql/field.h:
Auto merged
sql/field_conv.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/item.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
tests/grant.res:
Auto merged
Build-tools/Do-compile:
merge
Docs/manual.texi:
merge
configure.in:
merge
mysql-test/r/distinct.result:
merge
mysql-test/r/null_key.result:
merge
sql/ha_innodb.cc:
merge
sql/item.h:
merge
sql/log.cc:
merge
sql/mysqld.cc:
merge
support-files/mysql.spec.sh:
merge
Docs/manual.texi:
ChangeLog
sql/field.h:
New virtual function to set a field to null or signal an error
sql/field_conv.cc:
New function to set a field to null or signal an error
sql/item.cc:
When setting a field to null internally (for WHERE testing) don't autoconvert NULL -> now() or last_insert_id()
sql/item.h:
New virtual function to set a field to null or signal an error
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-sql_error.cc~2f1caca8d2485dbe:
Auto merged
BitKeeper/deleted/.del-sql_prepare.cc~f703729793935ed6:
Auto merged
include/mysql.h:
Auto merged
include/violite.h:
Auto merged
libmysqld/embedded_priv.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
libmysqld/lib_vio.c:
Auto merged
sql/field.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/field.cc:
Field_geom implementations
sql/field.h:
Necessary additions to Field_geom type
sql/ha_myisam.cc:
Field_geom works mostly like blob
sql/sql_parse.cc:
working with FIELD_TYPE_GEOM
sql/sql_table.cc:
specifying FIELD_TYPE_GEOMETRY flags
Warning handling and initial prepared statement handling (last not complete yet)
Changed a lot of functions that returned 0/1 to my_bool type.
GRANT handling now uses read/write locks instead of mutex
Change basic net functions to use THD instead of NET
(needed for 4.1 protocol)
Use my_sprintf instead of sprintf() + strlen()
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()
Note that the following test fails (will be fixed ASAP):
sub_select, union, rpl_rotate_logs and rpl_mystery22
BitKeeper/deleted/.del-README~3449730baf983117:
Delete: mysql-test/t/README
BitKeeper/deleted/.del-sql_error.cc~2f1caca8d2485dbe:
Delete: libmysqld/sql_error.cc
BitKeeper/deleted/.del-sql_prepare.cc~f703729793935ed6:
Delete: libmysqld/sql_prepare.cc
Docs/manual.texi:
Updated variable list
client/mysql.cc:
Show warning count to user.
client/mysqltest.c:
Add warnings to test results
configure.in:
New shared library version number
include/errmsg.h:
Indentation cleanup
include/mysql.h:
Removed MYSQL_ERROR
Indentaion cleanups
include/mysql_com.h:
Changed functions to returns true/false to my_bool.
include/mysqld_error.h:
New error messages
isam/pack_isam.c:
Indentation change
libmysql/Makefile.am:
Fix of wrong merge
libmysql/Makefile.shared:
Indentation cleanup
libmysql/errmsg.c:
Removed not used errors
libmysql/libmysql.c:
Change functions to return 1 on error (not -1)
Change type of functions that returns 0/1 to my_bool
Lot of code optimizations.
Lot of changes for prepared statements. This now handles sending of binary data to server.
Receving of binary data is not yet done (will have to wait until server code for this is ready)
mysql_warning_count and mysql_warnings() implemented.
libmysql/libmysql.def:
Added mysql_warnings and mysql_warning_count
libmysql/manager.c:
Fixed wrong testing of result from my_connect()
libmysqld/lib_sql.cc:
Removed global variable THR_NET
Change basic net functions to use THD instead of NET
GRANT handling now uses read/write locks instead of mutex
libmysqld/libmysqld.c:
Changed functions to be my_bool
myisam/ft_boolean_search.c:
Trivial code cleanup
myisam/ft_stopwords.c:
Trivial code cleanup
myisam/mi_check.c:
Update to 4.1 structures
myisam/myisampack.c:
Trivial code cleanup
myisam/rt_key.c:
Code cleanup
myisam/rt_test.c:
Code cleanup
Removed compiler warnings
myisam/sp_key.c:
Indentation changes
myisam/sp_test.c:
Removed compiler warnings
mysql-test/README:
Updated to reflect the new --external flag.
mysql-test/mysql-test-run.sh:
--local (start new server) is now default.
Use --external to test against external server.
mysql-test/r/rollback.result:
Updated for 4.1 warnings
mysql-test/r/rpl_log.result:
Update for 4.1
mysql-test/t/rollback.test:
Updated for 4.1 warnings
mysql-test/t/rpl_log_pos.test:
Portability fix
mysys/hash.c:
Indentation change
mysys/my_error.c:
Indentation change
mysys/tree.c:
Updated file description
sql/field.cc:
Fixed bugs introduced by merge
Use my_sprintf instead of sprintf() + strlen()
sql/field.h:
Add CHARSET_INFO to field structure
sql/gstream.h:
Indentation changes.
Added GPL copyright header
sql/ha_innodb.cc:
Updated parameters for net functions.
sql/item.cc:
Updates of Item_param
Indentation changes
sql/item.h:
Removed size_of() function from item.
sql/item_func.cc:
Update function usage for 4.1
Added get_system_var()
sql/item_func.h:
Indentation change
sql/item_strfunc.cc:
Removed not needed inclusion of gstream.h
Update to use system variables (from 4.0)
sql/item_sum.h:
Removed size_of() functions from item.
sql/item_timefunc.cc:
Change sprintf() + strlen() -> my_sprintf()
Added length parameter to ->append()
sql/item_timefunc.h:
Removed size_of() functions from item.
sql/item_uniq.h:
Removed size_of() functions from item.
sql/lex.h:
Removed SQL_ERROR_COUNT variable
sql/log.cc:
Change sprintf() + strlen() -> my_sprintf()
sql/log_event.cc:
Change sprintf() + strlen() -> my_sprintf()
sql/mini_client.cc:
Added check that one always specifies a length to mc_mysql_query()
sql/mysql_priv.h:
New prototypes
Change of NET -> THD parameter for net functions.
sql/mysqld.cc:
New startup options: 'max_prepared_statements', 'max_error_count'
Updated usage of net functions.
sql/net_pkg.cc:
Change basic net functions to use THD instead of NET
(needed to be able to handle 4.0 and 4.1 protocols)
Lots of function comments
sql/net_serv.cc:
Change int return values -> my_bool
Updated net_write_command() to take an extra header block to be added to the packet.
(This made the prepared statement code much nicer and more efficient)
sql/repl_failsafe.cc:
Update net functions to use THD instead of NET
sql/set_var.cc:
Added @@error_count and @@warning_count variables.
Updated to 4.1 function usage
sql/set_var.h:
Added @@error_count and @@warning_count variables.
sql/share/czech/errmsg.txt:
Removed Warning: from warning error messages.
sql/share/english/errmsg.txt:
Removed Warning: from warning error messages.
sql/share/greek/errmsg.txt:
Removed Warning: from warning error messages.
sql/share/hungarian/errmsg.txt:
Removed Warning: from warning error messages.
sql/share/japanese/errmsg.txt:
Removed Warning: from warning error messages.
sql/share/korean/errmsg.txt:
Removed Warning: from warning error messages.
sql/share/norwegian-ny/errmsg.txt:
Removed Warning: from warning error messages.
sql/share/norwegian/errmsg.txt:
Removed Warning: from warning error messages.
sql/share/polish/errmsg.txt:
Removed Warning: from warning error messages.
sql/share/romanian/errmsg.txt:
Removed Warning: from warning error messages.
sql/share/slovak/errmsg.txt:
Removed Warning: from warning error messages.
sql/share/swedish/errmsg.txt:
Removed Warning: from warning error messages.
sql/slave.cc:
Change basic net functions to use THD instead of NET
skip_load_data_file recoded to fit new client/server protocol
sql/spatial.h:
Added copyright header
Indentation cleanups
sql/sql_acl.cc:
Change basic net functions to use THD instead of NET
GRANT handling now uses read/write locks instead of mutex
sql/sql_analyse.cc:
Change basic net functions to use THD instead of NET
sprintf() + strlen() -> my_sprintf()
sql/sql_base.cc:
More DBUG statements
sql/sql_class.cc:
Change basic net functions to use THD instead of NET
warning and prepared statement handling
sql/sql_class.h:
Change basic net functions to use THD instead of NET
warning and prepared statement handling
sql/sql_db.cc:
Code cleanup & optimization.
sql/sql_delete.cc:
Change basic net functions to use THD instead of NET
sql/sql_derived.cc:
Change basic net functions to use THD instead of NET
sql/sql_do.cc:
Change basic net functions to use THD instead of NET
sql/sql_error.cc:
Big rewrite of error handling.
sql/sql_handler.cc:
Change basic net functions to use THD instead of NET
sql/sql_insert.cc:
Change basic net functions to use THD instead of NET
sql/sql_lex.cc:
Change basic net functions to use THD instead of NET
sql/sql_lex.h:
Added param_count to st_select_lex_node
sql/sql_list.h:
Removed not needed error list.
sql/sql_load.cc:
Change basic net functions to use THD instead of NET
sql/sql_parse.cc:
Change basic net functions to use THD instead of NET
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Update of warning handling.
Added create_select_for_variable() (for SHOW COUNT(*) WARNINGS)
sql/sql_prepare.cc:
Initial prepared statement handling
sql/sql_rename.cc:
Change basic net functions to use THD instead of NET
sql/sql_repl.cc:
Change basic net functions to use THD instead of NET
sql/sql_select.cc:
Small code cleanups
Added missing initialization of error that caused some queries that returned an empty result set to fail
sql/sql_select.h:
Ensure that JOIN.error is properly initialized
sql/sql_show.cc:
Change basic net functions to use THD instead of NET
A lot of optimization
sql/sql_table.cc:
Change basic net functions to use THD instead of NET
Indentaion cleanup
sql/sql_udf.cc:
Change basic net functions to use THD instead of NET
sql/sql_union.cc:
Change basic net functions to use THD instead of NET
sql/sql_update.cc:
Change basic net functions to use THD instead of NET
sql/sql_yacc.yy:
Change basic net functions to use THD instead of NET
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()
sql/structs.h:
Moved structures to files where they was used
sql/table.cc:
Don't accept empty database names
sql/uniques.cc:
Indentation cleanup
sql/unireg.cc:
Change basic net functions to use THD instead of NET
sql/unireg.h:
Added defaults for warnings and prepared statements
strings/ctype-simple.c:
optimization
tests/client_test.c:
Fixed wrong paramaters to printf()
Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
BitKeeper/deleted/.del-getopt.h~a9ae679fa84f395:
Auto merged
BitKeeper/deleted/.del-getvar.c~2a29ff383970fd31:
Auto merged
Docs/manual.texi:
Auto merged
SSL/cacert.pem:
Auto merged
SSL/client-cert.pem:
Auto merged
SSL/client-key.pem:
Auto merged
SSL/server-cert.pem:
Auto merged
SSL/server-key.pem:
Auto merged
client/mysqldump.c:
Auto merged
include/my_base.h:
Auto merged
include/my_sys.h:
Auto merged
include/mysql_com.h:
Auto merged
isam/isamlog.c:
Auto merged
isam/pack_isam.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
myisam/ft_dump.c:
Auto merged
myisam/ft_parser.c:
Auto merged
myisam/ft_static.c:
Auto merged
myisam/ft_test1.c:
Auto merged
myisam/ft_update.c:
Auto merged
myisam/mi_create.c:
Auto merged
myisam/mi_key.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/mi_static.c:
Auto merged
myisam/mi_test1.c:
Auto merged
myisam/mi_test2.c:
Auto merged
myisam/mi_test3.c:
Auto merged
myisam/mi_update.c:
Auto merged
myisam/mi_write.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisamdef.h:
Auto merged
myisam/myisamlog.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/func_math.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/select_found.test:
Auto merged
mysql-test/t/union.test:
Auto merged
mysys/default.c:
Auto merged
mysys/mf_iocache2.c:
Auto merged
mysys/my_error.c:
Auto merged
mysys/my_init.c:
Auto merged
scripts/mysql_config.sh:
Auto merged
sql/convert.cc:
Auto merged
sql/filesort.cc:
Auto merged
sql/gen_lex_hash.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/hostname.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/key.cc:
Auto merged
sql/log.cc:
Auto merged
sql/net_pkg.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql/time.cc:
Auto merged
sql/unireg.cc:
Auto merged
strings/Makefile.am:
Auto merged
strings/ctype-latin1_de.c:
Auto merged
strings/ctype-tis620.c:
Auto merged
tools/mysqlmanager.c:
Auto merged
BitKeeper/deleted/.del-sslopt-case.h~224c80e75dad4997:
merge with 4.0.3
BitKeeper/triggers/post-commit:
merge with 4.0.3
client/mysql.cc:
merge with 4.0.3 + simple optimsation
client/mysqltest.c:
merge with 4.0.3 (Indentation change)
configure.in:
merge with 4.0.3
extra/resolve_stack_dump.c:
merge with 4.0.3 (Indentation change)
include/Makefile.am:
merge with 4.0.3
include/myisam.h:
merge with 4.0.3 (Indentation change)
include/mysql.h:
merge with 4.0.3 (removed not used structure)
include/mysqld_error.h:
merge with 4.0.3
libmysql/Makefile.shared:
merge with 4.0.3
libmysql/libmysql.c:
merge with 4.0.3 (Indentation change)
libmysqld/Makefile.am:
merge with 4.0.3
myisam/ft_boolean_search.c:
merge with 4.0.3 (Indentation change)
myisam/ft_nlq_search.c:
merge with 4.0.3 (Indentation change)
myisam/mi_check.c:
merge with 4.0.3
myisam/mi_search.c:
merge with 4.0.3
myisam/mi_unique.c:
merge with 4.0.3
mysys/Makefile.am:
merge with 4.0.3
mysys/mf_casecnv.c:
merge with 4.0.3
sql-bench/server-cfg.sh:
Removed 8000 max row limit for Innodb
sql/Makefile.am:
merge with 4.0.3
sql/field.cc:
Indentation cleanup
Changed sprintf -> my_sprintf
sql/field.h:
merge with 4.0.3
sql/ha_heap.cc:
merge with 4.0.3 (Indentation change)
sql/item.h:
merge with 4.0.3 (Indentation change)
sql/item_cmpfunc.cc:
merge with 4.0.3
sql/item_cmpfunc.h:
Removed size_of() from items
Indentation cleanup
sql/item_create.cc:
merge
sql/item_create.h:
merge
sql/item_func.cc:
Added comments
Changed string functions to use character set of first string argument as default return characterset
Simple optimizations.
Removed return of uninitalized variable.
sql/item_func.h:
merge
sql/item_strfunc.cc:
merge with 4.0.3 (Indentation change)
sql/item_strfunc.h:
removed size_of()
sql/item_uniq.h:
removed size_of()
sql/lex.h:
merge with 4.0.3 (Indentation change)
sql/log_event.cc:
Add ` around database in 'use database' in binary log.
sql/mysql_priv.h:
merge with 4.0.3
sql/mysqld.cc:
merge with 4.0.3 (Indentation change)
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/share/ukrainian/errmsg.txt:
merge
sql/sql_acl.cc:
merge with 4.0.3
sql/sql_base.cc:
More comments
Fixed bug in send_fields() when using convert
sql/sql_class.cc:
merge
sql/sql_class.h:
Merge with 4.0.3
Moved max_error_count and max_warning_count to variables struct.
sql/sql_delete.cc:
merge with 4.0.3 (Indentation change)
sql/sql_lex.h:
merge with 4.0.3
sql/sql_parse.cc:
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT.
(Should be retrived from variables)
sql/sql_select.cc:
merge with 4.0.3
sql/sql_show.cc:
merge with 4.0.3
sql/sql_union.cc:
merge with 4.0.3
sql/sql_update.cc:
merge with 4.0.3
sql/sql_yacc.yy:
merge with 4.0.3
Indentation cleanup
sql/structs.h:
merge with 4.0.3
sql/table.cc:
merge with 4.0.3
sql/table.h:
merge with 4.0.3
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
BitKeeper/etc/logging_ok:
auto-union
include/my_sys.h:
Auto merged
innobase/include/dyn0dyn.h:
Auto merged
innobase/include/dyn0dyn.ic:
Auto merged
myisam/mi_check.c:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Fixed bugs in my last changeset that made MySQL hard to compile.
Added mutex around some data that could cause table cache corruptions when using OPTIMIZE TABLE / REPAIR TABLE or automatic repair of MyISAM tables.
Added mutex around some data in the slave start/stop code that could cause THD linked list corruptions
Extended my_chsize() to allow one to specify a filler character.
Extend vio_blocking to return the old state (This made some usage of this function much simpler)
Added testing for some functions that they caller have got the required mutexes before calling the function.
Use setrlimit() to ensure that we can write core file if one specifies --core-file.
Added --slave-compressed-protocol
Made 2 the minimum length for ft_min_word_len
Added variables foreign_key_checks & unique_checks.
Less logging from replication code (if not started with --log-warnings)
Changed that SHOW INNODB STATUS requre the SUPER privilege
More DBUG statements and a lot of new code comments
BitKeeper/deleted/.del-rpl_compat.result~c950bc346b12c61a:
Delete: mysql-test/r/rpl_compat.result
BitKeeper/deleted/.del-rpl_compat.test~5f6ba955e02aa95f:
Delete: mysql-test/t/rpl_compat.test
Docs/manual.texi:
Updated manual with fixes in this changeset
client/mysqltest.c:
Indentation cleanup
Better error messages for some error conditions.
include/my_pthread.h:
Added 'safe_mutex_assert_owner()' to check that the thread really owns the mutex.
include/my_sys.h:
Extended my_chsize() to allow one to specify a filler character.
(For MySQL index logs)
include/raid.h:
New my_chsize()
include/violite.h:
Extend vio_blocking to return the old state
innobase/include/dyn0dyn.h:
Merge with 3.23 (AIX DYN_ARRAY_DATA_SIZE)
innobase/include/dyn0dyn.ic:
Merge with 3.23
isam/create.c:
Fix for new my_chsize()
isam/isamchk.c:
Fix for new my_chsize()
isam/pack_isam.c:
Fix for new my_chsize()
libmysql/manager.c:
Fix for new vio_blocking()
libmysqld/lib_sql.cc:
Fix for new open_log()
myisam/mi_cache.c:
Fix typo from previous checking
myisam/mi_check.c:
Fix for new my_chsize()
myisam/mi_create.c:
Fix for new my_chsize()
myisam/mi_delete_all.c:
Fix for new my_chsize()
myisam/myisampack.c:
Fix for new my_chsize()
mysql-test/include/master-slave.inc:
Better initialization for replication tests
mysql-test/mysql-test-run.sh:
Added option --log-warnings
mysql-test/r/insert.result:
More tests if INSERT ...(DEFAULT)
mysql-test/r/rpl000001.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000002.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000003.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000004.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000005.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000006.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000007.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000008.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000009.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000010.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000011.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000012.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000013.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl000014.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl_alter.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl_empty_master_crash.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl_get_lock.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl_log.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl_magic.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl_mystery22.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl_skip_error.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/r/rpl_sporadic_master.result:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/insert.test:
More tests if INSERT ...(DEFAULT)
mysql-test/t/rpl000001.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl000002.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl000003.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl000004.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl000005.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl000006.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl000007.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl000009.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl000011.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl000013.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl000014.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl_alter.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl_empty_master_crash.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl_get_lock.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl_magic.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl_mystery22.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl_skip_error.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysql-test/t/rpl_sporadic_master.test:
Clean up tests for new master-slave.inc
Remove 'use database'
mysys/mf_iocache.c:
More debug info
Force seek after reinit_io_cache()
mysys/mf_iocache2.c:
Added my_b_filelength()
mysys/my_chsize.c:
Extended my_chsize() to allow one to specify a filler character.
(For MySQL index logs)
mysys/raid.cc:
Extended my_chsize() to allow one to specify a filler character.
(For MySQL index logs)
sql/field.h:
Fix for INSERT ... (DEFAULT)
sql/ha_berkeley.h:
Fix for dynamic variables
sql/ha_innodb.cc:
Change sprintf() to my_sprintf() to make code portable.
Fix after sync with 3.23
(We still need to fix the storage of the replication position in innodb)
sql/ha_innodb.h:
Fix for dynamic variables
sql/handler.cc:
Remove writting of COMMIT to the binary log.
(Now done in MYSQL_LOG::write())
sql/item_func.cc:
Query_log_event() now always takes query length.
sql/item_func.h:
Indentation cleanup
sql/item_strfunc.h:
Indentation cleanup
sql/item_timefunc.h:
Indentation cleanup
sql/lock.cc:
Check that we own critical mutexes.
sql/log.cc:
Big code cleanup / rewrite / optimize.
- The index log file has its own IO_CACHE object.
- Many functions totally rewritten to make them smaller and faster.
- New handling of index log files
- Lots of new comments
sql/log_event.cc:
Code cleanup
New comments
sql/log_event.h:
Query_log_event() now always takes query length.
sql/mini_client.cc:
Better error messages on reconnect.
Fixed wrong variable usage from last commit.
sql/mysql_priv.h:
New arguments to open_log()
sql/mysqld.cc:
Use setrlimit() to ensure that we can write core file if one specifies --core-file
Added index file name as parameter to openlog().
Added --slave-compressed-protocol
Made 2 the minimum length for ft_min_word_len
sql/net_serv.cc:
Use new vio_blocking()
(The vio_blocking() change was done to make this code more readable)
sql/repl_failsafe.cc:
Minor code cleanup
sql/set_var.cc:
Added variables slave_compressed_protocol, foreign_key_checks & unique_checks.
sql/set_var.h:
Generalization
sql/slave.cc:
Code cleanup & rewrite.
Dont call SELECT VERSION() on check_master_version()
New init_slave() code.
Ensure that all threads create a THD early.
Add locks around manipulation of critical structures
Don't retry a command more than master_retry_count times.
Write less warnings to the log file (if not started with --log-warnings)
Faster flush_relay_log_info()
sql/slave.h:
More comments
Added new arguments to some functions.
sql/sql_acl.cc:
More DBUG info
New parameter to Query_log_event()
sql/sql_base.cc:
Added some mutex checking.
sql/sql_cache.cc:
Less not critical debug info
sql/sql_class.h:
Fix for new log handling.
sql/sql_db.cc:
Added mutex around remove_db_from_cache()
sql/sql_delete.cc:
Added missing parameters to changed functions
sql/sql_insert.cc:
Added missing parameters to changed functions
sql/sql_parse.cc:
Do an 'end_active_trans()' before 'load_master_data'
Changed that SHOW INNODB STATUS requre the SUPER privilege
Added new function parameters to new functions
sql/sql_rename.cc:
Added missing parameters to changed functions
sql/sql_repl.cc:
Code cleanups / new comments
Fix for new find_first_log() calling standard.
More DBUG statements.
Show binlogs updated to use new IO_CACHE:d index log file.
sql/sql_repl.h:
New function arguments
sql/sql_select.cc:
Indentation changes
sql/sql_table.cc:
Added missing parameters to changed functions
Added checking of mutex
Added mutex around critical regions.
sql/sql_test.cc:
Don't use THR_ALARM if the configuration doesn't support it.
sql/sql_update.cc:
Added missing parameters to changed functions
sql/table.cc:
Added missing parameters to changed functions
vio/vio.c:
Extend vio_blocking to return the old state
vio/viosocket.c:
Extend vio_blocking to return the old state
vio/viossl.c:
Extend vio_blocking to return the old state
C++ comments cleanup
sql/stacktrace.c:
C++ comments cleanup
sql/structs.h:
C++ comments cleanup
sql/ha_myisam.h:
C++ comments cleanup
include/config-os2.h:
C++ comments cleanup
include/sslopt-case.h:
C++ comments cleanup
mysys/mf_tempfile.c:
C++ comments cleanup
sql/mysql_priv.h:
C++ comments cleanup
sql/slave.h:
C++ comments cleanup
sql/time.cc:
C++ comments cleanup
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Fixed that MyISAM were not working properly with non-8bit charsets in some cases
CONVERT() function now works properly
myisam/mi_unique.c:
Fix for non-8bit charsets
sql/field.cc:
Initialize blobs with charset
sql/field.h:
Initialize blobs with charset
sql/field_conv.cc:
Initialize blobs with charset
sql/item_strfunc.cc:
CONVERT() function now has working fix_lenght_and_dec(), and it's own
fix_fields()
sql/item_strfunc.h:
CONVERT() function now has working fix_lenght_and_dec(), and it's own
fix_fields()
sql/sql_select.cc:
Fixes for BLOBs
Fixed that wrong charset was used in some cases
new file
Client-server protocol 4.1 changes - Server side:
* Enhanced metadata information:
- SHOW [COUNT(*)] ERRORS [LIMIT [offset,] rows]
- SHOW [COUNT(*)] WARNING [LIMIT [offset,] rows]
- SHOW TABLE TYPES
- SHOW PRIVILEGES
- SHOW COLUMN TYPES (Not fully implemented)
* Prepared execution
* Long data handling in pieces
* And other misc changes
SHOW DATABASES
CREATE TEMPORARY TABLE
LOCK TABLES
REPLICATION SLAVE & REPLICATION CLIENT
SUPER
EXECUTE
All scripts & documentation is updated for this change.
Added better error messages for global privileges
BitKeeper/deleted/.del-mysql_new_fix_privilege_tables.sh~b1664b401375eece:
Delete: scripts/mysql_new_fix_privilege_tables.sh
Docs/manual.texi:
Updated manual for privilege changes.
include/mysqld_error.h:
new error messages
mysql-test/install_test_db.sh:
Updated to use new privileges
mysql-test/r/grant_cache.result:
Updated to use new privileges
mysql-test/r/rpl000017.result:
Updated to use new privileges
mysql-test/t/rpl000017.test:
Updated to use new privileges
mysys/safemalloc.c:
Cleanup
scripts/mysql_fix_privilege_tables.sh:
Updated to use new privileges
scripts/mysql_install_db.sh:
Updated to use new privileges
sql/field.h:
Cleanup
sql/item_strfunc.cc:
Updated to use new privileges
sql/lex.h:
Updated to use new privileges
sql/log.cc:
Updated to use new privileges
sql/mysql_priv.h:
Updated to use new privileges
sql/mysqld.cc:
Updated to use new privileges
sql/repl_failsafe.cc:
Updated to use new privileges
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
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:
Portability cleanup
sql/sql_acl.cc:
Updated to use new privileges
sql/sql_acl.h:
Updated to use new privileges
sql/sql_base.cc:
Remove not used include file
sql/sql_class.cc:
Comment cleanup
sql/sql_class.h:
Updated to use new privileges
Comment cleanups
sql/sql_insert.cc:
Updated to use new privileges
sql/sql_lex.h:
Indentation cleanup
sql/sql_parse.cc:
Updated to use new privileges
sql/sql_repl.cc:
Updated to use new privileges
Comment cleanup
sql/sql_show.cc:
Updated to use new privileges
sql/sql_yacc.yy:
Updated to use new privileges
Sorted some tockens for easer merge to 4.1 in the future.
sql/table.h:
Updated to use new privileges
tests/grant.pl:
Updated to use new privileges
tests/grant.res:
Updated to use new privileges
Fixes after last merge from 4.0.
(Code not yet complete, need anoter merge from 4.0)
heap/hp_write.c:
cleanup
myisam/ft_boolean_search.c:
Fixed tree handling to new format
mysql-test/r/alter_table.result:
SHOW FULL COLUMN FROM TABLE now returns comment
mysql-test/r/func_math.result:
Updated results
mysql-test/r/heap_btree.result:
Portability fix
mysql-test/r/isam.result:
SHOW FULL COLUMN FROM TABLE now returns comment
mysql-test/r/show_check.result:
SHOW FULL COLUMN FROM TABLE now returns comment
mysql-test/t/heap_btree.test:
Portability fix
mysql-test/t/show_check.test:
SHOW FULL COLUMN FROM TABLE now returns comment
sql/field.cc:
Fix for comment handling
sql/field.h:
Added CHARSET_INFO to field structure
sql/item_cmpfunc.cc:
Fixed like to use system charset (need to be updated)
sql/item_func.cc:
Update to new charset handling
sql/mysql_priv.h:
cleanup
sql/sql_base.cc:
Added charset to HA_CREATE_INFO
sql/sql_delete.cc:
Added charset to HA_CREATE_INFO
sql/sql_parse.cc:
Added charset to HA_CREATE_INFO
sql/sql_select.cc:
cleanup
sql/sql_show.cc:
charset change
sql/sql_string.h:
cleanup
sql/sql_table.cc:
cleanup
sql/sql_yacc.yy:
Go back to old code for ALTER table ... MODIFY
sql/table.cc:
fixed comment handling
sql/unireg.cc:
new field format
However some hacks were used while waiting for new FRM file
sql/field.h:
Added function to set Field charset
sql/filesort.cc:
Temporarily workaround, It seems charset should be passed in argument
sql/ha_heap.cc:
Set correct key charset from Field information
sql/table.cc:
Dirty hack to distinguish columns charsets while waiting for Monty to rewrite FRM file
sql/table.h:
New field: table default character set
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BUILD/FINISH.sh:
Auto merged
BUILD/SETUP.sh:
Auto merged
BUILD/compile-pentium-debug:
Auto merged
acconfig.h:
Auto merged
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
heap/hp_rfirst.c:
Auto merged
heap/hp_rnext.c:
Auto merged
include/my_sys.h:
Auto merged
include/myisam.h:
Auto merged
libmysql/Makefile.shared:
Auto merged
myisam/mi_write.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/heap.test:
Auto merged
mysql-test/t/select_found.test:
Auto merged
mysql-test/t/union.test:
Auto merged
mysys/mf_iocache2.c:
Auto merged
mysys/my_vsnprintf.c:
Auto merged
sql/convert.cc:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/structs.h:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
strings/Makefile.am:
Auto merged
Split handler->option_flag() to handler->table_flags() and handler->index_flags()
Docs/manual.texi:
Updated standard binary options
include/my_base.h:
Update for BTREE keys in HEAP tables
libmysql/net.c:
merge with net_serv.cc
mysql-test/r/func_misc.result:
Update for new behaviour of inet_ntoa
sql/field.cc:
Update for BTREE keys in HEAP tables
sql/field.h:
Update for BTREE keys in HEAP tables
sql/filesort.cc:
Update for BTREE keys in HEAP tables
sql/ha_berkeley.h:
Update for BTREE keys in HEAP tables
sql/ha_heap.h:
Update for BTREE keys in HEAP tables
sql/ha_innodb.h:
Update for BTREE keys in HEAP tables
sql/ha_isam.cc:
Update for BTREE keys in HEAP tables
sql/ha_isam.h:
Update for BTREE keys in HEAP tables
sql/ha_isammrg.h:
Update for BTREE keys in HEAP tables
sql/ha_myisam.cc:
Update for BTREE keys in HEAP tables
sql/ha_myisam.h:
Update for BTREE keys in HEAP tables
sql/ha_myisammrg.h:
Update for BTREE keys in HEAP tables
sql/handler.cc:
Update for BTREE keys in HEAP tables
sql/handler.h:
Update for BTREE keys in HEAP tables
sql/log.cc:
Update for BTREE keys in HEAP tables
sql/net_serv.cc:
Update for BTREE keys in HEAP tables
sql/opt_range.cc:
Update for BTREE keys in HEAP tables
sql/opt_sum.cc:
Update for BTREE keys in HEAP tables
sql/records.cc:
Update for BTREE keys in HEAP tables
sql/sql_class.h:
Update for BTREE keys in HEAP tables
sql/sql_handler.cc:
Update for BTREE keys in HEAP tables
sql/sql_insert.cc:
Update for BTREE keys in HEAP tables
sql/sql_select.cc:
Update for BTREE keys in HEAP tables
sql/sql_show.cc:
Update for BTREE keys in HEAP tables
sql/sql_table.cc:
Update for BTREE keys in HEAP tables
sql/structs.h:
Update for BTREE keys in HEAP tables
sql/table.cc:
Update for BTREE keys in HEAP tables
sql/unireg.cc:
Update for BTREE keys in HEAP tables
client/mysql.cc:
new ctypes
client/mysqldump.c:
new ctypes
client/mysqltest.c:
new ctypes
client/sql_string.cc:
new ctypes
client/sql_string.h:
new ctypes
extra/mysql_install.c:
new ctypes
extra/replace.c:
new ctypes
extra/resolve_stack_dump.c:
new ctypes
extra/resolveip.c:
new ctypes
heap/hp_hash.c:
new ctypes
include/m_ctype.h:
new ctypes
include/my_sys.h:
new ctypes
isam/_key.c:
new ctypes
isam/_search.c:
new ctypes
libmysql/Makefile.shared:
new ctypes
libmysql/libmysql.c:
new ctypes
myisam/ft_dump.c:
new ctypes
myisam/ft_parser.c:
new ctypes
myisam/mi_test1.c:
new ctypes
mysys/charset.c:
new ctypes
mysys/default.c:
new ctypes
mysys/getvar.c:
new ctypes
mysys/hash.c:
new ctypes
mysys/mf_casecnv.c:
new ctypes
mysys/mf_dirname.c:
new ctypes
mysys/mf_format.c:
new ctypes
mysys/mf_iocache2.c:
new ctypes
mysys/mf_soundex.c:
new ctypes
mysys/mf_wfile.c:
new ctypes
mysys/my_error.c:
new ctypes
mysys/my_getwd.c:
new ctypes
mysys/my_init.c:
new ctypes
mysys/my_vsnprintf.c:
new ctypes
mysys/typelib.c:
new ctypes
sql/convert.cc:
new ctypes
sql/des_key_file.cc:
new ctypes
sql/field.cc:
new ctypes
sql/field.h:
new ctypes
sql/field_conv.cc:
new ctypes
sql/filesort.cc:
new ctypes
sql/ha_innodb.cc:
new ctypes
sql/hostname.cc:
new ctypes
sql/init.cc:
new ctypes
sql/item.cc:
new ctypes
sql/item_func.cc:
new ctypes
sql/item_strfunc.cc:
new ctypes
sql/item_sum.cc:
new ctypes
sql/item_timefunc.cc:
new ctypes
sql/key.cc:
new ctypes
sql/log.cc:
new ctypes
sql/mysql_priv.h:
new ctypes
sql/mysqld.cc:
new ctypes
sql/opt_range.cc:
new ctypes
sql/procedure.cc:
new ctypes
sql/slave.cc:
new ctypes
sql/sql_acl.cc:
new ctypes
sql/sql_analyse.cc:
new ctypes
sql/sql_base.cc:
new ctypes
sql/sql_cache.cc:
new ctypes
sql/sql_db.cc:
new ctypes
sql/sql_handler.cc:
new ctypes
sql/sql_lex.cc:
new ctypes
sql/sql_parse.cc:
new ctypes
sql/sql_show.cc:
new ctypes
sql/sql_string.cc:
new ctypes
sql/sql_string.h:
new ctypes
sql/sql_table.cc:
new ctypes
sql/sql_yacc.yy:
new ctypes
sql/table.cc:
new ctypes
sql/time.cc:
new ctypes
strings/Makefile.am:
new ctypes
strings/ctype-big5.c:
new ctypes
strings/ctype-czech.c:
new ctypes
strings/ctype-gbk.c:
new ctypes
strings/ctype-latin1_de.c:
new ctypes
strings/ctype-sjis.c:
new ctypes
strings/ctype-tis620.c:
new ctypes
strings/ctype.c:
new ctypes
strings/str2int.c:
new ctypes
strings/strto.c:
new ctypes
tools/mysqlmanager.c:
new ctypes
creates proper column types, out of any function, expression or from
other tables.
mysql-test/r/create.result:
This is a result for the test which creates all proper column types
out of CREATE ... SELECT ...
Changed some sql_alloc() -> thd->alloc()
Removed a lot of compiler warnings on Linux Alpha (64 bit)
Fixed some core dumps on 64 bit systems (wrong type for packet_len)
Docs/manual.texi:
Added base information about the query cache.
include/hash.h:
Export hash_replace
include/myisam.h:
Update of query cache code
libmysql/net.c:
Add casts to make things safe on 64 bit systems.
myisam/mi_write.c:
Update of query cache code
myisammrg/myrg_extra.c:
Update of query cache code
mysys/hash.c:
Added safety check to hash_replace
sql/field.cc:
Removed compiler warnings.
sql/field.h:
Removed compiler warnings
sql/ha_myisam.cc:
Fixed wrong type of packet_len
sql/item.h:
Remove warnings
sql/log_event.cc:
Cleanup
sql/log_event.h:
Cleanup to make code more readable
sql/mf_iocache.cc:
Fixed wrong type
sql/mysql_priv.h:
Update of query cache code
sql/mysqld.cc:
Update of query cache code
sql/net_serv.cc:
Remove compiler warnings
sql/opt_range.h:
Remove compiler warnings
sql/sql_cache.cc:
Update of query cache code
sql/sql_cache.h:
Update of query cache code
sql/sql_class.h:
Cleanup
sql/sql_insert.cc:
Use thd->alloc() instead of sql_alloc()
sql/sql_parse.cc:
Fixed compiler warnings.
Changed some sql_alloc() -> thd->alloc()
sql/sql_select.cc:
Changed sql_alloc() -> thd_alloc()
sql/sql_select.h:
Faster alloc()
sql/sql_show.cc:
Update of query cache code
sql/sql_table.cc:
Faster alloc()
sql/table.cc:
Faster alloc()
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
include/my_base.h:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/t/rpl000012.test:
Auto merged
BUILD/FINISH.sh:
Auto merged
BitKeeper/deleted/.del-db_ext.h~a1e210bbd0de0a48:
Auto merged
BitKeeper/deleted/.del-mutex_ext.h~f20f47ddc346598b:
Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
Auto merged
Build-tools/Do-all-build-steps:
Auto merged
client/client_priv.h:
Auto merged
client/mysqladmin.c:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/include/univ.i:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
isam/pack_isam.c:
Auto merged
libmysql_r/Makefile.am:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/t/having.test:
Auto merged
mysql-test/t/rpl000015-slave.sh:
Auto merged
mysql-test/t/rpl000016-slave.sh:
Auto merged
mysys/mf_cache.c:
Auto merged
mysys/mf_casecnv.c:
Auto merged
mysys/mf_tempfile.c:
Auto merged
readline/vi_mode.c:
Auto merged
strings/strto.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/time.cc:
Auto merged
BUILD/SETUP.sh:
Use -mcpu as default (safe for all x86 cpu's)
client/mysqldump.c:
Merge from 3.23.44
configure.in:
Update version number
extra/resolveip.c:
Portability fix
Fixed bug with BLOB keys in BDB tables
Fixed problem with MERGE tables on OS with 32 bit files
Fixed that TIME_TO_SEC() works with negative times
Docs/manual.texi:
Changelog
client/mysqladmin.c:
Fix that mysqladmin shutdown can be interrupted with ^C
include/mysqld_error.h:
Fixed typo
mysql-test/r/func_time.result:
Added test case for negative times
mysql-test/t/func_time.test:
Added test case for negative times
mysql-test/t/rpl000015-slave.sh:
Removed warnings
mysql-test/t/rpl000016-slave.sh:
Removed warnings
sql/field.cc:
Fixed bug with BLOB keys in BDB tables
sql/field.h:
Fixed bug with BLOB keys in BDB tables
sql/ha_berkeley.cc:
Fixed bug with BLOB keys in BDB tables
sql/ha_myisammrg.cc:
Fixed problem with MERGE tables on OS with 32 bit files
sql/item_timefunc.cc:
Fixed that TIME_TO_SEC() works with negative times.
sql/share/swedish/errmsg.txt:
Merge with 4.0
sql/sql_acl.cc:
Fixed typo
Safer, a bit faster filesort.
Code changes to avoid calls to current_thd() (faster code).
Removed all compiler warnings from readline.
BitKeeper/etc/ignore:
Add my_global.h back.
Docs/manual.texi:
4.0.1 Changelog
include/my_sys.h:
Added strmake_root
libmysql/libmysql.c:
Don't do signal() on windows (Causes instability problems)
mysys/my_alloc.c:
Added strmake_root
readline/bind.c:
Remove warnings
readline/complete.c:
Remove warnings
readline/display.c:
Remove warnings
readline/funmap.c:
Remove warnings
readline/histexpand.c:
Remove warnings
readline/histfile.c:
Remove warnings
readline/history.h:
Remove warnings
readline/histsearch.c:
Remove warnings
readline/isearch.c:
Remove warnings
readline/kill.c:
Remove warnings
readline/macro.c:
Remove warnings
readline/readline.c:
Remove warnings
readline/readline.h:
Remove warnings
readline/rltty.c:
Remove warnings
readline/search.c:
Remove warnings
readline/shell.c:
Remove warnings
readline/terminal.c:
Remove warnings
readline/tilde.c:
Remove warnings
readline/tilde.h:
Remove warnings
readline/undo.c:
Remove warnings
readline/util.c:
Remove warnings
readline/vi_mode.c:
Remove warnings
sql-bench/server-cfg.sh:
Added use of truncate table
sql-bench/test-insert.sh:
Added use of truncate table
Changed some tests to use keys instead of 'range'
sql-bench/test-wisconsin.sh:
Cleanup
sql/field.cc:
Add 'thd' to send() (To avoid usage of 'current_thd')
sql/field.h:
Add 'thd' to send() (To avoid usage of 'current_thd')
sql/filesort.cc:
Safer memory allocation; Don't allocate pointer to buffers directly, but use an IO_CACHE instead.
This will allow us to use more memory for keys and will also work better if the number of rows that is to be sorted is much larger than expected.
sql/item.cc:
Add 'thd' to send() (To avoid usage of 'current_thd')
sql/item.h:
Add 'thd' to send() (To avoid usage of 'current_thd')
sql/item_func.h:
Cleanup
sql/opt_range.cc:
Use mem_root instead of sql_alloc() to get more speed
sql/sql_class.cc:
Add 'thd' to send() (To avoid usage of 'current_thd')
sql/sql_class.h:
Added strmake()
sql/sql_handler.cc:
Add 'thd' to send() (To avoid usage of 'current_thd')
sql/sql_lex.cc:
Use mem_root instead of sql_alloc() to get more speed
sql/sql_select.cc:
Add 'thd' to send() (To avoid usage of 'current_thd')
tests/fork2_test.pl:
Fixed typos
tests/fork_big.pl:
Fixed typos
tests/insert_and_repair.pl:
Fixed typos
tests/rename_test.pl:
Fixed typos
tests/test_delayed_insert.pl:
Fixed typos
Move MAX_BLOB_WIDTH to be global
Added full support for unsigned BIGINT
Fixed spelling errors
BUILD/compile-pentium-debug-max:
Don't use openssl by default
Docs/manual.texi:
Cleanup of MERGE tables, Access usage and UDF functions
acinclude.m4:
Cleanup ssl usage
configure.in:
Added message when using --with-tools
include/mysql_com.h:
Move MAX_BLOB_WIDTH to be global
myisammrg/myrg_create.c:
Fix problem with MERGE TABLES and INSERT
myisammrg/myrg_static.c:
Fix problem with MERGE TABLES and INSERT
mysql-test/r/bigint.result:
Added test of unsigned BIGINT
mysql-test/r/merge.result:
Tests for INSERT
mysql-test/r/type_ranges.result:
Fixed tests for unsigned bigint
mysql-test/t/bigint.test:
Added test of unsigned BIGINT
mysql-test/t/merge.test:
Tests for INSERT
mysys/typelib.c:
Cleanup
sql/field.h:
Fixed unsigned BIGINT
sql/ha_berkeley.cc:
Cleanup
sql/ha_gemini.cc:
Cleanup
sql/ha_myisam.cc:
Cleanup
sql/ha_myisammrg.cc:
Fixed INSERT into MERGE tables
sql/item.cc:
Fixed unsigned BIGINT
sql/item.h:
Fixed unsigned BIGINT
sql/item_func.cc:
Fixed unsigned BIGINT
sql/item_strfunc.cc:
Fixed spelling errors
sql/item_sum.cc:
Fixed unsigned BIGINT
sql/item_sum.h:
Fixed unsigned BIGINT
sql/mf_iocache.cc:
Fixed spelling errors
sql/mysql_priv.h:
Moved MAX_BLOB_WIDTH to be global
sql/mysqld.cc:
Fixed spelling errors
sql/opt_range.cc:
Fixed spelling errors
sql/sql_base.cc:
Fixed bug in SHOW OPEN TABLES
sql/sql_insert.cc:
Fixed spelling errors
sql/sql_lex.h:
Fixed spelling errors
sql/sql_parse.cc:
Fixed spelling errors
sql/sql_select.cc:
Fix for unsigned BIGINT
sql/structs.h:
Fixed spelling errors
sql/time.cc:
Fixed spelling errors
sql/unireg.cc:
Fixed spelling errors
Some small speedups
Docs/manual.texi:
Changelog
client/mysqldump.c:
Fixed quoting problem for table names when using --opt
mysys/mf_casecnv.c:
Speed up some common string functions
sql-bench/test-insert.sh:
Small changes that shouldn't affect results
sql-bench/test-select.sh:
Small changes that shouldn't affect results
sql/field.h:
Added reset() functions to speed up some common things
sql/gen_lex_hash.cc:
Smaller hash table
sql/ha_innobase.cc:
Fixed bug in auto-increment handling with InnoDB