diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-07-25 22:46:28 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-07-25 22:46:28 +0300 |
| commit | 6ba1aefe909df2651fcace1fe184e3f093d07ab4 (patch) | |
| tree | f38c137c73206e3d059517b2bcab6a4a43c957f9 /os2/mysql.base | |
| parent | 29cec51551b7a6be66ebf2048f9045eeb0f59d94 (diff) | |
| parent | 714e9c881e5af8bbb54c336d0327bae8e4559019 (diff) | |
| download | mariadb-git-6ba1aefe909df2651fcace1fe184e3f093d07ab4.tar.gz | |
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
Diffstat (limited to 'os2/mysql.base')
| -rw-r--r-- | os2/mysql.base | 127 |
1 files changed, 0 insertions, 127 deletions
diff --git a/os2/mysql.base b/os2/mysql.base deleted file mode 100644 index 4f0886e0697..00000000000 --- a/os2/mysql.base +++ /dev/null @@ -1,127 +0,0 @@ -#include "mysql.ih" - -<WARPIN VERSION <$WARPIN_VERSION>> -<HEAD> - -<PCK INDEX=1 - PACKAGEID="TCX Datakonsult AB\MySQL for OS/2\SQL Database Engine\<$MySQL\Ver>" - TARGET="?:\usr\local\mysql" BASE - TITLE="SQL Database Engine" - EXECUTE="$(1)\bootstrap.cmd [bootstrap]" - CONFIG.SYS="SET EMXOPT=-h1024 | UNIQUE(-h)" - CREATEOBJECT="WPFolder|MySQL <$MySQL.Ver>|<WP_DESKTOP>|OBJECTID=<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_FOLDER>" - CREATEOBJECT="WPProgram|Console|<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_FOLDER>|EXENAME=$(1)\bin\mysql.exe;STARTUPDIR=$(1)\bin;ICONFILE=$(1)\bin\icons\mysql-client.ico;OBJECTID=<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_CONSOLE>;" - CREATEOBJECT="WPProgram|Start server|<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_FOLDER>|EXENAME=$(1)\bin\mysqld.exe;ICONFILE=$(1)\bin\icons\mysql-startserver.ico;OBJECTID=<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_START>;" - CREATEOBJECT="WPProgram|Shutdown server|<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_FOLDER>|EXENAME=$(1)\bin\mysqladmin.exe;STARTUPDIR=$(1)\bin;PARAMETERS=-u root shutdown;ICONFILE=$(1)\bin\icons\mysql-shutdownserver.ico;OBJECTID=<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_SHUTDOWN>;" - CREATEOBJECT="WPProgram|Readme first|<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_FOLDER>|EXENAME=e.exe;PARAMETERS=$(1)\readme.os2;OBJECTID=<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_README>;" - SELECT - >This package will install MySQL for OS/2 SQL engine -</PCK> - -<PCK INDEX=2 - PACKAGEID="TCX Datakonsult AB\MySQL for OS/2\Developement Kit\<$MySQL\Ver>" - TARGET="?:\usr\local\mysql" - TITLE="Developement Kit" - SELECT - >This package will install MySQL for OS/2 sdk -</PCK> - -<PCK INDEX=3 - PACKAGEID="TCX Datakonsult AB\MySQL for OS/2\PDF manual\<$MySQL\Ver>" - TARGET="?:\usr\local\mysql" - TITLE="PDF manual" - EXTERNAL="mysql-3-23-28-gamma-pdf.wpi" - CREATEOBJECT="WPShadow|PDF Manual|<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_FOLDER>|SHADOWID=$(1)\docs\manual.pdf" - SELECT - >This package will install MySQL for OS/2 documentation -</PCK> - -<PCK INDEX=4 - PACKAGEID="TCX Datakonsult AB\MySQL for OS/2\INF manual\<$MySQL\Ver>" - TARGET="?:\usr\local\mysql" - TITLE="INF manual" - EXTERNAL="mysql-3-23-28-gamma-inf.wpi" - CREATEOBJECT="WPProgram|MySQL Manual|<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_FOLDER>|EXENAME=view.exe;PARAMETERS=$(1)\docs\manual.inf;ICONFILE=$(1)\bin\icons\mysql-manual.ico;OBJECTID=<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_INFMANUAL>;" - SELECT - >This package will install MySQL for OS/2 documentation -</PCK> - -<PCK INDEX=5 - PACKAGEID="TCX Datakonsult AB\MySQL for OS/2\Test suite\<$MySQL\Ver>" - TARGET="?:\usr\local\mysql" - TITLE="Test suite" - EXTERNAL="mysql-<$MySQL-Ver>-test.wpi" - CREATEOBJECT="WPProgram|Run MySQL Test Suite|<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_FOLDER>|EXENAME=$(5)\mysql-test\mysql-test.cmd;PARAMETERS=$(1)\docs\manual.inf;ICONFILE=$(1)\bin\icons\mysql-manual.ico;OBJECTID=<MYSQL_<$MySQL.Major>_<$MySQL.Minor>_TESTSUITE>;" - SELECT - >This package will install MySQL for OS/2 test suite -</PCK> - -</HEAD> - -<!-- Here come the different pages. They are linked by - the <NEXTBUTTON> tags, which must have a target. - Each page must have a TYPE= attribute, which tells - WarpIn what will be visible on that page. --> - -<BODY> - -<!-- page1: introduction ->> -<PAGE INDEX=1 TYPE=README> -<TEXT> -</TEXT> -<NEXTBUTTON TARGET=2>~Next</NEXTBUTTON> -<README FORMAT=HTML> - -<P>Welcome to the latest port of MySQL for <B>OS/2 and eComStation</B>. - -<P>You are about to install <B>MySQL <$MySQL.Ver></B> - -<BR> -<BR> -<P>Select "Next" to continue. - -<P>Select "Cancel" to abort installation. -</README> -</PAGE> - -<!-- show readme.os2 --> -<PAGE INDEX=2 TYPE=README> -<NEXTBUTTON TARGET=3>~Next</NEXTBUTTON> -<TEXT> -</TEXT> -<README FORMAT=PLAIN EXTRACTFROMPCK="1">readme.os2</README> -</PAGE> - -<!-- show GPL license --> -<PAGE INDEX=3 TYPE=README> -<NEXTBUTTON TARGET=4>~I agree</NEXTBUTTON> -<TEXT> -By pressing the "I agree" button, you agree to all terms and conditions to the below licence agreement. -</TEXT> -<README FORMAT=HTML EXTRACTFROMPCK="1">license.htm</README> -</PAGE> - - -<!-- The TYPE=CONTAINER will list the packages which can be installed. --> - -<PAGE INDEX=4 TYPE=CONTAINER> -<NEXTBUTTON TARGET=5>~Next</NEXTBUTTON> -<TEXT> -Please select the packages which are to be installed. You may change the target paths for the packages. -</TEXT> -</PAGE> - -<!-- Here's another TYPE=TEXT page before we install. - The special target "0" indicates that after this page we - should start installation. - Note that the TYPE=INSTALL page (which we had in Alpha #3) - is no longer supported. --> - -<PAGE INDEX=5 TYPE=TEXT> -<NEXTBUTTON TARGET=0>I~nstall</NEXTBUTTON> -<TEXT> -Press "Install" to begin installing this archive.</TEXT> -</PAGE> - -</BODY> -</WARPIN> |