include/mysql_com.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
myisam/mi_check.c:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_select.cc:
Auto merged
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
myisam/mi_check.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
and BUG#1654: Stored Procedure Crash if contains subquery and set function
Disallowed subselects in RETURN (for FUNCTIONs) and SET of local variables.
The latter should work, but turned out to be difficult to fix, so we just
disallow it for the time being.
include/mysqld_error.h:
New error message for unsupported subselect as SP set values (for the time being).
include/sql_state.h:
New error message for unsupported subselect as SP set values (for the time being).
mysql-test/r/sp-error.result:
Test cases for BUG#336 and BUG#1654. (Unsupported use of subselect)
mysql-test/t/sp-error.test:
Test cases for BUG#336 and BUG#1654. (Unsupported use of subselect)
sql/item.cc:
Made Item_splocal::type() work at compile time, for error checking.
sql/item.h:
Made Item_splocal::type() work at compile time, for error checking.
sql/share/czech/errmsg.txt:
New error message for unsupported subselect as SP set values (for the time being).
sql/share/danish/errmsg.txt:
New error message for unsupported subselect as SP set values (for the time being).
sql/share/dutch/errmsg.txt:
New error message for unsupported subselect as SP set values (for the time being).
sql/share/english/errmsg.txt:
New error message for unsupported subselect as SP set values (for the time being).
sql/share/estonian/errmsg.txt:
New error message for unsupported subselect as SP set values (for the time being).
sql/share/french/errmsg.txt:
New error message for unsupported subselect as SP set values (for the time being).
sql/share/german/errmsg.txt:
New error message for unsupported subselect as SP set values (for the time being).
sql/share/greek/errmsg.txt:
New error message for unsupported subselect as SP set values (for the time being).
sql/share/hungarian/errmsg.txt:
New error message for unsupported subselect as SP set values (for the time being).
sql/share/italian/errmsg.txt:
New error message for unsupported subselect as SP set values (for the time being).
sql/share/japanese/errmsg.txt:
New error message for unsupported subselect as SP set values (for the time being).
sql/share/korean/errmsg.txt:
New error message for unsupported subselect as SP set values (for the time being).
sql/share/norwegian-ny/errmsg.txt:
New error message for unsupported subselect as SP set values (for the time being).
sql/share/norwegian/errmsg.txt:
New error message for unsupported subselect as SP set values (for the time being).
sql/share/polish/errmsg.txt:
New error message for unsupported subselect as SP set values (for the time being).
sql/share/portuguese/errmsg.txt:
New error message for unsupported subselect as SP set values (for the time being).
sql/share/romanian/errmsg.txt:
New error message for unsupported subselect as SP set values (for the time being).
sql/share/russian/errmsg.txt:
New error message for unsupported subselect as SP set values (for the time being).
sql/share/serbian/errmsg.txt:
New error message for unsupported subselect as SP set values (for the time being).
sql/share/slovak/errmsg.txt:
New error message for unsupported subselect as SP set values (for the time being).
sql/share/spanish/errmsg.txt:
New error message for unsupported subselect as SP set values (for the time being).
sql/share/swedish/errmsg.txt:
New error message for unsupported subselect as SP set values (for the time being).
sql/share/ukrainian/errmsg.txt:
New error message for unsupported subselect as SP set values (for the time being).
sql/sp_head.cc:
Fixed (bogus) compile error on HP-UX alpha.
sql/sql_yacc.yy:
Disallowed subselects in RETURN (for FUNCTIONs) and SET of local variables.
The latter should work, but turned out to be difficult to fix, so we just
disallow it for the time being.
mysql-test/r/create.result:
Auto merged
mysql-test/t/create.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
include/mysqld_error.h:
Merge for updates
mysql-test/r/rpl_change_master.result:
Merge for updates
sql/share/czech/errmsg.txt:
Merge for updates
sql/share/danish/errmsg.txt:
Merge for updates
sql/share/dutch/errmsg.txt:
Merge for updates
sql/share/english/errmsg.txt:
Merge for updates
sql/share/estonian/errmsg.txt:
Merge for updates
sql/share/french/errmsg.txt:
Merge for updates
sql/share/german/errmsg.txt:
Merge for updates
sql/share/greek/errmsg.txt:
Merge for updates
sql/share/hungarian/errmsg.txt:
Merge for updates
sql/share/italian/errmsg.txt:
Merge for updates
sql/share/japanese/errmsg.txt:
Merge for updates
sql/share/korean/errmsg.txt:
Merge for updates
sql/share/norwegian-ny/errmsg.txt:
Merge for updates
sql/share/norwegian/errmsg.txt:
Merge for updates
sql/share/polish/errmsg.txt:
Merge for updates
sql/share/portuguese/errmsg.txt:
Merge for updates
sql/share/romanian/errmsg.txt:
Merge for updates
sql/share/russian/errmsg.txt:
Merge for updates
sql/share/serbian/errmsg.txt:
Merge for updates
sql/share/slovak/errmsg.txt:
Merge for updates
sql/share/spanish/errmsg.txt:
Merge for updates
sql/share/swedish/errmsg.txt:
Merge for updates
sql/share/ukrainian/errmsg.txt:
Merge for updates
include/mysqld_error.h:
New error message: unknown table engine
mysql-test/r/create.result:
New error message: unknown table engine
mysql-test/t/create.test:
New error message: unknown table engine
sql/lex.h:
Remove some keywords: HEAP, ISAM, MERGE, MEMORY, MRG_MYISAM, MYISAM
sql/mysql_priv.h:
Remove unused symbol
sql/set_var.h:
New system variable type: sys_var_thd_table_type
sql/sql_yacc.yy:
Remove tokens and make table_types resolve at run time
sql/sql_show.cc:
Tidy up
sql/sql_table.cc:
Tidy up
include/sql_state.h:
Fix indent
sql/mysqld.cc:
optimize
mysql-test/r/rpl_change_master.result:
It wouldn't pass the tests
mysql-test/r/variables.result:
Fix for changes
mysql-test/r/warnings.result:
Fix for changes
mysql-test/t/variables.test:
Fix for changes
sql/handler.h:
parameter is a const
sql/set_var.cc:
Code clean up for sys_var_thd_table_type::check()
sql/handler.cc:
More tidyup
sql/share/czech/errmsg.txt:
Fixups during review
sql/share/danish/errmsg.txt:
Fixups during review
sql/share/dutch/errmsg.txt:
Fixups during review
sql/share/english/errmsg.txt:
Fixups during review
sql/share/estonian/errmsg.txt:
Fixups during review
sql/share/french/errmsg.txt:
Fixups during review
sql/share/german/errmsg.txt:
Fixups during review
sql/share/greek/errmsg.txt:
Fixups during review
sql/share/hungarian/errmsg.txt:
Fixups during review
sql/share/italian/errmsg.txt:
Fixups during review
sql/share/japanese/errmsg.txt:
Fixups during review
sql/share/korean/errmsg.txt:
Fixups during review
sql/share/norwegian-ny/errmsg.txt:
Fixups during review
sql/share/norwegian/errmsg.txt:
Fixups during review
sql/share/polish/errmsg.txt:
Fixups during review
sql/share/portuguese/errmsg.txt:
Fixups during review
sql/share/romanian/errmsg.txt:
Fixups during review
sql/share/russian/errmsg.txt:
Fixups during review
sql/share/serbian/errmsg.txt:
Fixups during review
sql/share/slovak/errmsg.txt:
Fixups during review
sql/share/spanish/errmsg.txt:
Fixups during review
sql/share/swedish/errmsg.txt:
Fixups during review
sql/share/ukrainian/errmsg.txt:
Fixups during review
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisamdef.h:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/install_test_db.sh:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/subselect.test:
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/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
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/protocol.cc:
Auto merged
sql/protocol.h:
Auto merged
sql/protocol_cursor.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_error.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_list.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
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
include/mysqld_error.h:
Changed "query" into "statement".
include/sql_state.h:
Changed "query" into "statement", and corrected SQL state code.
mysql-test/r/sp-error.result:
Changed "query" into "statement", and corrected SQL state code.
sql/share/czech/errmsg.txt:
Changed "query" into "statement".
sql/share/danish/errmsg.txt:
Changed "query" into "statement".
sql/share/dutch/errmsg.txt:
Changed "query" into "statement".
sql/share/english/errmsg.txt:
Changed "query" into "statement".
sql/share/estonian/errmsg.txt:
Changed "query" into "statement".
sql/share/french/errmsg.txt:
Changed "query" into "statement".
sql/share/german/errmsg.txt:
Changed "query" into "statement".
sql/share/greek/errmsg.txt:
Changed "query" into "statement".
sql/share/hungarian/errmsg.txt:
Changed "query" into "statement".
sql/share/italian/errmsg.txt:
Changed "query" into "statement".
sql/share/japanese/errmsg.txt:
Changed "query" into "statement".
sql/share/korean/errmsg.txt:
Changed "query" into "statement".
sql/share/norwegian-ny/errmsg.txt:
Changed "query" into "statement".
sql/share/norwegian/errmsg.txt:
Changed "query" into "statement".
sql/share/polish/errmsg.txt:
Changed "query" into "statement".
sql/share/portuguese/errmsg.txt:
Changed "query" into "statement".
sql/share/romanian/errmsg.txt:
Changed "query" into "statement".
sql/share/russian/errmsg.txt:
Changed "query" into "statement".
sql/share/serbian/errmsg.txt:
Changed "query" into "statement".
sql/share/slovak/errmsg.txt:
Changed "query" into "statement".
sql/share/spanish/errmsg.txt:
Changed "query" into "statement".
sql/share/swedish/errmsg.txt:
Changed "query" into "statement".
sql/share/ukrainian/errmsg.txt:
Changed "query" into "statement".
sql/sql_yacc.yy:
Changed "query" into "statement".
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
client/mysql.cc:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/Makefile.am:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysql-test/r/rpl_temporary.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/Makefile.am:
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/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.h:
Auto merged
There were errors in cp850: in unicode, ctype and sort arrays
sql/share/charsets/cp850.xml:
There were errors in cp850: in unicode, ctype and sort arrays
myisam/ft_nlq_search.c:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/dutch/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/serbian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables.
ALTER TABLE table_name ... CHARACTER SET ... now changes all char/varchar/text columns to the given character set
(One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set)
Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib)
New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones)
Removed compiler warnings
Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag.
BUILD/compile-pentium-valgrind-max:
Add test of isam
client/mysql.cc:
CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
include/my_base.h:
Remove HA_EXTRA_SET_KEY_CACHE
include/my_no_pthread.h:
Add defines to ignore rw-locks when running without threads
include/my_sys.h:
Added function for multi-key-caches
include/myisam.h:
Added function to handle multi-key-caches
include/mysql.h:
Added mysql_set_server_option
include/mysql_com.h:
CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
Added enum_mysql_set_option
include/mysqld_error.h:
Added error message for unknown key cache
innobase/srv/srv0start.c:
Removed warning that is confused for MySQL users
libmysql/libmysql.c:
Added mysql_set_server_option()
libmysql/libmysql.def:
Added mysql_set_server_option()
myisam/ft_nlq_search.c:
Removed compiler warning
myisam/ft_static.c:
Removed compiler warning and fixed wrong return value
myisam/mi_check.c:
Clean up multi-key-cache usage
myisam/mi_checksum.c:
Removed not used variable
myisam/mi_close.c:
keycache -> key_cache
myisam/mi_delete_all.c:
keycache -> key_cache
myisam/mi_extra.c:
keycache -> key_cache
Removed HA_EXTRA_SET_KEY_CACHE
myisam/mi_keycache.c:
Changed logic so that it's MyISAM that is responsible for assign tables to different key caches instead of the upper level
myisam/mi_locking.c:
Don't change key cache on unlock (must be done before)
myisam/mi_open.c:
Fetch key cache to use from multi_key_cache_search()
myisam/mi_page.c:
keycache -> key_cache
myisam/mi_panic.c:
keycache -> key_cache
myisam/mi_preload.c:
keycache -> key_cache
myisam/mi_test1.c:
Use KEY_CACHE_BLOCK_SIZE
myisam/mi_test2.c:
Always test resize_key_cache()
myisam/mi_test3.c:
Use KEY_CACHE_BLOCK_SIZE instead of 512
myisam/myisamchk.c:
update for multiple key caches
myisam/myisamdef.h:
Remove reg_keycache
Add unique_name_length for storing length of unique_file_name
myisam/myisamlog.c:
Change how end_key_cache() is called
mysql-test/mysql-test-run.sh:
Fixed web link
Added name of failed test to abort row.
mysql-test/r/alter_table.result:
Testing of ALTER TABLE ... [DEFAULT] CHARACTER SET
mysql-test/r/case.result:
Update result for DEFAULT CHARSET...
mysql-test/r/cast.result:
Update result for DEFAULT CHARSET...
mysql-test/r/create.result:
Update result for DEFAULT CHARSET...
mysql-test/r/ctype_collate.result:
Update result for DEFAULT CHARSET...
mysql-test/r/ctype_latin1_de.result:
Update result for DEFAULT CHARSET...
mysql-test/r/ctype_many.result:
Update result for DEFAULT CHARSET...
mysql-test/r/ctype_mb.result:
Update result for DEFAULT CHARSET...
mysql-test/r/ctype_recoding.result:
Update result for DEFAULT CHARSET...
mysql-test/r/ctype_ucs.result:
Update result for DEFAULT CHARSET...
mysql-test/r/derived.result:
Use STRAIGHT_JOIN to make join order predictable
mysql-test/r/fulltext.result:
Update result for DEFAULT CHARSET...
mysql-test/r/func_str.result:
Update result for DEFAULT CHARSET...
mysql-test/r/func_system.result:
Update result for DEFAULT CHARSET...
mysql-test/r/gis-rtree.result:
Update result for DEFAULT CHARSET...
mysql-test/r/innodb.result:
Update result for DEFAULT CHARSET...
mysql-test/r/key_cache.result:
Update test for new key cache syntax.
Added more tests
mysql-test/r/merge.result:
Update result for DEFAULT CHARSET...
mysql-test/r/preload.result:
New syntax
mysql-test/r/show_check.result:
Update result for DEFAULT CHARSET...
mysql-test/r/sql_mode.result:
Update result for DEFAULT CHARSET...
mysql-test/r/subselect.result:
Update result for DEFAULT CHARSET...
mysql-test/r/type_blob.result:
Update result for DEFAULT CHARSET...
mysql-test/r/type_enum.result:
Update result for DEFAULT CHARSET...
mysql-test/r/type_nchar.result:
Update result for DEFAULT CHARSET...
mysql-test/r/type_set.result:
Update result for DEFAULT CHARSET...
mysql-test/r/union.result:
Use STRAIGHT_JOIN to make join order predictable
mysql-test/t/alter_table.test:
Testing of ALTER TABLE ... [DEFAULT] CHARACTER SET
mysql-test/t/ctype_many.test:
Update result for DEFAULT CHARSET...
mysql-test/t/derived.test:
Use STRAIGHT_JOIN to make join order predictable
mysql-test/t/isam.test:
Use disable warnings for test loop
mysql-test/t/join.test:
Update test now when we only support 61 tables in join
mysql-test/t/key_cache.test:
Update test for new key cache syntax.
Added more tests
mysql-test/t/preload.test:
Update for new syntax
mysql-test/t/union.test:
Use STRAIGHT_JOIN to make join order predictable
mysys/Makefile.am:
Added mf_keycaches.c
mysys/hash.c:
TRUE -> 1
mysys/mf_keycache.c:
Removed compiler warnings
Striped end space
Fixed indentation and improved function comments
TRUE -> 1
Changed parameters to end_key_cache() to make it easer to use
Fixed bug when using key blocks size > 1024 bytes (First part of index file could be overwritten with wrong data)
Split function flush_key_blocks into two functions to not get mutex used twice when called from flush_all_key_blocks()
mysys/my_bitmap.c:
More debugging
Safe bitmap_free()
Fixed indentation
mysys/my_getopt.c:
Ensure that we initialize option->value, option->max_value and value from GET_ASK_ADDR
mysys/my_thr_init.c:
Remove not used mutex THR_LOCK_keycache
mysys/typelib.c:
Fixed function comments
sql-common/client.c:
CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
Fixed the multi_result flag is set also on SELECT;s
sql/ha_myisam.cc:
Fixed multiple key_cache handling
(Now done on MyISAM level)
sql/ha_myisammrg.cc:
Fixed multiple key_cache handling
(Now done on MyISAM level)
sql/handler.cc:
New multi key cache handling
sql/handler.h:
New multi key cache handling
Added support for default character set
sql/item.h:
Added function cleanup() (Needed for prepared statements / cursors)
sql/item_cmpfunc.h:
Added cleanup function
sql/item_func.cc:
Indentation cleanup
sql/mysql_priv.h:
New multi-key-cache functions
Removed LOCK_assign
sql/mysqld.cc:
New multi-key-cache handling
Fixed that variable have_compress is set correctly
sql/protocol.cc:
SELECT didn't work reliable in multi-statements
sql/set_var.cc:
Support for new key cache variables
sql/set_var.h:
Support for new key cache variables
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/serbian/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/sql_base.cc:
Removed all key_cache handling (this is now done on MyISAM level)
Change table_charset -> default_table_charset
sql/sql_db.cc:
table_charset -> default_table_charset
sql/sql_delete.cc:
table_charset -> default_table_charset
sql/sql_lex.cc:
CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
sql/sql_lex.h:
New option to store a name and length
sql/sql_parse.cc:
Support for mysql_set_server_option()
Reset "default" keycache status variables in 'FLUSH STATUS' (Need to be improved later)
sql/sql_show.cc:
Add DEFAULT before CHARSET (for table character sets)
Fetch key cache variables from 'sql_key_cache'
sql/sql_table.cc:
table_charset -> default_table_charset
New multi-key-cache handling
sql/sql_test.cc:
Write information from all key caches
sql/sql_yacc.yy:
Changed syntax for CACHE INDEX ...
Force user to use DEFAULT before database/table level character sets
sql/structs.h:
Added SHOW_KEY_CACHE_LONG (to get values from sql_key_cache)
sql/table.cc:
table_charset -> default_table_charset
sql/table.h:
New key cache handling (this is now done in mysys/mf_keycaches.c)
sql/unireg.h:
A
WL#1263: Support for the attributes COMMENT and SUID
in CREATE/ALTER PROCEDURE/FUNCTION
include/mysqld_error.h:
Error code for 'alter procedure'
mysql-test/r/sp-error.result:
Test for WL#1241&WL#1263
mysql-test/r/sp.result:
Test for WL#1241&WL#1263
mysql-test/t/sp-error.test:
Test for WL#1241&WL#1263
mysql-test/t/sp.test:
Test for WL#1241&WL#1263
sql/share/czech/errmsg.txt:
Error massage for 'alter procedure'
sql/share/danish/errmsg.txt:
Error massage for 'alter procedure'
sql/share/dutch/errmsg.txt:
Error massage for 'alter procedure'
sql/share/english/errmsg.txt:
Error massage for 'alter procedure'
sql/share/estonian/errmsg.txt:
Error massage for 'alter procedure'
sql/share/french/errmsg.txt:
Error massage for 'alter procedure'
sql/share/german/errmsg.txt:
Error massage for 'alter procedure'
sql/share/greek/errmsg.txt:
Error massage for 'alter procedure'
sql/share/hungarian/errmsg.txt:
Error massage for 'alter procedure'
sql/share/italian/errmsg.txt:
Error massage for 'alter procedure'
sql/share/japanese/errmsg.txt:
Error massage for 'alter procedure'
sql/share/korean/errmsg.txt:
Error massage for 'alter procedure'
sql/share/norwegian-ny/errmsg.txt:
Error massage for 'alter procedure'
sql/share/norwegian/errmsg.txt:
Error massage for 'alter procedure'
sql/share/polish/errmsg.txt:
Error massage for 'alter procedure'
sql/share/portuguese/errmsg.txt:
Error massage for 'alter procedure'
sql/share/romanian/errmsg.txt:
Error massage for 'alter procedure'
sql/share/russian/errmsg.txt:
Error massage for 'alter procedure'
sql/share/serbian/errmsg.txt:
Error massage for 'alter procedure'
sql/share/slovak/errmsg.txt:
Error massage for 'alter procedure'
sql/share/spanish/errmsg.txt:
Error massage for 'alter procedure'
sql/share/swedish/errmsg.txt:
Error massage for 'alter procedure'
sql/share/ukrainian/errmsg.txt:
Error massage for 'alter procedure'
(For multi-lingual support.)
Also fixed memory leak when aborting parsing for a duplicate cursor.
include/mysqld_error.h:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
mysql-test/r/sp-error.result:
Fixed error message for duplicate variable.
mysql-test/t/sp-error.test:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
sql/share/czech/errmsg.txt:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
sql/share/danish/errmsg.txt:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
sql/share/dutch/errmsg.txt:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
sql/share/english/errmsg.txt:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
sql/share/estonian/errmsg.txt:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
sql/share/french/errmsg.txt:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
sql/share/german/errmsg.txt:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
sql/share/greek/errmsg.txt:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
sql/share/hungarian/errmsg.txt:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
sql/share/italian/errmsg.txt:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
sql/share/japanese/errmsg.txt:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
sql/share/korean/errmsg.txt:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
sql/share/norwegian-ny/errmsg.txt:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
sql/share/norwegian/errmsg.txt:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
sql/share/polish/errmsg.txt:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
sql/share/portuguese/errmsg.txt:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
sql/share/romanian/errmsg.txt:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
sql/share/russian/errmsg.txt:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
sql/share/serbian/errmsg.txt:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
sql/share/slovak/errmsg.txt:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
sql/share/spanish/errmsg.txt:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
sql/share/swedish/errmsg.txt:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
sql/share/ukrainian/errmsg.txt:
Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
- Duplicate parameters/variables, conditions and cursors (not allowed).
- ITERATE in labelled BEGIN-END (not allowed).
- Missing SQLSTATE [VALUE] keywords in CONDITION/HANDLER declaration (added).
- Empty BEGIN-END (now allowed).
- End label (now optional).
include/mysqld_error.h:
New error code for duplicate things (vars et al) in SPs.
mysql-test/r/sp-error.result:
New error tests for ITERATE in begin-end block and duplicate variables,
conditions and cursors.
mysql-test/r/sp.result:
New tests for empty begin-end blocks, overriding local variables outside scope
only, leave a begin-end block, and SQLSTATE [VALUE] words for CONDITION/HANDLER
declarations.
mysql-test/t/sp-error.test:
New error tests for ITERATE in begin-end block and duplicate variables,
conditions and cursors.
mysql-test/t/sp.test:
New tests for empty begin-end blocks, overriding local variables outside scope
only, leave a begin-end block, and SQLSTATE [VALUE] words for CONDITION/HANDLER
declarations.
sql/lex.h:
New SQLSTATE keyword.
sql/share/czech/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/danish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/dutch/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/english/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/estonian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/french/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/german/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/greek/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/hungarian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/italian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/japanese/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/korean/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/norwegian-ny/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/norwegian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/polish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/portuguese/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/romanian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/russian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/serbian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/slovak/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/spanish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/swedish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/ukrainian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/sp_pcontext.cc:
Keep track on scope limits for error checking of duplicate variables,
conditions and cursors.
sql/sp_pcontext.h:
Keep track on scope limits for error checking of duplicate variables,
conditions and cursors.
Also need to flag BEGIN labels to check for illegal ITERATEs.
sql/sql_yacc.yy:
End-labels in SPs loop and begin-end blocks are now optional.
SQLSTATE [VALUE] added to syntax for sqlstates.
Check for duplicate variable, condition and cursor declarations, but
only in the same scope.
Empty BEGIN-END statements now allowed.
Check if ITERATE is referring to a BEGIN label.
as an error message (which is harmless, but confusing when you
compare the output from comp_err for different language files).
sql/share/italian/errmsg.txt:
Removed trailing blank line as it counts as an error message
(which is harmless, but confusing when you compare the output
from comp_err for different language files).
sql/share/korean/errmsg.txt:
Removed trailing blank line as it counts as an error message
(which is harmless, but confusing when you compare the output
from comp_err for different language files).
sql/share/norwegian/errmsg.txt:
Removed trailing blank line as it counts as an error message
(which is harmless, but confusing when you compare the output
from comp_err for different language files).
Cleaned up (and disabled part of) date/time/datetime format patch. One can't anymore change default read/write date/time/formats.
This is becasue the non standard datetime formats can't be compared as strings and MySQL does still a lot of datetime comparisons as strings
Changed flag argument to str_to_TIME() and get_date() from bool to uint
Removed THD from str_to_xxxx functions and Item class.
Fixed core dump when doing --print-defaults
Move some common string functions to strfunc.cc
Dates as strings are now of type my_charset_bin instead of default_charset()
Introduce IDENT_QUOTED to not have to create an extra copy of simple identifiers (all chars < 128)
Removed xxx_FORMAT_TYPE enums and replaced them with the old TIMESTAMP_xxx enums
Renamed some TIMESTAMP_xxx enums to more appropriate names
Use defines instead of integers for date/time/datetime string lengths
Added to build system and use the new my_strtoll10() function.
BUILD/compile-pentium-valgrind-max:
Remove double printing of warning
VC++Files/libmysqld/libmysqld.dsp:
Added strfunc.cc
VC++Files/sql/mysqld.dsp:
Added strfunc.cc
VC++Files/sql/mysqldmax.dsp:
Added strfunc.cc
VC++Files/strings/strings.dsp:
added my_strtoll10.c
include/m_ctype.h:
Removed MY_LEX_FOUND_IDENT (not used)
include/m_string.h:
Added my_strtoll10()
include/mysqld_error.h:
simplified 'wrong xxx name' error messages
include/sql_state.h:
simplified 'wrong xxx name' error messages
libmysqld/Makefile.am:
Added strfunc.cc
mysql-test/mysql-test-run.sh:
Simplified some options
changed $@ to "$@" in an attempt to handle options with space (Didn't succeed; Problem will disappear when mysql-test-run is rewritten in C)
mysql-test/r/ctype_latin1_de.result:
Added new tests
mysql-test/r/ctype_recoding.result:
Extended tests
mysql-test/r/date_formats.result:
Cleaned up tests
Disabled some tests that can't yet be run
mysql-test/r/func_compress.result:
New error message
mysql-test/r/rpl_temporary.result:
Added new test
mysql-test/t/create.test:
Changed error numbers
mysql-test/t/ctype_latin1_de.test:
New tests
mysql-test/t/ctype_recoding.test:
Extended tests
mysql-test/t/date_formats-master.opt:
Removed datetime_format as we can't handle options with space in mysql-test-run
mysql-test/t/date_formats.test:
Cleaned up tests
Disabled some tests that can't yet be run
mysql-test/t/rpl_temporary.test:
Added testing of open temporary table on slave shutdown
mysql-test/t/symlink.test:
Fixed error numbers
mysys/default.c:
Fixed core dump when doing --print-defaults
sql/Makefile.am:
Added strfunc.cc
sql/derror.cc:
Fixed compiler warning
sql/field.cc:
Changed argument to str_to_TIME() from bool to uint
Removed THD argument from str_to_TIME()
Moved find_enum() and find_set() to strfunc.cc
sql/field.h:
Changed type of last argument to get_date() to be able to handle more options
sql/init.cc:
Remove not used variable dayord
sql/item.cc:
Changed type of last argument to get_date() to be able to handle more options
Removed THD* element from item.
Don't use make_date_time() to generate date/time/datetimes
sql/item.h:
Changed type of last argument to get_date() to be able to handle more options
Removed THD* from Item
sql/item_create.cc:
Indentation cleanup
sql/item_func.cc:
Use new find_type()
sql/item_func.h:
Changed type of last argument to get_date() to be able to handle more options
sql/item_strfunc.h:
space change
sql/item_timefunc.cc:
Changed month_names[] to be easier to use
Moved check_names[] to strfunc.cc
Added back old make_datetime() function
Optimized extract_date_time()
Use my_strtoll10() insetad of my_strntoll()
Optimized make_date_time()
Replaced short variable names with long ones.
Use new functions make_time(), make_date() and make_datetime()
Dates as strings are now of type my_charset_bin instead of default_charset()
Changed Item_func_str_to_date() to by default return a date.
sql/item_timefunc.h:
Changed charset for date string from default_charset() to my_charset_bin
Changed type of last argument to get_date() to be able to handle more options
Use defines instead of integers for date/time/datetime string lengths
sql/mysql_priv.h:
Fixed/added new prototypes
sql/mysqld.cc:
Removed opt_datetime_format_names
Cleaned up handling of date_time format handling. (Fixed core dump when mysqld had error on startup)
Removed some unnecessary double init of collation variables
sql/protocol.cc:
Changed back protocol functions to always return dates in ISO format
sql/set_var.cc:
Added variables time_format, date_format and datetime_format
This had to be recoded becasue checking was done in 'update' method and not in 'check' method.
sql/set_var.h:
Removed class sys_var_datetime_format() as this defined a variable (which doesn't work) instead of updating a variable
sql/share/czech/errmsg.txt:
simplified 'wrong xxx name' error messages
sql/share/danish/errmsg.txt:
simplified 'wrong xxx name' error messages
sql/share/dutch/errmsg.txt:
simplified 'wrong xxx name' error messages
sql/share/english/errmsg.txt:
simplified 'wrong xxx name' error messages
sql/share/estonian/errmsg.txt:
simplified 'wrong xxx name' error messages
sql/share/french/errmsg.txt:
simplified 'wrong xxx name' error messages
sql/share/german/errmsg.txt:
simplified 'wrong xxx name' error messages
sql/share/greek/errmsg.txt:
simplified 'wrong xxx name' error messages
sql/share/hungarian/errmsg.txt:
simplified 'wrong xxx name' error messages
sql/share/italian/errmsg.txt:
simplified 'wrong xxx name' error messages
sql/share/japanese/errmsg.txt:
simplified 'wrong xxx name' error messages
sql/share/korean/errmsg.txt:
simplified 'wrong xxx name' error messages
sql/share/norwegian-ny/errmsg.txt:
simplified 'wrong xxx name' error messages
sql/share/norwegian/errmsg.txt:
simplified 'wrong xxx name' error messages
sql/share/polish/errmsg.txt:
simplified 'wrong xxx name' error messages
sql/share/portuguese/errmsg.txt:
simplified 'wrong xxx name' error messages
sql/share/romanian/errmsg.txt:
simplified 'wrong xxx name' error messages
sql/share/russian/errmsg.txt:
simplified 'wrong xxx name' error messages
sql/share/serbian/errmsg.txt:
simplified 'wrong xxx name' error messages
sql/share/slovak/errmsg.txt:
simplified 'wrong xxx name' error messages
sql/share/spanish/errmsg.txt:
simplified 'wrong xxx name' error messages
sql/share/swedish/errmsg.txt:
simplified 'wrong xxx name' error messages
sql/share/ukrainian/errmsg.txt:
simplified 'wrong xxx name' error messages
sql/sql_base.cc:
Use new find_type()
sql/sql_class.cc:
Allocate/free date_time format variables
sql/sql_class.h:
Define datetime_format variables
sql/sql_db.cc:
Use new ER_WRONG_NAME error
sql/sql_lex.cc:
Change lex to generate IDENT_QUOTED for quoted identifiers or identifers that are using characters > 128.
This enabled us to not have to copy and convert the identifier to utf8 for simpe identifiers
sql/sql_parse.cc:
Use new ER_WRONG_NAME error
Use new find_type() function
sql/sql_prepare.cc:
Use new defines
sql/sql_table.cc:
Use new ER_WRONG_NAME error
sql/sql_yacc.yy:
Don't copy and convert simple identifiers to utf8.
Replace __FORMAT_TYPE defines with TIMESTAMP... defines
sql/structs.h:
Renamed DATETIME_FORMAT to DATE_TIME format to indicate that it's for date/time/datetime formats
Renamed WRONT_TIMESTAMP_FULL to TIMESTAMP_DATETIME_ERROR and TIMESTAMP_FULL to TIMESTAMP_DATETIME
Added KNOWN_DATE_TIME_FORMAT struct for Item_func_get_format
sql/time.cc:
Prepare str_to_TIME and str_to_time() for general date/time handling
Removed THD from str_to... functions
Renamed date/time/datetime functions to use 'date_time' instead of 'datetime'
Added functions to make and copy DATE_TIME_FORMAT's
Added trivial functions 'make_time()', 'make_date()' and 'make_datetime()'
strings/Makefile.am:
Added my_strtoll10()
strings/ctype-bin.c:
Cleared upper part of binary state map to be able to easily identify simple identifiers
strings/my_vsnprintf.c:
F
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-compile-netware-src~1:
Delete: netware/BUILD/compile-netware-src
BitKeeper/deleted/.del-knetware.imp~1:
Delete: netware/BUILD/knetware.imp
client/mysql.cc:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/Makefile.am:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysql-test/r/distinct.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_innodb.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_create.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
BitKeeper/etc/ignore:
auto-union
include/m_ctype.h:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
sql/field.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
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
sql/table.cc:
Auto merged
strings/ctype-simple.c:
Auto merged
include/mysqld_error.h:
added error "Incorrect index name"
mysql-test/r/create.result:
added test for empty index name
mysql-test/t/create.test:
added test for empty index name
sql/share/czech/errmsg.txt:
added error "Incorrect index name"
sql/share/danish/errmsg.txt:
added error "Incorrect index name"
sql/share/dutch/errmsg.txt:
added error "Incorrect index name"
sql/share/english/errmsg.txt:
added error "Incorrect index name"
sql/share/estonian/errmsg.txt:
added error "Incorrect index name"
sql/share/french/errmsg.txt:
added error "Incorrect index name"
sql/share/german/errmsg.txt:
added error "Incorrect index name"
sql/share/greek/errmsg.txt:
added error "Incorrect index name"
sql/share/hungarian/errmsg.txt:
added error "Incorrect index name"
sql/share/italian/errmsg.txt:
added error "Incorrect index name"
sql/share/japanese/errmsg.txt:
added error "Incorrect index name"
sql/share/korean/errmsg.txt:
added error "Incorrect index name"
sql/share/norwegian-ny/errmsg.txt:
added error "Incorrect index name"
sql/share/norwegian/errmsg.txt:
added error "Incorrect index name"
sql/share/polish/errmsg.txt:
added error "Incorrect index name"
sql/share/portuguese/errmsg.txt:
added error "Incorrect index name"
sql/share/romanian/errmsg.txt:
added error "Incorrect index name"
sql/share/russian/errmsg.txt:
added error "Incorrect index name"
sql/share/serbian/errmsg.txt:
added error "Incorrect index name"
sql/share/slovak/errmsg.txt:
added error "Incorrect index name"
sql/share/spanish/errmsg.txt:
added error "Incorrect index name"
sql/share/swedish/errmsg.txt:
added error "Incorrect index name"
sql/share/ukrainian/errmsg.txt:
added error "Incorrect index name"
sql/sql_table.cc:
added checking for wrong index name
(updated) Protocol_cursor class.
Also did some bug fixes.
Docs/sp-imp-spec.txt:
Added CURSOR docs (and fixed typos)
Docs/sp-implemented.txt:
Updated for CURSORs
include/mysqld_error.h:
New error codes/messages for CURSORs
libmysqld/Makefile.am:
SP cursors now needs this.
mysql-test/r/sp-error.result:
New tests for cursors.
mysql-test/r/sp.result:
New tests for cursors.
mysql-test/t/sp-error.test:
New tests for cursors.
mysql-test/t/sp.test:
New tests for cursors.
sql/protocol.cc:
We now always have Protocol_cursor (SPs use it)
sql/protocol.h:
Fixed bugs in Protocol_cursor (for SPs)
sql/protocol_cursor.cc:
Fixed bugs in Protocol_cursor (for SPs)
sql/share/czech/errmsg.txt:
New error codes/messages for CURSORs
sql/share/danish/errmsg.txt:
New error codes/messages for CURSORs
sql/share/dutch/errmsg.txt:
New error codes/messages for CURSORs
sql/share/english/errmsg.txt:
New error codes/messages for CURSORs
sql/share/estonian/errmsg.txt:
New error codes/messages for CURSORs
sql/share/french/errmsg.txt:
New error codes/messages for CURSORs
sql/share/german/errmsg.txt:
New error codes/messages for CURSORs
sql/share/greek/errmsg.txt:
New error codes/messages for CURSORs
sql/share/hungarian/errmsg.txt:
New error codes/messages for CURSORs
sql/share/italian/errmsg.txt:
New error codes/messages for CURSORs
sql/share/japanese/errmsg.txt:
New error codes/messages for CURSORs
sql/share/korean/errmsg.txt:
New error codes/messages for CURSORs
sql/share/norwegian-ny/errmsg.txt:
New error codes/messages for CURSORs
sql/share/norwegian/errmsg.txt:
New error codes/messages for CURSORs
sql/share/polish/errmsg.txt:
New error codes/messages for CURSORs
sql/share/portuguese/errmsg.txt:
New error codes/messages for CURSORs
sql/share/romanian/errmsg.txt:
New error codes/messages for CURSORs
sql/share/russian/errmsg.txt:
New error codes/messages for CURSORs
sql/share/serbian/errmsg.txt:
New error codes/messages for CURSORs
sql/share/slovak/errmsg.txt:
New error codes/messages for CURSORs
sql/share/spanish/errmsg.txt:
New error codes/messages for CURSORs
sql/share/swedish/errmsg.txt:
New error codes/messages for CURSORs
sql/share/ukrainian/errmsg.txt:
New error codes/messages for CURSORs
sql/sp_head.cc:
Added cursor support.
Also fixed problems with item_lists, where pointers and ref_pointer_arrays.
sql/sp_head.h:
Added cursor support
sql/sp_pcontext.cc:
Added cursor support
sql/sp_pcontext.h:
Added cursor support
sql/sp_rcontext.cc:
Added cursor support, in particular the new sp_cursor class.
sql/sp_rcontext.h:
Added cursor support, in particular the new sp_cursor class.
sql/sql_lex.h:
We sometimes need to copy item_lists in LEX when executing substatements in SPs
sql/sql_yacc.yy:
Added minimal cursor support (not the full syntax yet).
include/mysqld_error.h:
new warning
mysql-test/r/query_cache.result:
new warning
sql/set_var.cc:
issue warning is size changed in other way
sql/share/czech/errmsg.txt:
new warning
sql/share/danish/errmsg.txt:
new warning
sql/share/dutch/errmsg.txt:
new warning
sql/share/english/errmsg.txt:
new warning
sql/share/estonian/errmsg.txt:
new warning
sql/share/french/errmsg.txt:
new warning
sql/share/german/errmsg.txt:
new warning
sql/share/greek/errmsg.txt:
new warning
sql/share/hungarian/errmsg.txt:
new warning
sql/share/italian/errmsg.txt:
new warning
sql/share/japanese/errmsg.txt:
new warning
sql/share/korean/errmsg.txt:
new warning
sql/share/norwegian-ny/errmsg.txt:
new warning
sql/share/norwegian/errmsg.txt:
new warning
sql/share/polish/errmsg.txt:
new warning
sql/share/portuguese/errmsg.txt:
new warning
sql/share/romanian/errmsg.txt:
new warning
sql/share/russian/errmsg.txt:
new warning
sql/share/serbian/errmsg.txt:
new warning
sql/share/slovak/errmsg.txt:
new warning
sql/share/spanish/errmsg.txt:
new warning
sql/share/swedish/errmsg.txt:
new warning
sql/share/ukrainian/errmsg.txt:
new warning
mysql-test/r/row.result:
fixed error message as it was suggested by Peter Gulutzan
mysql-test/r/subselect.result:
fixed error message as it was suggested by Peter Gulutzan
sql/share/czech/errmsg.txt:
fixed error message as it was suggested by Peter Gulutzan
sql/share/danish/errmsg.txt:
fixed error message as it was suggested by Peter Gulutzan
sql/share/dutch/errmsg.txt:
fixed error message as it was suggested by Peter Gulutzan
sql/share/english/errmsg.txt:
fixed error message as it was suggested by Peter Gulutzan
sql/share/estonian/errmsg.txt:
fixed error message as it was suggested by Peter Gulutzan
sql/share/french/errmsg.txt:
fixed error message as it was suggested by Peter Gulutzan
sql/share/german/errmsg.txt:
fixed error message as it was suggested by Peter Gulutzan
sql/share/greek/errmsg.txt:
fixed error message as it was suggested by Peter Gulutzan
sql/share/hungarian/errmsg.txt:
fixed error message as it was suggested by Peter Gulutzan
sql/share/italian/errmsg.txt:
fixed error message as it was suggested by Peter Gulutzan
sql/share/japanese/errmsg.txt:
fixed error message as it was suggested by Peter Gulutzan
sql/share/korean/errmsg.txt:
fixed error message as it was suggested by Peter Gulutzan
sql/share/norwegian-ny/errmsg.txt:
fixed error message as it was suggested by Peter Gulutzan
sql/share/norwegian/errmsg.txt:
fixed error message as it was suggested by Peter Gulutzan
sql/share/polish/errmsg.txt:
fixed error message as it was suggested by Peter Gulutzan
sql/share/portuguese/errmsg.txt:
fixed error message as it was suggested by Peter Gulutzan
sql/share/romanian/errmsg.txt:
fixed error message as it was suggested by Peter Gulutzan
sql/share/russian/errmsg.txt:
fixed error message as it was suggested by Peter Gulutzan
sql/share/serbian/errmsg.txt:
fixed error message as it was suggested by Peter Gulutzan
sql/share/slovak/errmsg.txt:
fixed error message as it was suggested by Peter Gulutzan
sql/share/spanish/errmsg.txt:
fixed error message as it was suggested by Peter Gulutzan
sql/share/swedish/errmsg.txt:
fixed error message as it was suggested by Peter Gulutzan
sql/share/ukrainian/errmsg.txt:
fixed error message as it was suggested by Peter Gulutzan
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-errs-4.1
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/dutch/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/serbian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
include/mysqld_error.h:
New error codes/messages for missing RETURNs in FUNCTIONs.
mysql-test/r/sp-error.result:
New error tests for missing RETURNs in FUNCTIONs.
mysql-test/t/sp-error.test:
New error tests for missing RETURNs in FUNCTIONs.
sql/share/czech/errmsg.txt:
New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/danish/errmsg.txt:
New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/dutch/errmsg.txt:
New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/english/errmsg.txt:
New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/estonian/errmsg.txt:
New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/french/errmsg.txt:
New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/german/errmsg.txt:
New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/greek/errmsg.txt:
New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/hungarian/errmsg.txt:
New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/italian/errmsg.txt:
New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/japanese/errmsg.txt:
New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/korean/errmsg.txt:
New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/norwegian-ny/errmsg.txt:
New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/norwegian/errmsg.txt:
New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/polish/errmsg.txt:
New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/portuguese/errmsg.txt:
New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/romanian/errmsg.txt:
New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/russian/errmsg.txt:
New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/serbian/errmsg.txt:
New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/slovak/errmsg.txt:
New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/spanish/errmsg.txt:
New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/swedish/errmsg.txt:
New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/ukrainian/errmsg.txt:
New error codes/messages for missing RETURNs in FUNCTIONs.
sql/sp_head.h:
Check that a FUNCTION contains RETURN.
sql/sql_parse.cc:
Check that a FUNCTION contains RETURN.
sql/sql_yacc.yy:
Check that a FUNCTION contains RETURN.
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
configure.in:
Auto merged
include/my_pthread.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
BitKeeper/deleted/.del-sel000100.result~84ed46856cb3a69f:
Auto merged
BitKeeper/deleted/.del-sel000100.test~548501cad19a1a59:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/r/connect.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysys/my_pthread.c:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/lex.h:
Auto merged
sql/lock.cc:
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/protocol.cc:
Auto merged
sql/records.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_repl.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
MySQL error codes as well.
(No UNDO HANDLERs yet, and no SIGNAL or RESIGNAL.)
WL#850
Docs/sp-imp-spec.txt:
Spec of CONDITIONs and HANDLERs (and updated some old stuff too).
Docs/sp-implemented.txt:
Updated info about caching, CONDITIONs and HANDLERs.
include/mysqld_error.h:
New error for undeclared CONDITION.
libmysqld/Makefile.am:
New file: sp_rcontext.cc.
mysql-test/r/sp-error.result:
New tests for CONDITIONs and HANDLERs.
mysql-test/r/sp.result:
New tests for CONDITIONs and HANDLERs.
mysql-test/t/sp-error.test:
New tests for CONDITIONs and HANDLERs.
mysql-test/t/sp.test:
New tests for CONDITIONs and HANDLERs.
sql/Makefile.am:
New file: sp_rcontext.cc.
sql/lex.h:
New symbols for CONDITIONs, HANDLERs and CURSORs.
sql/mysqld.cc:
Catch error if we have a handler for it.
sql/protocol.cc:
Catch error if we have a handler for it.
sql/share/czech/errmsg.txt:
New error for undeclared CONDITION.
sql/share/danish/errmsg.txt:
New error for undeclared CONDITION.
sql/share/dutch/errmsg.txt:
New error for undeclared CONDITION.
sql/share/english/errmsg.txt:
New error for undeclared CONDITION.
sql/share/estonian/errmsg.txt:
New error for undeclared CONDITION.
sql/share/french/errmsg.txt:
New error for undeclared CONDITION.
sql/share/german/errmsg.txt:
New error for undeclared CONDITION.
sql/share/greek/errmsg.txt:
New error for undeclared CONDITION.
sql/share/hungarian/errmsg.txt:
New error for undeclared CONDITION.
sql/share/italian/errmsg.txt:
New error for undeclared CONDITION.
sql/share/japanese/errmsg.txt:
New error for undeclared CONDITION.
sql/share/korean/errmsg.txt:
New error for undeclared CONDITION.
sql/share/norwegian-ny/errmsg.txt:
New error for undeclared CONDITION.
sql/share/norwegian/errmsg.txt:
New error for undeclared CONDITION.
sql/share/polish/errmsg.txt:
New error for undeclared CONDITION.
sql/share/portuguese/errmsg.txt:
New error for undeclared CONDITION.
sql/share/romanian/errmsg.txt:
New error for undeclared CONDITION.
sql/share/russian/errmsg.txt:
New error for undeclared CONDITION.
sql/share/serbian/errmsg.txt:
New error for undeclared CONDITION.
sql/share/slovak/errmsg.txt:
New error for undeclared CONDITION.
sql/share/spanish/errmsg.txt:
New error for undeclared CONDITION.
sql/share/swedish/errmsg.txt:
New error for undeclared CONDITION.
sql/share/ukrainian/errmsg.txt:
New error for undeclared CONDITION.
sql/sp_head.cc:
New HANDLER code.
sql/sp_head.h:
New HANDLER code.
sql/sp_pcontext.cc:
New CONDITION and HANDLER code.
sql/sp_pcontext.h:
New CONDITION and HANDLER code.
sql/sp_rcontext.h:
New CONDITION and HANDLER code.
sql/sql_yacc.yy:
New CONDITION and HANDLER code.
include/mysqld_error.h:
Added error codes for warnings and error messages for START SLAVE UNTIL
mysql-test/r/rpl000015.result:
Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_empty_master_crash.result:
Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_flush_log_loop.result:
Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_log.result:
Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_log_pos.result:
Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_redirect.result:
Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_replicate_do.result:
Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_rotate_logs.result:
Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
sql/lex.h:
Added UNTIL symbol
sql/log.cc:
Invalidating until_log_name comparison result if group_relay_log_name is changed
sql/log_event.cc:
Invalidating until_log_name comparison result if group_master_log_name is changed
sql/repl_failsafe.cc:
Cancel until condition if LOAD MASTER DATA is executed
sql/share/czech/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/danish/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/dutch/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/english/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/estonian/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/french/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/german/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/greek/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/hungarian/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/italian/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/japanese/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/korean/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/norwegian-ny/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/norwegian/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/polish/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/portuguese/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/romanian/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/russian/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/serbian/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/slovak/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/spanish/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/swedish/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/ukrainian/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/slave.cc:
Fixed wrong locking order in init_relay_log_pos()
Added until condition fields to SHOW SLAVE STATUS
Added checking if UNTIL condition is reached
(added proper method, added its invocation, reorganized locking
in exec_relay_log_event() and next_event())
sql/slave.h:
Members in RELAY_LOG_INFO for storing UNTIL condition. Also
methods for for invalidation of cached UNTIL condition comparison
results
sql/sql_repl.cc:
Now honoring UNTIL clause then starting slave thread. Proper
errors and warnings.
sql/sql_yacc.yy:
Added support for UNTIL clause in START SLAVE. This involved
extraction of some of master_defs to separate master_file_def
non-terminal.
bug#1269
sql/share/czech/errmsg.txt:
error messages from english/errmsg.txt added to other languages.
bug##1269
sql/share/danish/errmsg.txt:
error messages from english/errmsg.txt added to other languages.
bug##1269
sql/share/dutch/errmsg.txt:
error messages from english/errmsg.txt added to other languages.
bug##1269
sql/share/estonian/errmsg.txt:
error messages from english/errmsg.txt added to other languages.
bug##1269
sql/share/french/errmsg.txt:
error messages from english/errmsg.txt added to other languages.
bug##1269
sql/share/german/errmsg.txt:
error messages from english/errmsg.txt added to other languages.
bug##1269
sql/share/greek/errmsg.txt:
error messages from english/errmsg.txt added to other languages.
bug##1269
sql/share/hungarian/errmsg.txt:
error messages from english/errmsg.txt added to other languages.
bug##1269
sql/share/italian/errmsg.txt:
error messages from english/errmsg.txt added to other languages.
bug##1269
sql/share/japanese/errmsg.txt:
error messages from english/errmsg.txt added to other languages.
bug##1269
sql/share/korean/errmsg.txt:
error messages from english/errmsg.txt added to other languages.
bug##1269
sql/share/norwegian-ny/errmsg.txt:
error messages from english/errmsg.txt added to other languages.
bug##1269
sql/share/norwegian/errmsg.txt:
error messages from english/errmsg.txt added to other languages.
bug##1269
sql/share/polish/errmsg.txt:
error messages from english/errmsg.txt added to other languages.
bug##1269
sql/share/portuguese/errmsg.txt:
error messages from english/errmsg.txt added to other languages.
bug##1269
sql/share/romanian/errmsg.txt:
error messages from english/errmsg.txt added to other languages.
bug##1269
sql/share/russian/errmsg.txt:
error messages from english/errmsg.txt added to other languages.
bug##1269
sql/share/serbian/errmsg.txt:
error messages from english/errmsg.txt added to other languages.
bug##1269
sql/share/slovak/errmsg.txt:
error messages from english/errmsg.txt added to other languages.
bug##1269
sql/share/spanish/errmsg.txt:
error messages from english/errmsg.txt added to other languages.
bug##1269
sql/share/swedish/errmsg.txt:
error messages from english/errmsg.txt added to other languages.
bug##1269
sql/share/ukrainian/errmsg.txt:
error messages from english/errmsg.txt added to other languages.
bug##1269
client/mysqltest.c:
Auto merged
include/mysql.h:
Auto merged
libmysql/errmsg.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/field.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/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
tests/client_test.c:
Auto merged
