Commits · 16874ede63b75d6af1df24da7c52a65ec7ebdae2 · Kirill Smelkov / mariadb

22 Feb, 2004 3 commits

Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 16874ede
unknown authored Feb 22, 2004
```
into mashka.mysql.fi:/home/my/mysql-4.0
```
16874ede
Move tests that uses innodb to innodb.test · 2100d85c
unknown authored Feb 22, 2004
```
mysql-test/t/lock_tables_lost_commit.test:
  Ensure that innodb is compiled in
```
2100d85c

Cleanups · 522e83b6

unknown authored Feb 22, 2004


acinclude.m4:
  Remove innobase/libodbc
innobase/Makefile.am:
  Remove innobase/libodbc
sql/sql_delete.cc:
  Indentation cleanup
sql/sql_yacc.yy:
  Fixed wrong merge

522e83b6

21 Feb, 2004 10 commits
- Merge bk-internal:/home/bk/mysql-4.0/ · d8f1d154
  unknown authored Feb 22, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
```
  d8f1d154
- ftb +(+(many -parens)) bug fixed · 7759360d
  unknown authored Feb 22, 2004
  
  7759360d
- Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · f312a516
  unknown authored Feb 22, 2004
```
into mashka.mysql.fi:/home/my/mysql-4.0


sql/sql_yacc.yy:
  Auto merged
```
  f312a516
- change that master_server_id is not a restricted word · e06fbc57
  unknown authored Feb 22, 2004
  
  e06fbc57
- Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 · 62b22fb7
  unknown authored Feb 21, 2004
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
```
  62b22fb7
- making one symbol a keyword · 3dcd3d4b
  unknown authored Feb 21, 2004
  
  3dcd3d4b
- c++ comment fixed · ecf6eeca
  unknown authored Feb 21, 2004
  
  ecf6eeca
- ignore: · ff76e674
  unknown authored Feb 21, 2004
```
  added scripts/make_win_binary_distribution


BitKeeper/etc/ignore:
  added scripts/make_win_binary_distribution
```
  ff76e674
- Merge bk-internal:/home/bk/mysql-4.0/ · b0bdf5fd
  unknown authored Feb 21, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
```
  b0bdf5fd
- portability fixes · 6855954a
  unknown authored Feb 21, 2004
```
cleanup
```
  6855954a
20 Feb, 2004 8 commits

Added missing argument to strxnmov() (Applies for windows debug mode) · 5db8fc5c
unknown authored Feb 20, 2004
```
libmysql/libmysql.c:
  Added missing argument to strxnmov()
```
5db8fc5c

Fix name conflict with alternate capitalization · 40b8593d

unknown authored Feb 20, 2004

VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.rul.old:
Rename: VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.rul -> VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.rul.old
VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.rul.old:
Rename: VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.rul -> VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.rul.old
VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.rul.old:
Rename: VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.rul -> VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.rul.old

40b8593d

Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0 · 458c4d31
unknown authored Feb 20, 2004
```
into mysql.com:/bk/mysql-4.0
```
458c4d31

Remove unused files · c198934d

unknown authored Feb 20, 2004

.del-odbc0odbc.c~6a372e94945263b5:
  Delete: innobase/odbc/odbc0odbc.c
.del-odbc0dummy.c~761be78656f44ad2:
  Delete: innobase/odbc/odbc0dummy.c
.del-makefilewin~15bf11ba8e0e4efe:
  Delete: innobase/odbc/makefilewin
.del-Makefile.am~f40398b15a266f24:
  Delete: innobase/odbc/Makefile.am


BitKeeper/deleted/.del-Makefile.am~f40398b15a266f24:
  Delete: innobase/odbc/Makefile.am
BitKeeper/deleted/.del-makefilewin~15bf11ba8e0e4efe:
  Delete: innobase/odbc/makefilewin
BitKeeper/deleted/.del-odbc0dummy.c~761be78656f44ad2:
  Delete: innobase/odbc/odbc0dummy.c
BitKeeper/deleted/.del-odbc0odbc.c~6a372e94945263b5:
  Delete: innobase/odbc/odbc0odbc.c

c198934d

Merge marko@build.mysql.com:/home/bk/mysql-4.0 · 661c40fb
unknown authored Feb 20, 2004
```
into hundin.mysql.fi:/home/marko/m/mysql-4.0


