mirror of
https://github.com/MariaDB/server.git
synced 2025-01-21 22:34:18 +01:00
5 commits
Author | SHA1 | Message | Date | |
---|---|---|---|---|
unknown
|
6ba1aefe90 |
Merge with 3.23.51
Fixed wrong usage of sprintf() in ha_innodb.cc BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-global.h~e80d28157acfdcb5: Auto merged Docs/manual.ja.texi: Auto merged include/config-os2.h: Auto merged innobase/btr/btr0btr.c: Auto merged innobase/btr/btr0cur.c: Auto merged innobase/btr/btr0sea.c: Auto merged innobase/buf/buf0buf.c: Auto merged innobase/data/data0data.c: Auto merged innobase/dict/dict0crea.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/fil/fil0fil.c: Auto merged innobase/fsp/fsp0fsp.c: Auto merged innobase/ibuf/ibuf0ibuf.c: Auto merged innobase/include/buf0buf.ic: Auto merged innobase/include/srv0srv.h: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/log/log0log.c: Auto merged innobase/mtr/mtr0mtr.c: Auto merged innobase/os/os0file.c: Auto merged innobase/page/page0cur.c: Auto merged innobase/page/page0page.c: Auto merged innobase/rem/rem0cmp.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0purge.c: Auto merged innobase/row/row0umod.c: Auto merged innobase/row/row0upd.c: Auto merged innobase/sync/sync0arr.c: Auto merged innobase/sync/sync0sync.c: Auto merged innobase/trx/trx0roll.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/trx/trx0undo.c: Auto merged innobase/ut/ut0ut.c: Auto merged isam/pack_isam.c: Auto merged mysys/Makefile.am: Auto merged sql/ha_innodb.h: Auto merged sql/key.cc: Auto merged sql/mini_client.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged sql/table.cc: Auto merged support-files/my-huge.cnf.sh: Auto merged support-files/my-large.cnf.sh: Auto merged support-files/my-medium.cnf.sh: Auto merged support-files/my-small.cnf.sh: Auto merged Docs/manual.texi: Merge with 3.23.51 configure.in: Merge with 3.23.51 include/Makefile.am: Merge with 3.23.51 innobase/dict/dict0load.c: Merge with 3.23.51 innobase/include/univ.i: Merge with 3.23.51 innobase/row/row0mysql.c: Merge with 3.23.51 innobase/srv/srv0srv.c: Merge with 3.23.51 innobase/srv/srv0start.c: Merge with 3.23.51 myisam/mi_cache.c: Merge with 3.23.51 myisammrg/myrg_rnext.c: Merge with 3.23.51 myisammrg/myrg_rprev.c: Merge with 3.23.51 sql/ha_innodb.cc: Merge with 3.23.51 Changed used of sprintf() to make code portable. sql/handler.cc: Indentation change sql/lex.h: Comment cleanup sql/log.cc: Merge with 3.23.51 sql/log_event.h: Merge with 3.23.51 sql/mysql_priv.h: Merge with 3.23.51 sql/mysqld.cc: Merge with 3.23.51 Cleaned up handling of innodb_flush_log_at_trx_commit sql/share/portuguese/errmsg.txt: Merge with 3.23.51 sql/slave.cc: Not merged as this affects many files; Will be fixed in next changeset sql/slave.h: Merge with 3.23.51 sql/sql_acl.cc: Merge with 3.23.51 (no changes) sql/sql_db.cc: Merge with 3.23.51 sql/sql_parse.cc: Merge with 3.23.51 sql/sql_yacc.yy: Merge with 3.23.51 (Renamed NO_FOREIGN_KEY_CHECKS and RELAXED_UNIQUE_CHECKS) support-files/mysql.spec.sh: Merge with 3.23.51 |
||
unknown
|
18e0dd1f52 |
Some
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 |
||
unknown
|
9e5fd21c3b |
- Updated OS/2 port with files provided by Yuri Dario <mc6530@mclink.it>
from TeamOS/2 Italy - removed some obsolete files on Yuri's request - Added missing os2 related files outside the os2 subdirectory to the distribution BitKeeper/deleted/.del-MySQL-All.icc~132f824bdf16897c: Delete: os2/MySQL-All.icc BitKeeper/deleted/.del-MySQL-Client.irs~6dc13dcf3bbd5c0e: Delete: os2/MySQL-Client.irs BitKeeper/deleted/.del-MySQL-Lib.icc~6775a33b1eeed98: Delete: os2/MySQL-Lib.icc BitKeeper/deleted/.del-MySQL-ReadLine.icc~d7ab937c4ed8922f: Delete: os2/MySQL-ReadLine.icc BitKeeper/deleted/.del-MySQL-binlog.icc~ec86ef1b392553e: Delete: os2/MySQL-binlog.icc BitKeeper/deleted/.del-MySQL-binlog.irs~80d1800461e185d1: Delete: os2/MySQL-binlog.irs BitKeeper/deleted/.del-MySQL-sql.irs~563a18a769b1785d: Delete: os2/MySQL-sql.irs BitKeeper/deleted/.del-build-all.log~8dda947d95dfb926: Delete: os2/build-all.log BitKeeper/deleted/.del-mysql.base~330f9ea62769c03a: Delete: os2/mysql.base BitKeeper/deleted/.del-mysql.ih~767482ec101feda3: Delete: os2/mysql.ih BitKeeper/deleted/.del-readme.os2~e8fe94e278248f7e: Delete: os2/readme.os2 configure.in: Added new os2 subdirectories include/Makefile.am: Added include/config-os2.h to distribution include/config-os2.h: Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy mysys/Makefile.am: Added missing OS/2 files in mysys to distribution mysys/my_os2file64.c: Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy mysys/my_os2thread.c: Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy os2/BldLevel.cmd: Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy os2/BldLevel.rc: Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy os2/ChangeLog.os2: Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy os2/Makefile.am: Fixed OS/2 file list (some new files, some have been removed) os2/MySQL-Client.icc: Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy os2/MySQL-Opt.icc: Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy os2/MySQL-Source.icc: Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy os2/MySQL-Util.icc: Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy os2/MySQL-Util.irs: Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy os2/ReadMe.txt: Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy os2/build-all.cmd: Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy os2/rint.obj: Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy |
||
unknown
|
76989cf55c |
OS2 patch
Docs/manual.texi: Updated section of how to change the socket file. Changelog for 3.23.43 include/merge.h: Fixed typo include/my_pthread.h: Fixed bug for WIN32 include/myisam.h: Fixed typo include/nisam.h: Fixed typo sql/handler.h: Fixed typo sql/sql_table.cc: Fixed typo sql/unireg.cc: F |
||
unknown
|
31b9e6e03f |
Fixes for OS2.
Fix bug in isamlog Add argument types to function declarations. Docs/manual.texi: Updated credits client/mysql.cc: Fixes for OS2 client/mysqladmin.c: Fixes for OS2 client/mysqldump.c: Fixes for OS2 client/mysqlimport.c: Fixes for OS2 client/mysqltest.c: Fixes for OS2 dbug/dbug.c: Fixes for OS2. Use new C calling convention. dbug/factorial.c: Fixes for OS2. Use new C calling convention. include/errmsg.h: Fix for OS2 include/global.h: Fixes for OS2. include/my_pthread.h: Fixes for OS2. include/my_sys.h: Fixes for OS2. include/mysql_com.h: Move defines to global.h include/thr_alarm.h: Fixes for OS2. isam/isamchk.c: Fixes for OS2. Add arguments to function declarations. isam/isamlog.c: Fixes for OS2. Fix bug in logfile handling. isam/test1.c: Add arguments to function decl isam/test2.c: Add arguments to function declarations. isam/test_all.res: Update result libmysql/get_password.c: Fixes for OS2. libmysql/libmysql.c: Fixes for OS2. libmysql/net.c: Fixes for OS2. libmysql/violite.c: Add arguments to function declarations. merge/_locking.c: Add argument types to function declarations. merge/close.c: Add argument types to function declarations. merge/create.c: Add argument types to function declarations. merge/extra.c: Add argument types to function declarations. merge/open.c: Add argument types to function declarations. merge/panic.c: Add argument types to function declarations. merge/rsame.c: Add argument types to function declarations. merge/update.c: Add argument types to function declarations. myisam/ft_eval.c: Portability fix myisam/ft_search.c: Portability fix myisam/ft_test1.c: Portability fix myisam/ftdefs.h: Portability fix myisam/mi_check.c: Portability fix myisam/mi_test1.c: Portability fix myisam/mi_test2.c: Portability fix myisam/mi_test_all.sh: Update to test for MACH variable myisam/myisamlog.c: Cleanup myisam/myisampack.c: Don't use variable 'new' myisam/sort.c: Portability fix myisammrg/myrg_delete.c: Add argument types to function declarations. myisammrg/myrg_locking.c: Add argument types to function declarations. myisammrg/myrg_open.c: Add argument types to function declarations. myisammrg/myrg_panic.c: Add argument types to function declarations. mysql-test/t/backup.test: Fix for OS2 mysql-test/t/show_check.test: Fix for OS2 mysys/charset.c: Dont use variable 'new' mysys/default.c: Fixes for OS2. mysys/getopt.c: Fixes for OS2. mysys/getopt1.c: Fixes for OS2. mysys/list.c: Don't use variable 'new' mysys/mf_dirname.c: Fixes for OS2. mysys/mf_format.c: Fixes for OS2. mysys/mf_path.c: Fixes for OS2. mysys/mf_qsort.c: Portability fix mysys/mf_tempfile.c: Fixes for OS2. mysys/my_clock.c: Fixes for OS2. mysys/my_copy.c: Fixes for OS2. mysys/my_create.c: Fixes for OS2. mysys/my_getwd.c: Fixes for OS2. mysys/my_init.c: Fixes for OS2. mysys/my_lib.c: Fixes for OS2. mysys/my_lock.c: Fixes for OS2. mysys/my_malloc.c: Portability fix mysys/my_mkdir.c: Fixes for OS2. mysys/my_open.c: Fixes for OS2. mysys/my_pthread.c: Fixes for OS2. mysys/my_realloc.c: Fixes for OS2. mysys/my_redel.c: Fixes for OS2. mysys/my_static.c: Fixes for OS2. mysys/my_tempnam.c: Fixes for OS2. mysys/my_thr_init.c: Fixes for OS2. mysys/my_write.c: Fixes for OS2. mysys/test_charset.c: Fixes for OS2. mysys/thr_alarm.c: Fixes for OS2. mysys/tree.c: Fixes for OS2. sql/field.cc: Fixes for OS2. sql/field.h: Fixes for OS2. sql/gen_lex_hash.cc: Fixes for OS2. sql/hostname.cc: Fixes for OS2. sql/item_func.cc: Fixes for OS2. sql/item_strfunc.cc: Fixes for OS2. sql/log_event.cc: Fixes for OS2. sql/md5.c: Fixes for OS2. sql/mini_client.cc: Fixes for OS2. sql/mysql_priv.h: Fixes for OS2. sql/mysqld.cc: Fixes for OS2. sql/net_serv.cc: Fixes for OS2. sql/slave.cc: Fixes for OS2. sql/sql_base.cc: Fixes for OS2. sql/sql_db.cc: Portability fix sql/sql_insert.cc: Fixes for OS2. sql/sql_load.cc: Fixes for OS2. sql/sql_parse.cc: Fixes for OS2. sql/sql_table.cc: Fixes for OS2. sql/sql_udf.cc: Fixes for OS2. sql/violite.c: Fixes for OS2. strings/ctype-big5.c: Fixes for OS2. strings/ctype-gbk.c: Fixes for OS2. strings/ctype-sjis.c: Fixes for OS2. strings/ctype-tis620.c: Fixes for OS2. strings/ctype.c: Fixes for OS2. strings/strnlen.c: Fixes for OS2. |