Portability fixes.
Removed compiler warnings.
VC++Files/client/mysql.dsp:
Updated to 4.0.2
VC++Files/client/mysqladmin.dsp:
Updated to 4.0.2
VC++Files/client/mysqlclient.dsp:
Updated to 4.0.2
VC++Files/client/mysqldump.dsp:
Updated to 4.0.2
VC++Files/client/mysqlimport.dsp:
Updated to 4.0.2
VC++Files/client/mysqlshow.dsp:
Updated to 4.0.2
VC++Files/innobase/innobase.dsp:
Updated to 4.0.2
VC++Files/libmysql/libmySQL.dsp:
Updated to 4.0.2
VC++Files/libmysqltest/myTest.dsp:
Updated to 4.0.2
VC++Files/merge/merge.dsp:
Updated to 4.0.2
VC++Files/myisam/myisam.dsp:
Updated to 4.0.2
VC++Files/mysql.dsw:
Updated to 4.0.2
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Updated to 4.0.2
VC++Files/mysqlcheck/mysqlcheck.dsp:
Updated to 4.0.2
VC++Files/mysqlmanager/MySqlManager.dsp:
Updated to 4.0.2
VC++Files/mysys/mysys.dsp:
Updated to 4.0.2
VC++Files/pack_isam/pack_isam.dsp:
Updated to 4.0.2
VC++Files/perror/perror.dsp:
Updated to 4.0.2
VC++Files/replace/replace.dsp:
Updated to 4.0.2
VC++Files/sql/mysqld.dsp:
Updated to 4.0.2
VC++Files/test1/test1.dsp:
Updated to 4.0.2
VC++Files/thr_insert_test/thr_insert_test.dsp:
Updated to 4.0.2
VC++Files/thr_test/thr_test.dsp:
Updated to 4.0.2
VC++Files/vio/vio.dsp:
Updated to 4.0.2
VC++Files/zlib/zlib.dsp:
Updated to 4.0.2
include/config-win.h:
Added isnan() and finite()
include/myisam.h:
Move thr_xxx functions to myisam_priv.h
myisam/mi_check.c:
Portability fix.
myisam/mi_locking.c:
Comment cleanup
myisam/myisamchk.c:
Removed compiler warning
myisam/myisamdef.h:
Added thr_xxx functions
myisam/sort.c:
Portability fix
sql/field.cc:
Portability fix
sql/sql_insert.cc:
R
Portability fix in safemalloc.c
libmysqld/lib_sql.cc:
Removed not needed define
myisam/sort.c:
Fixed core dump crash in repair table.
mysql-test/r/myisam.result:
Test for repair table
mysql-test/t/myisam.test:
Test for repair table
mysys/safemalloc.c:
Portability fix
Added statistics information for alarms (for bug tracking)
Don't store "incomplete" in the xxx.cfg file if we are not using --restart. (Crash-me)
Enlarged STACK_BUF_ALLOC becasue of failed crash-me test
Aded new script mysql_tableinfo to make a system directory.
Docs/manual.texi:
Changelog and TODO
include/mysql.h:
Removed mysql_ssl_clear() (One should use mysql_close() instead)
include/thr_alarm.h:
Added info for alarms
libmysql/libmysql.c:
Made mysql_ssl_clear() static
libmysql/libmysql.def:
cleanup
libmysqld/libmysqld.def:
cleanup
myisam/myisamchk.c:
describe -> description
myisam/myisampack.c:
Fixed copyright.
mysys/thr_alarm.c:
Added statistics information for alarms (for bug tracking)
scripts/Makefile.am:
Added mysql_table_info
sql-bench/crash-me.sh:
Don't store "incomplete" in the xxx.cfg file if we are not using --restart.
This was done becasue "incomplete" made it harder to quickly repeat a test that
failed.
sql-bench/limits/mysql.cfg:
Update to 1.58
sql/hostname.cc:
Remved compiler warning
sql/item_func.cc:
cleanup
sql/item_func.h:
Cleanup
sql/mysql_priv.h:
Enlarged STACK_BUF_ALLOC becasue of failed crash-me test
sql/opt_range.cc:
Removed purify warning
sql/sql_parse.cc:
cleanup
sql/sql_test.cc:
Added ala
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
include/my_sys.h:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/myisamchk.c:
Auto merged
mysys/mf_iocache.c:
Auto merged
include/myisam.h:
post-merge
myisam/mi_write.c:
post-merge
This fixes that mysamchk --sort-records works on windows.
myisam/mi_check.c:
Ensure that share->tot_locks s updated correctly
myisam/mi_close.c:
Ensure that share->tot_locks s updated correctly
myisam/mi_dynrec.c:
Ensure that share->tot_locks s updated correctly
myisam/mi_open.c:
Ensure that share->tot_locks s updated correctly
myisam/mi_statrec.c:
Ensure that share->tot_locks s updated correctly
myisam/myisamchk.c:
Ensure that share->tot_locks s updated correctly
Added missing checking of no_keyread
Docs/manual.texi:
Fixed wrong example
myisam/myisamchk.c:
Removed not needed include file
mysys/my_pthread.c:
Fix for HPUX
mysys/my_thr_init.c:
Removed not needed warning
scripts/mysql_fix_privilege_tables.sh:
Cleanup
sql/sql_lex.cc:
Removed not needed initialization
sql/sql_parse.cc:
Cleanup of checking of user resources
sql/sql_select.cc:
Added checking of no_keyread
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
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
BUILD/compile-pentium-debug:
Auto merged
BitKeeper/triggers/post-commit:
Auto merged
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
extra/mysql_install.c:
Auto merged
extra/resolve_stack_dump.c:
Auto merged
extra/resolveip.c:
Auto merged
include/my_sys.h:
Auto merged
include/mysqld_error.h:
Auto merged
isam/pack_isam.c:
Auto merged
libmysql/Makefile.shared:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/ft_dump.c:
Auto merged
myisam/ft_test1.c:
Auto merged
myisam/ftdefs.h:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_test1.c:
Auto merged
myisam/mi_write.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/t/select_found.test:
Auto merged
mysys/charset.c:
Auto merged
mysys/default.c:
Auto merged
mysys/hash.c:
Auto merged
sql/field.cc:
Auto merged
sql/gen_lex_hash.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/hostname.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/repl_failsafe.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_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.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/share/estonian/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/sql_update.cc:
Auto merged
sql/structs.h:
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/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
strings/Makefile.am:
Auto merged
strings/ctype-ujis.c:
Auto merged
tools/mysqlmanager.c:
Auto merged
of an error in option handling. This can sometimes be useful in
scripts.
Changed some exit code names and corresponding numbers.
Fixed a bug in mysqld.cc, in replication related options.
Added a global flag in my_getopt, which can be set by any program
that is using my_getopt, which tells whether the client should
print the error message itself, or whether my_getopt should do it.
The default is that my_getopt will print the error messages.
client/mysql.cc:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
client/mysqladmin.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
client/mysqlbinlog.cc:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
client/mysqlcheck.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
client/mysqldump.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
client/mysqlimport.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
client/mysqlmanager-pwgen.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
client/mysqlmanagerc.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
client/mysqlshow.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
client/mysqltest.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
client/thread_test.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
extra/my_print_defaults.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
extra/mysql_install.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
extra/perror.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
extra/resolve_stack_dump.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
extra/resolveip.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
include/my_getopt.h:
Added global (flag) variable which tells my_getopt whether to
print errors or just silently exit with proper error code.
include/mysys_err.h:
Changed exit code names and corresponding numbers.
isam/isamchk.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
isam/pack_isam.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
myisam/ft_dump.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
myisam/ft_eval.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
myisam/ft_test1.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
myisam/mi_test1.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
myisam/myisamchk.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
myisam/myisampack.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
mysys/my_getopt.c:
Changed exit code names and corresponding numbers. Added a flag
for checking whether my_getopt should print the error message,
or whether it should be printed by the client itself.
sql/gen_lex_hash.cc:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
sql/mysqld.cc:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
Fixed a bug when compiling in non-debug mode, some replication
related options were not enabled while they should be. This made
'make test' to fail in rpl000010 when --with-debug was not used.
tools/mysqlmanager.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
mysqlmanager from using GNU getopt to use my_getopt.
Changed some files that just included old getopt.h to include
my_getopt.h now.
Fixed a bug in my_print_help() in my_getopt.c.
Made better documentation for option -G in mysql client.
client/mysql.cc:
Documented --named-commands better.
myisam/ft_dump.c:
Changed getopt to my_getopt.
myisam/ft_eval.c:
Changed getopt to my_getopt.
myisam/ft_test1.c:
Changed getopt to my_getopt.
myisam/mi_check.c:
getopt.h -> my_getopt.h
myisam/mi_test1.c:
Changed getopt to my_getopt.
myisam/myisampack.c:
Changed getopt to my_getopt.
mysys/my_getopt.c:
Fixed a bug when printing help for option that didn't have a
description.
sql/gen_lex_hash.cc:
Changed getopt to my_getopt.
tools/mysqlmanager.c:
Changed getopt to my_getopt.
vio/test-ssl.c:
getopt.h -> my_getopt.h
vio/test-sslclient.c:
getopt.h -> my_getopt.h
vio/test-sslserver.c:
getopt.h -> my_getopt.h
vio/viotest-ssl.c:
getopt.h -> my_getopt.h
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
- some minor bugfixes
- made code more readable
- support for printing GET_BOOL type options in my_print_variables(),
value is either TRUE or FALSE
client/mysqlbinlog.cc:
Changes in my_getopt my_print_variables()
client/mysqlmanager-pwgen.c:
Changes in my_getopt my_print_variables()
client/mysqlmanagerc.c:
Changes in my_getopt my_print_variables()
client/mysqltest.c:
Changes in my_getopt my_print_variables()
myisam/myisamchk.c:
Changes in my_getopt my_print_variables()
mysys/my_getopt.c:
Made code more readable.
Fixed bug in my_print_variables().
Added printing for options whether they are enabled or not
FALSE / TRUE. This also separates GET_BOOL type options from
variables that can actually take values as an argument.
include/my_base.h:
Fix to ensure that old tables works in 4.1
myisam/mi_open.c:
cleanup
mysys/my_handler.c:
Fixed problem in fulltest testcase
sql/spatial.cc:
cleanup
sql/sql_table.cc:
cleanup
_mi_compare_text -> mi_compate_text
Changes according Monty's suggestions
heap/heapdef.h:
BTREE heap key structure is now the same as MyISAM
heap/hp_delete.c:
BTREE heap key structure is now the same as MyISAM
heap/hp_hash.c:
BTREE heap key structure is now the same as MyISAM
heap/hp_open.c:
BTREE heap key structure is now the same as MyISAM
heap/hp_rfirst.c:
BTREE heap key structure is now the same as MyISAM
heap/hp_rkey.c:
BTREE heap key structure is now the same as MyISAM
heap/hp_rlast.c:
BTREE heap key structure is now the same as MyISAM
heap/hp_rnext.c:
BTREE heap key structure is now the same as MyISAM
heap/hp_rprev.c:
BTREE heap key structure is now the same as MyISAM
heap/hp_write.c:
BTREE heap key structure is now the same as MyISAM
include/heap.h:
BTREE heap key structure is now the same as MyISAM
include/my_handler.h:
Removed hp_rb_key_cmp()
_mi_compare_text -> mi_compate_text
include/my_tree.h:
Fixed typo
myisam/ft_boolean_search.c:
_mi_compare_text -> mi_compate_text
myisam/ft_nlq_search.c:
_mi_compare_text -> mi_compate_text
myisam/ft_parser.c:
_mi_compare_text -> mi_compate_text
myisam/ft_stopwords.c:
_mi_compare_text -> mi_compate_text
myisam/ft_update.c:
_mi_compare_text -> mi_compate_text
mysys/my_handler.c:
Removed hp_rb_key_cmp()
_mi_compare_text -> mi_compate_text
mysys/tree.c:
BTREE heap key structure is now the same as MyISAM
sql/ha_heap.cc:
BTREE heap key structure is now the same as MyISAM
myisam/myisamchk.c:
Fixed a type.
mysys/my_getopt.c:
Made GET_STRALC to work like x_free() when doing a freeing.
Fixed a bug in my_print_variables() when printing a ulonglong value.
sql/mysqld.cc:
Fixed some wrongly alloced/freed variables and removed some
unneccessary code.
- Added special option/variable prefix '--loose-' to my_getopt.c
client/mysql.cc:
Fixed some variable types.
client/mysqladmin.c:
Fixed some variable types.
client/mysqlcheck.c:
Fixed some variable types.
client/mysqldump.c:
Fixed some variable types.
client/mysqlimport.c:
Fixed some variable types.
client/mysqlshow.c:
Fixed some variable types.
myisam/myisamchk.c:
Fixed some variable types.
mysys/my_getopt.c:
Fixed a bug in noticing whether argument was allowed to option (variable).
Added support for prefix --loose-option-name
This will work with options and variables, but not with --set-variable (!)
--set-variable is depricated and --variable-name=value should be used
instead. When used, my_getopt will not return error if option/variable
was not found, but print a warning, do a no-op and continue.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Fixed slowdown problem on win98
Fixed syntax for ALTER TABLE .. RENAME
Docs/manual.texi:
changelog
libmysql/libmysql.c:
Fixed that enable-reads-from-master and repl-parse-query works in option files.
myisam/ft_boolean_search.c:
Portability fixes
mysys/my_thr_init.c:
cleanup
sql/sql_base.cc:
Fixed slowdown problem on win98
sql/sql_delete.cc:
Removed compiler warnings
sql/sql_insert.cc:
Removed compiler warnings
sql/sql_update.cc:
Removed compiler warnings
sql/sql_yacc.yy:
Fixed syntax for ALTER TABLE .. RENAME
vio/vio.c:
Added test of OS2
vio/viosocket.c:
cleanup
myisam/ft_boolean_search.c:
Portability fix
mysql-test/mysql-test-run.sh:
Added slave_net_timeout
mysql-test/r/func_if.result:
Updated results after merge from 3.23
mysql-test/r/func_test.result:
Updated results after merge from 3.23
mysql-test/r/innodb.result:
Updated results after merge from 3.23
mysql-test/r/show_check.result:
Updated results after merge from 3.23
mysql-test/r/variables.result:
Updated results after merge from 3.23
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
BitKeeper/deleted/.del-identity.result~e41453a364242503:
Auto merged
BitKeeper/deleted/.del-identity.test~326f469b59105404:
Auto merged
include/my_pthread.h:
Auto merged
innobase/dict/dict0crea.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/dict/dict0load.c:
Auto merged
innobase/include/univ.i:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/pars/pars0opt.c:
Auto merged
innobase/que/que0que.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/row/row0upd.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/sync/sync0sync.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/t/func_test.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
mysys/my_pthread.c:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/english/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/sql_show.cc:
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/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