innobase/que/que0que.c:
  Auto merged
```
661c40fb

Many files: · 0eacf58f

unknown authored Feb 20, 2004

  Removed unused code
.del-os0trash.c~8cae5c1695501117:
  Delete: innobase/os/os0trash.c
dict0crea.c:
  Protect all sprintf(%s) with assertions


BitKeeper/deleted/.del-os0trash.c~8cae5c1695501117:
  Delete: innobase/os/os0trash.c
innobase/btr/btr0sea.c:
  Removed unused code
innobase/buf/buf0buf.c:
  Removed unused code
innobase/com/com0shm.c:
  Removed unused code
innobase/data/data0data.c:
  Removed unused code
innobase/dict/dict0crea.c:
  Removed unused code
innobase/fsp/fsp0fsp.c:
  Removed unused code
innobase/ha/ha0ha.c:
  Removed unused code
innobase/include/btr0cur.h:
  Removed unused code
innobase/include/btr0sea.h:
  Removed unused code
innobase/include/buf0buf.ic:
  Removed unused code
innobase/include/data0data.h:
  Removed unused code
innobase/include/dict0crea.h:
  Removed unused code
innobase/include/dict0dict.h:
  Removed unused code
innobase/include/ibuf0ibuf.h:
  Removed unused code
innobase/include/lock0lock.h:
  Removed unused code
innobase/include/mem0dbg.h:
  Removed unused code
innobase/include/mem0mem.ic:
  Removed unused code
innobase/include/mtr0log.h:
  Removed unused code
innobase/include/mtr0mtr.h:
  Removed unused code
innobase/include/os0proc.h:
  Removed unused code
innobase/include/os0thread.h:
  Removed unused code
innobase/include/rem0cmp.ic:
  Removed unused code
innobase/include/row0row.h:
  Removed unused code
innobase/include/srv0srv.h:
  Removed unused code
innobase/include/sync0sync.h:
  Removed unused code
innobase/lock/lock0lock.c:
  Removed unused code
innobase/log/log0recv.c:
  Removed unused code
innobase/mem/mem0dbg.c:
  Removed unused code
innobase/mtr/mtr0mtr.c:
  Removed unused code
innobase/os/os0proc.c:
  Removed unused code
innobase/page/page0page.c:
  Removed unused code
innobase/que/que0que.c:
  Removed unused code
innobase/rem/rem0cmp.c:
  Removed unused code
innobase/row/row0ins.c:
  Removed unused code
innobase/row/row0mysql.c:
  Removed unused code
innobase/row/row0row.c:
  Removed unused code
innobase/srv/srv0srv.c:
  Removed unused code
innobase/srv/srv0start.c:
  Removed unused code
innobase/sync/sync0sync.c:
  Removed unused code
innobase/trx/trx0rec.c:
  Removed unused code
innobase/trx/trx0trx.c:
  Removed unused code
innobase/ut/ut0dbg.c:
  Removed unused code
innobase/ut/ut0mem.c:
  Removed unused code
innobase/ut/ut0ut.c:
  Removed unused code

0eacf58f

Merge bk-internal:/home/bk/mysql-4.0/ · 89945d1d
unknown authored Feb 20, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
```
89945d1d
\| is sed is on-portable · 2bd261a1
unknown authored Feb 20, 2004

2bd261a1

19 Feb, 2004 19 commits

Major work on Windows build automation-- add binary packaging, suffixes · ea9aa4d3

unknown authored Feb 19, 2004


Build-tools/Do-win-build:
  Add suffix option, classic build, binary packaging
VC++Files/comp_err/comp_err.dsp:
  Update project file -- binary goes to ../client_release now
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Update project file -- binary goes to ../client_release now
VC++Files/myisam_ftdump/myisam_ftdump.dsp:
  Update project file -- binary goes to ../client_release now
VC++Files/myisampack/myisampack.dsp:
  Update project file -- binary goes to ../client_release now
scripts/Makefile.am:
  Add make_win_binary_distribution to Makefile (for @VERSION@)

ea9aa4d3

Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 9bc5cdba
unknown authored Feb 19, 2004
```
into mysql.com:/home/my/mysql-4.0


libmysql/libmysql.c:
  Auto merged
```
9bc5cdba

Fixed usage of strxnmov() in recent changesets · 68242939

unknown authored Feb 19, 2004


libmysql/libmysql.c:
  szPipeName -> pipe_name
  fixed usage of strxnmov()
mysys/mf_tempfile.c:
  Fixed usage of strnxmov()
  Simple optimization
mysys/my_tempnam.c:
  Fixed usage of strnxmov()
  Simple optimization
sql/log.cc:
  simple optimization
sql/mini_client.cc:
  szPipeName -> pipe_name
  fixed usage of strxnmov()
sql/mysqld.cc:
  szPipeName -> pipe_name
  fixed usage of strxnmov()
  Fixed indentation

68242939

Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 · 035ac291
unknown authored Feb 19, 2004
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
```
035ac291

Fix for a bug #2799. · e022b278

unknown authored Feb 19, 2004

Multi-table delete's with tables having foreign key constraints
did not return the error.

Also added tests for multi-table updates.

e022b278

Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · a01a3dd5
unknown authored Feb 19, 2004
```
into mysql.com:/home/my/mysql-4.0
```
a01a3dd5

crease number of open files to 2048 on windows · 4e01d4de

unknown authored Feb 19, 2004

Don't do fsync on temporary .frm files


include/config-win.h:
  Increase number of open files to 2048 on windows
sql/unireg.cc:
  Don't do fsync on temporary files

4e01d4de

Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0 · 41a76c7c
unknown authored Feb 19, 2004
```
into mysql.com:/bk/mysql-4.0


libmysql/libmysql.c:
  Auto merged
```
41a76c7c
Merge heikki@build.mysql.com:/home/bk/mysql-4.0 · 6c1795ee
unknown authored Feb 19, 2004
```
into hundin.mysql.fi:/home/heikki/mysql-4.0
```
6c1795ee

que0que.c: · 1f696bf3

unknown authored Feb 19, 2004

  Testing if bk push works


innobase/que/que0que.c:
  Testing if bk push works

1f696bf3

First round of changes to set up for Windows build automation. · 7f44d178

unknown authored Feb 19, 2004


VC++Files/InstallShield/4.0.XX-classic/File Groups/Clients and Tools.fgl:
  Add myisam_ftdump to client files
VC++Files/InstallShield/4.0.XX-classic/File Groups/Development.fgl:
  Add mysql_fix_privilege_tables.sql
VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl:
  Add README.txt
VC++Files/InstallShield/4.0.XX-gpl/File Groups/Clients and Tools.fgl:
  Add myisam_ftdump to client files
VC++Files/InstallShield/4.0.XX-gpl/File Groups/Development.fgl:
  Add mysql_fix_privilege_tables.sql
VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl:
  Add README.txt
VC++Files/InstallShield/4.0.XX-pro/File Groups/Clients and Tools.fgl:
  Add myisam_ftdump to client files
VC++Files/InstallShield/4.0.XX-pro/File Groups/Development.fgl:
  Add mysql_fix_privilege_tables.sql
VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl:
  Add README.txt
VC++Files/mysql.dsw:
  Add myisam_ftdump
VC++Files/mysys/mysys.dsp:
  Fix defines
VC++Files/sql/mysqld.dsp:
  Fix defines, etc

7f44d178

srv_add_path_separator_if_needed: be static; use memcpy, not sprintf · f443541a

unknown authored Feb 19, 2004


innobase/include/srv0start.h:
  Remove unused functions
innobase/srv/srv0start.c:
  srv_add_path_separator_if_needed: Replace sprintf with memcpy

f443541a

Remove unnecessary files and functions · 731fd9c5

unknown authored Feb 19, 2004


innobase/srv/srv0srv.c:
  Removed unused code
BitKeeper/deleted/.del-FSP0FSP.C~f1c7e596cadd429:
  Delete: innobase/fsp/trash/FSP0FSP.C
BitKeeper/deleted/.del-log0trsh.c~ebdd6ce463d8bf0:
  Delete: innobase/log/trash/log0trsh.c
BitKeeper/deleted/.del-os0fileold.c~7be518438162e2f:
  Delete: innobase/os/os0fileold.c
innobase/include/usr0sess.h:
  Remove unused functions
innobase/lock/lock0lock.c:
  Remove commented-out call to deleted function sess_raise_error_low()
innobase/trx/trx0trx.c:
  Remove commented-out or unreachable calls to deleted function sess_raise_error_low()
innobase/usr/usr0sess.c:
  Remove unused functions

731fd9c5

Many files: · f509ce23

unknown authored Feb 19, 2004

  Remove leading whitespace from lines containing preprocessor directives
Makefile.am:
  Remove univold.i and univoldmysql.i


innobase/include/Makefile.am:
  Remove univold.i and univoldmysql.i
innobase/buf/buf0buf.c:
  Remove leading whitespace from lines containing preprocessor directives
innobase/include/mem0mem.ic:
  Remove leading whitespace from lines containing preprocessor directives
innobase/include/sync0rw.ic:
  Remove leading whitespace from lines containing preprocessor directives
innobase/include/sync0sync.ic:
  Remove leading whitespace from lines containing preprocessor directives
innobase/include/ut0rnd.ic:
  Remove leading whitespace from lines containing preprocessor directives
innobase/mem/mem0dbg.c:
  Remove leading whitespace from lines containing preprocessor directives
innobase/mem/mem0mem.c:
  Remove leading whitespace from lines containing preprocessor directives
innobase/sync/sync0rw.c:
  Remove leading whitespace from lines containing preprocessor directives
innobase/sync/sync0sync.c:
  Remove leading whitespace from lines containing preprocessor directives

f509ce23

Remove unnecessary files · b01a5e43

unknown authored Feb 19, 2004

.del-univoldmysql.i~9253a6f92058c565:
  Delete: innobase/include/univoldmysql.i
.del-univold.i~4b5ed652407f63f1:
  Delete: innobase/include/univold.i
.del-tsut.c~4a154913fc9cd5c0:
  Delete: innobase/ut/ts/tsut.c
.del-makefile~9b8356bbdb8bd94e:
  Delete: innobase/ut/ts/makefile
.del-tsttrxold.c~eb6fd6091405d54e:
  Delete: innobase/trx/ts/tsttrxold.c
.del-tstrx.c~5425c98548ec1e0d:
  Delete: innobase/trx/ts/tstrx.c
.del-makefile~16d63c17c8edf62a:
  Delete: innobase/trx/ts/makefile
.del-tsthr.c~b095667070d626a9:
  Delete: innobase/thr/ts/tsthr.c
.del-makefile~d5e4661188c1939d:
  Delete: innobase/thr/ts/makefile
.del-tssync.c~fed4676cd4eb8457:
  Delete: innobase/sync/ts/tssync.c
.del-makefile~f23368879649c806:
  Delete: innobase/sync/ts/makefile
.del-tssrv.c~b8a6f5ad9ae639c8:
  Delete: innobase/srv/ts/tssrv.c
.del-tsdbc.c~d36206bdccf338f:
  Delete: innobase/srv/ts/tsdbc.c
.del-makefile~da6e87ef29c12dca:
  Delete: innobase/srv/ts/makefile
.del-tstcur.c~a9d5cf73b020ec41:
  Delete: innobase/row/ts/tstcur.c
.del-makefile~2cdfe39689004e6:
  Delete: innobase/row/ts/makefile
.del-tsrem.c~bb4e1e2e8c2ee179:
  Delete: innobase/rem/ts/tsrem.c
.del-makefile~3e48a33b4970faef:
  Delete: innobase/rem/ts/makefile
.del-tspage.c~f5baf63f9924e43b:
  Delete: innobase/page/ts/tspage.c
.del-makefile~66de73bc499566f9:
  Delete: innobase/page/ts/makefile
.del-tsosaux.c~9ec97a83392a984c:
  Delete: innobase/os/ts/tsosaux.c
.del-tsos.c~f6057d3c171f5915:
  Delete: innobase/os/ts/tsos.c
.del-makefile~9a1d210afa6d666e:
  Delete: innobase/os/ts/makefile
.del-tsmtr.c~293250c7ebfe0d3:
  Delete: innobase/mtr/ts/tsmtr.c
.del-tsbuf.c~e8d15ee095194d2c:
  Delete: innobase/mtr/ts/tsbuf.c
.del-makefile~fdf4c2a4ddb23230:
  Delete: innobase/mtr/ts/makefile
.del-tsmem.c~cc483e2ab96e625c:
  Delete: innobase/mem/ts/tsmem.c
.del-makefile~6d58ab1de0ac572:
  Delete: innobase/mem/ts/makefile
.del-tsmach.c~af65166bb53ddfe9:
  Delete: innobase/mach/ts/tsmach.c
.del-makefile~b8cbd25992ee51b:
  Delete: innobase/mach/ts/makefile
.del-tsha.c~13dd5ea03fda370c:
  Delete: innobase/ha/ts/tsha.c
.del-makefile~1bf12ce7b2dadfd5:
  Delete: innobase/ha/ts/makefile
.del-tsfsp.c~890ead1636f0eaba:
  Delete: innobase/fsp/ts/tsfsp.c
.del-makefile~a466e9eb27493a80:
  Delete: innobase/fsp/ts/makefile
.del-del.c~35c6283be580200:
  Delete: innobase/fsp/ts/del.c
.del-tsfil.c~e554b6f3c189c081:
  Delete: innobase/fil/ts/tsfil.c
.del-makefile~1df6f952a960fef4:
  Delete: innobase/fil/ts/makefile
.del-tsdyn.c~6f976764b53f3191:
  Delete: innobase/dyn/ts/tsdyn.c
.del-makefile~f64427335fafdc65:
  Delete: innobase/dyn/ts/makefile
.del-tsdict.c~5e82f7b8ac2b2e15:
  Delete: innobase/dict/ts/tsdict.c
.del-makefile~6356c424e9747647:
  Delete: innobase/dict/ts/makefile
.del-tscom.c~26aae2c5c4ca1dce:
  Delete: innobase/com/ts/tscom.c
.del-tscli.c~2f3e4b281141eac2:
  Delete: innobase/com/ts/tscli.c
.del-makefile~608fd39568db7238:
  Delete: innobase/com/ts/makefile
.del-tsos.c~1dadfc1ef69f2ba3:
  Delete: innobase/buf/ts/tsos.c
.del-tsbuf.c~b4c3feee158ef154:
  Delete: innobase/buf/ts/tsbuf.c
.del-makefile~598acb06bf1e466:
  Delete: innobase/buf/ts/makefile
.del-tscli.c~8d35740cc1f6f864:
  Delete: innobase/btr/ts/trash/tscli.c
.del-tssrv.c~ee30b746c485aec:
  Delete: innobase/btr/ts/tssrv.c
.del-tss.c~21ae628550141a68:
  Delete: innobase/btr/ts/tss.c
.del-tsrecv97.c~dbeb3bc494b241c1:
  Delete: innobase/btr/ts/tsrecv97.c
.del-tsrecv.c~3415f8a936a8d9fd:
  Delete: innobase/btr/ts/tsrecv.c
.del-tscli.c~77fc1962db99aa2e:
  Delete: innobase/btr/ts/tscli.c
.del-tsbtrold5.c~72a60e768c944904:
  Delete: innobase/btr/ts/trash/tsbtrold5.c
.del-tsbtrins.c~3e3bb3f95f058b46:
  Delete: innobase/btr/ts/tsbtrins.c
.del-TSIT.C~f53cce6fab8d325:
  Delete: innobase/btr/ts/trash/TSIT.C
.del-tsbtrfull.c~fbcbe41b64cc71b6:
  Delete: innobase/btr/ts/tsbtrfull.c
.del-tsbtr97.c~84dbb84ea9fa267c:
  Delete: innobase/btr/ts/tsbtr97.c
.del-makefile~491918b4162b927c:
  Delete: innobase/btr/ts/makefile
.del-isql.c~bc0b8cc213905175:
  Delete: innobase/btr/ts/isql.c


BitKeeper/deleted/.del-isql.c~bc0b8cc213905175:
  Delete: innobase/btr/ts/isql.c
BitKeeper/deleted/.del-makefile~491918b4162b927c:
  Delete: innobase/btr/ts/makefile
BitKeeper/deleted/.del-tsbtr97.c~84dbb84ea9fa267c:
  Delete: innobase/btr/ts/tsbtr97.c
BitKeeper/deleted/.del-tsbtrfull.c~fbcbe41b64cc71b6:
  Delete: innobase/btr/ts/tsbtrfull.c
BitKeeper/deleted/.del-TSIT.C~f53cce6fab8d325:
  Delete: innobase/btr/ts/trash/TSIT.C
BitKeeper/deleted/.del-tsbtrins.c~3e3bb3f95f058b46:
  Delete: innobase/btr/ts/tsbtrins.c
BitKeeper/deleted/.del-tsbtrold5.c~72a60e768c944904:
  Delete: innobase/btr/ts/trash/tsbtrold5.c
BitKeeper/deleted/.del-tscli.c~77fc1962db99aa2e:
  Delete: innobase/btr/ts/tscli.c
BitKeeper/deleted/.del-tsrecv.c~3415f8a936a8d9fd:
  Delete: innobase/btr/ts/tsrecv.c
BitKeeper/deleted/.del-tsrecv97.c~dbeb3bc494b241c1:
  Delete: innobase/btr/ts/tsrecv97.c
BitKeeper/deleted/.del-tss.c~21ae628550141a68:
  Delete: innobase/btr/ts/tss.c
BitKeeper/deleted/.del-tssrv.c~ee30b746c485aec:
  Delete: innobase/btr/ts/tssrv.c
BitKeeper/deleted/.del-tscli.c~8d35740cc1f6f864:
  Delete: innobase/btr/ts/trash/tscli.c
BitKeeper/deleted/.del-makefile~598acb06bf1e466:
  Delete: innobase/buf/ts/makefile
BitKeeper/deleted/.del-tsbuf.c~b4c3feee158ef154:
  Delete: innobase/buf/ts/tsbuf.c
BitKeeper/deleted/.del-tsos.c~1dadfc1ef69f2ba3:
  Delete: innobase/buf/ts/tsos.c
BitKeeper/deleted/.del-makefile~608fd39568db7238:
  Delete: innobase/com/ts/makefile
BitKeeper/deleted/.del-tscli.c~2f3e4b281141eac2:
  Delete: innobase/com/ts/tscli.c
BitKeeper/deleted/.del-tscom.c~26aae2c5c4ca1dce:
  Delete: innobase/com/ts/tscom.c
BitKeeper/deleted/.del-makefile~6356c424e9747647:
  Delete: innobase/dict/ts/makefile
BitKeeper/deleted/.del-tsdict.c~5e82f7b8ac2b2e15:
  Delete: innobase/dict/ts/tsdict.c
BitKeeper/deleted/.del-makefile~f64427335fafdc65:
  Delete: innobase/dyn/ts/makefile
BitKeeper/deleted/.del-tsdyn.c~6f976764b53f3191:
  Delete: innobase/dyn/ts/tsdyn.c
BitKeeper/deleted/.del-makefile~1df6f952a960fef4:
  Delete: innobase/fil/ts/makefile
BitKeeper/deleted/.del-tsfil.c~e554b6f3c189c081:
  Delete: innobase/fil/ts/tsfil.c
BitKeeper/deleted/.del-del.c~35c6283be580200:
  Delete: innobase/fsp/ts/del.c
BitKeeper/deleted/.del-makefile~a466e9eb27493a80:
  Delete: innobase/fsp/ts/makefile
BitKeeper/deleted/.del-tsfsp.c~890ead1636f0eaba:
  Delete: innobase/fsp/ts/tsfsp.c
BitKeeper/deleted/.del-makefile~1bf12ce7b2dadfd5:
  Delete: innobase/ha/ts/makefile
BitKeeper/deleted/.del-tsha.c~13dd5ea03fda370c:
  Delete: innobase/ha/ts/tsha.c
BitKeeper/deleted/.del-makefile~b8cbd25992ee51b:
  Delete: innobase/mach/ts/makefile
BitKeeper/deleted/.del-tsmach.c~af65166bb53ddfe9:
  Delete: innobase/mach/ts/tsmach.c
BitKeeper/deleted/.del-makefile~6d58ab1de0ac572:
  Delete: innobase/mem/ts/makefile
BitKeeper/deleted/.del-tsmem.c~cc483e2ab96e625c:
  Delete: innobase/mem/ts/tsmem.c
BitKeeper/deleted/.del-makefile~fdf4c2a4ddb23230:
  Delete: innobase/mtr/ts/makefile
BitKeeper/deleted/.del-tsbuf.c~e8d15ee095194d2c:
  Delete: innobase/mtr/ts/tsbuf.c
BitKeeper/deleted/.del-tsmtr.c~293250c7ebfe0d3:
  Delete: innobase/mtr/ts/tsmtr.c
BitKeeper/deleted/.del-makefile~9a1d210afa6d666e:
  Delete: innobase/os/ts/makefile
BitKeeper/deleted/.del-tsos.c~f6057d3c171f5915:
  Delete: innobase/os/ts/tsos.c
BitKeeper/deleted/.del-tsosaux.c~9ec97a83392a984c:
  Delete: innobase/os/ts/tsosaux.c
BitKeeper/deleted/.del-makefile~66de73bc499566f9:
  Delete: innobase/page/ts/makefile
BitKeeper/deleted/.del-tspage.c~f5baf63f9924e43b:
  Delete: innobase/page/ts/tspage.c
BitKeeper/deleted/.del-makefile~3e48a33b4970faef:
  Delete: innobase/rem/ts/makefile
BitKeeper/deleted/.del-tsrem.c~bb4e1e2e8c2ee179:
  Delete: innobase/rem/ts/tsrem.c
BitKeeper/deleted/.del-makefile~2cdfe39689004e6:
  Delete: innobase/row/ts/makefile
BitKeeper/deleted/.del-tstcur.c~a9d5cf73b020ec41:
  Delete: innobase/row/ts/tstcur.c
BitKeeper/deleted/.del-makefile~da6e87ef29c12dca:
  Delete: innobase/srv/ts/makefile
BitKeeper/deleted/.del-tsdbc.c~d36206bdccf338f:
  Delete: innobase/srv/ts/tsdbc.c
BitKeeper/deleted/.del-tssrv.c~b8a6f5ad9ae639c8:
  Delete: innobase/srv/ts/tssrv.c
BitKeeper/deleted/.del-makefile~f23368879649c806:
  Delete: innobase/sync/ts/makefile
BitKeeper/deleted/.del-tssync.c~fed4676cd4eb8457:
  Delete: innobase/sync/ts/tssync.c
BitKeeper/deleted/.del-makefile~d5e4661188c1939d:
  Delete: innobase/thr/ts/makefile
BitKeeper/deleted/.del-tsthr.c~b095667070d626a9:
  Delete: innobase/thr/ts/tsthr.c
BitKeeper/deleted/.del-makefile~16d63c17c8edf62a:
  Delete: innobase/trx/ts/makefile
BitKeeper/deleted/.del-tstrx.c~5425c98548ec1e0d:
  Delete: innobase/trx/ts/tstrx.c
BitKeeper/deleted/.del-tsttrxold.c~eb6fd6091405d54e:
  Delete: innobase/trx/ts/tsttrxold.c
BitKeeper/deleted/.del-makefile~9b8356bbdb8bd94e:
  Delete: innobase/ut/ts/makefile
BitKeeper/deleted/.del-tsut.c~4a154913fc9cd5c0:
  Delete: innobase/ut/ts/tsut.c
BitKeeper/deleted/.del-univold.i~4b5ed652407f63f1:
  Delete: innobase/include/univold.i
BitKeeper/deleted/.del-univoldmysql.i~9253a6f92058c565:
  Delete: innobase/include/univoldmysql.i
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

b01a5e43

Merge bk-internal:/home/bk/mysql-4.0/ · efca692a
unknown authored Feb 19, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
```
efca692a
potential problem fixed afer some reasoning · ddf17601
unknown authored Feb 19, 2004

ddf17601
Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0 · 1e34d44b
unknown authored Feb 19, 2004
```
into mysql.com:/bk/mysql-4.0
```
1e34d44b
Merge · 70e56f4d
unknown authored Feb 19, 2004

70e56f4d