Commits · 1cc8058b1be6a3c8a764d2b1143f0f0b03209e9f · Kirill Smelkov / mariadb

04 Mar, 2001 1 commit

unknown authored Mar 04, 2001


Docs/manual.texi:
  Minor typo fix.
sql/ha_innobase.cc:
  Fix minor cut-n-paste errors in change_active_index().
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

1cc8058b

03 Mar, 2001 3 commits

row0mysql.c Removed a bug in update of a table with no primary key · ec5e2f58
unknown authored Mar 03, 2001
```
innobase/row/row0mysql.c:
  Removed a bug in update of a table with no primary key
```
ec5e2f58
Merge work:/my/mysql into donna.mysql.fi:/home/my/bk/mysql · f1221907
unknown authored Mar 03, 2001

f1221907

Fixes for innobase usage · 73e34999

unknown authored Mar 03, 2001

Fixed bug when using TEXT columns with BDB tables
Allow LOAD DATA INFILE to use numbers with ENUM and SET columns


BUILD/compile-pentium:
  Added --with-innobase-db
Docs/manual.texi:
  Added more documentation to Innobase and KILL
client/mysqladmin.c:
  Quote database names for CREATE and DROP
mysql-test/install_test_db.sh:
  Don't use innobase, bdb or gemini when installing privilege tables
mysql-test/mysql-test-run.sh:
  Added testing of innobase tables
mysql-test/r/bdb.result:
  Added test of TEXT column bug
mysql-test/t/bdb.test:
  Added test of TEXT column bug
mysql-test/t/innobase.test:
  Cleanup innobase tests
scripts/mysql_install_db.sh:
  Added testing of innobase tables
sql/field.cc:
  Allow LOAD DATA INFILE to use numbers with ENUM and SET columns
sql/filesort.cc:
  Fixed typo
sql/ha_berkeley.cc:
  Fixed problem with TEXT columns in BDB tables
sql/mysqld.cc:
  Always support the --innobase-data-file-path option
sql/share/swedish/errmsg.OLD:
  Added swedish error messages
sql/share/swedish/errmsg.txt:
  Added swedish error messages
sql/sql_base.cc:
  Reset tables after usage (to fix problem with BDB and TEXT columns)
sql/sql_delete.cc:
  Use generate table if --skip-innobase is used

73e34999

02 Mar, 2001 8 commits

row0sel.c Removes now trailing spaces from varchars · 3be063ea

unknown authored Mar 02, 2001

srv0start.c	Removes now trailing spaces from varchars
row0mysql.ic	Removes now trailing spaces from varchars
ha_innobase.cc	Removes now trailing spaces from varchars


sql/ha_innobase.cc:
  Removes now trailing spaces from varchars
innobase/include/row0mysql.ic:
  Removes now trailing spaces from varchars
innobase/row/row0sel.c:
  Removes now trailing spaces from varchars
innobase/srv/srv0start.c:
  Removes now trailing spaces from varchars

3be063ea

univ.i Changed univ.i to non-debug version · e6a57adc
unknown authored Mar 02, 2001
```
innobase/include/univ.i:
  Changed univ.i to non-debug version
```
e6a57adc

ut0ut.c Fixes for 64-bit Linux, bug fixes, compiler warning fixes · de135a12

unknown authored Mar 02, 2001

mem0pool.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
os0file.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
os0shm.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
os0sync.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
os0thread.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
page0page.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
que0que.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
row0ins.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
row0mysql.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
row0sel.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
row0upd.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
row0vers.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
srv0srv.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
srv0start.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
sync0arr.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
sync0rw.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
sync0sync.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
trx0rec.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
trx0trx.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
srv0srv.h	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
sync0rw.h	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
sync0sync.h	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
ut0dbg.h	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
lock0lock.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
log0log.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
log0recv.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
ibuf0ibuf.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
buf0buf.h	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
buf0buf.ic	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
hash0hash.ic	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
mach0data.ic	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
mem0mem.h	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
mem0pool.h	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
mtr0mtr.h	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
os0file.h	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
os0sync.h	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
os0sync.ic	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
os0thread.h	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
univ.i  	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
row0mysql.ic	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
com0shm.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
data0data.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
data0type.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
dict0crea.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
dict0dict.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
fil0fil.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
fsp0fsp.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
fut0lst.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
btr0sea.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
buf0buf.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
buf0flu.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
btr0btr.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes
btr0cur.c	Fixes for 64-bit Linux, bug fixes, compiler warning fixes


innobase/btr/btr0btr.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/btr/btr0cur.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/btr/btr0sea.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/buf/buf0buf.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/buf/buf0flu.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/com/com0shm.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/data/data0data.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/data/data0type.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/dict/dict0crea.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/dict/dict0dict.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/fil/fil0fil.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/fsp/fsp0fsp.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/fut/fut0lst.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/ibuf/ibuf0ibuf.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/include/buf0buf.h:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/include/buf0buf.ic:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/include/hash0hash.ic:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/include/mach0data.ic:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/include/mem0mem.h:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/include/mem0pool.h:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/include/mtr0mtr.h:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/include/os0file.h:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/include/os0sync.h:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/include/os0sync.ic:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/include/os0thread.h:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/include/row0mysql.ic:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/include/univ.i:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/include/srv0srv.h:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/include/sync0rw.h:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/include/sync0sync.h:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/include/ut0dbg.h:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/lock/lock0lock.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/log/log0log.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/log/log0recv.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/mem/mem0pool.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/os/os0file.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/os/os0shm.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/os/os0sync.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/os/os0thread.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/page/page0page.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/que/que0que.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/row/row0ins.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/row/row0mysql.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/row/row0sel.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/row/row0upd.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/row/row0vers.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/srv/srv0srv.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/srv/srv0start.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/sync/sync0arr.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/sync/sync0rw.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/sync/sync0sync.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/trx/trx0rec.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/trx/trx0trx.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes
innobase/ut/ut0ut.c:
  Fixes for 64-bit Linux, bug fixes, compiler warning fixes

de135a12

Merge work:/my/mysql into donna.mysql.fi:/home/my/bk/mysql · 3ab17885

unknown authored Mar 02, 2001


Docs/manual.texi:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

3ab17885

Avoid table scans when using DELETE on a table on which no SELECT has been done. · f05438e1
unknown authored Mar 02, 2001
```
Docs/manual.texi:
  Cleanups
```
f05438e1
Added ChangeLog entry about the SET bug. · 6bd98a63
unknown authored Mar 02, 2001

6bd98a63

Merge work.mysql.com:/home/bk/mysql · a1a773b5

unknown authored Mar 02, 2001

into tetra.spaceapes.com:/usr/home/jcole/bk/mysql


BitKeeper/etc/logging_ok:
  auto-union

a1a773b5

Fixed a bug that allowed: · 1cd271bd

unknown authored Mar 02, 2001

SET @foo=bar;

This would cause a deadlock in mysqld, it now generates the error:
ER_SET_CONSTANTS_ONLY as follows:

mysql> set @foo=bar;
ERROR 1204: You may only use constant expressions with SET


include/mysqld_error.h:
  Added a new error message for SET
sql/share/czech/errmsg.txt:
  Added a new error message for SET
sql/share/danish/errmsg.txt:
  Added a new error message for SET
sql/share/dutch/errmsg.txt:
  Added a new error message for SET
sql/share/english/errmsg.txt:
  Added a new error message for SET
sql/share/estonian/errmsg.txt:
  Added a new error message for SET
sql/share/french/errmsg.txt:
  Added a new error message for SET
sql/share/german/errmsg.txt:
  Added a new error message for SET
sql/share/greek/errmsg.txt:
  Added a new error message for SET
sql/share/hungarian/errmsg.txt:
  Added a new error message for SET
sql/share/italian/errmsg.txt:
  Added a new error message for SET
sql/share/japanese/errmsg.txt:
  Added a new error message for SET
sql/share/korean/errmsg.txt:
  Added a new error message for SET
sql/share/norwegian-ny/errmsg.txt:
  Added a new error message for SET
sql/share/norwegian/errmsg.txt:
  Added a new error message for SET
sql/share/polish/errmsg.txt:
  Added a new error message for SET
sql/share/portuguese/errmsg.txt:
  Added a new error message for SET
sql/share/romanian/errmsg.txt:
  Added a new error message for SET
sql/share/russian/errmsg.txt:
  Added a new error message for SET
sql/share/slovak/errmsg.txt:
  Added a new error message for SET
sql/share/spanish/errmsg.txt:
  Added a new error message for SET
sql/share/swedish/errmsg.txt:
  Added a new error message for SET
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

1cd271bd

01 Mar, 2001 8 commits

manual.texi ``short'' TIME values issue clarified · 2ac92eb4
unknown authored Mar 01, 2001
```
Docs/manual.texi:
  ``short'' TIME values issue clarified
```
2ac92eb4

Merge · 8e035b49

unknown authored Mar 01, 2001


Docs/manual.texi:
  Auto merged
mysql-test/t/fulltext.test:
  merged

8e035b49

mysql-test/t/bdb-crash.test · d0ec4469

unknown authored Mar 01, 2001

    make sure we get correct data 


mysql-test/t/bdb-crash.test:
  make sure we get correct data

d0ec4469

Merge work:/home/bk/mysql · a9322ae0
unknown authored Mar 01, 2001
```
into mysql.sashanet.com:/home/sasha/src/bk/mysql
```
a9322ae0

text/blob fields in some cases were not handled properly · 6bb380a0

unknown authored Mar 01, 2001


mysql-test/t/bdb.test:
  added space
mysql-test/t/fulltext.test:
  comment out the test for the last bug until Serg pushes the change
sql/field.cc:
  fixed coredump in INSERT into BDB table

6bb380a0

ha_innobase.cc Fixed a bug in ha_innobase.cc in auto_increment · 59eafdac
unknown authored Mar 01, 2001
```
sql/ha_innobase.cc:
  Fixed a bug in ha_innobase.cc in auto_increment
```
59eafdac
manual.texi Mirror maintenance. · b4b56b3c
unknown authored Mar 01, 2001
```
Docs/manual.texi:
  Mirror maintenance.
```
b4b56b3c

test-make-manual Fixed so that manual.html isn't cleaned up before it is... · 6fe43628

unknown authored Feb 28, 2001

test-make-manual	Fixed so that manual.html isn't cleaned up before it is viewed in the running $BROWSER.
manual.texi	Added MyODBC patch to contrib section.


Docs/manual.texi:
  Added MyODBC patch to contrib section.
Docs/Support/test-make-manual:
  Fixed so that manual.html isn't cleaned up before it is viewed in the running $BROWSER.

6fe43628

28 Feb, 2001 4 commits

os0file.h Removed a typo in os0file.h · b330167e
unknown authored Feb 28, 2001
```
innobase/include/os0file.h:
  Removed a typo in os0file.h
```
b330167e

sql_select.cc MATCH ... AGAINST (NULL) bug fixed · 72bc949c

unknown authored Feb 28, 2001

item_func.cc	MATCH ... AGAINST (NULL) bug fixed
fulltext.test	MATCH ... AGAINST (NULL) bug fixed
fulltext.result	MATCH ... AGAINST (NULL) bug fixed


mysql-test/r/fulltext.result:
  MATCH ... AGAINST (NULL) bug fixed
mysql-test/t/fulltext.test:
  MATCH ... AGAINST (NULL) bug fixed
sql/item_func.cc:
  MATCH ... AGAINST (NULL) bug fixed
sql/sql_select.cc:
  MATCH ... AGAINST (NULL) bug fixed

72bc949c

Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql · 064c7adf
unknown authored Feb 28, 2001
```
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
```
064c7adf

mysql-test/t/fulltext.test · 1d9c5905

unknown authored Feb 27, 2001

    added a test case for a coredump bug.


mysql-test/t/fulltext.test:
  added a test case for a coredump bug.

1d9c5905

27 Feb, 2001 3 commits

Docs/manual.texi · 1dad86e0

unknown authored Feb 26, 2001

    update for the fix
sql/slave.cc
    re-merged Jeremy's message changes, got the code to compile and run again
    after a mess-up in the merge


Docs/manual.texi:
  update for the fix
sql/slave.cc:
  re-merged Jeremy's message changes, got the code to compile and run again
  after a mess-up in the merge

1dad86e0

sql/slave.cc · 6532b525

unknown authored Feb 26, 2001

    merged


sql/slave.cc:
  merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

6532b525

ulonglong -> uint32 for log offset · 9e459e16

unknown authored Feb 26, 2001

more verbose messages when slave thread exits


sql/slave.cc:
  ulonglong -> uint32 for log offset
sql/slave.h:
  ulonglong -> uint32 for log offset

9e459e16

26 Feb, 2001 1 commit
- manual.texi fixed chown issue · 3a7fc247
  unknown authored Feb 26, 2001
```
Docs/manual.texi:
  fixed chown issue
```
  3a7fc247
24 Feb, 2001 1 commit

os0file.c Removed execute rights from created files · 145dedcd

unknown authored Feb 24, 2001

os0file.h	Added defines for S_IRUSR etc.


innobase/include/os0file.h:
  Added defines fro S_IRUSR etc.
innobase/os/os0file.c:
  Removed execute rights from created files

145dedcd

23 Feb, 2001 3 commits
- Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql · 76b6c148
  unknown authored Feb 23, 2001
```
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
```
  76b6c148
- Merge work.mysql.com:/home/bk/mysql · 9ab26a65
  unknown authored Feb 23, 2001
```
into donna.mysql.fi:/home/heikki/mysql


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
```
  9ab26a65
- ha_innobase.cc Fix autocommit in ha_innobase.cc · 0e8f420f
  unknown authored Feb 23, 2001
```
sql/ha_innobase.cc:
  Fix autocommit in ha_innobase.cc
```
  0e8f420f
22 Feb, 2001 3 commits

post-commit Added List-ID: header for easier filtering. · 5d2a74f9

unknown authored Feb 22, 2001


BitKeeper/triggers/post-commit:
  Added List-ID: header for easier filtering.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

5d2a74f9

btr0btr.c Testing bitkeeper · 8ae89bb7

unknown authored Feb 22, 2001


innobase/btr/btr0btr.c:
  Testing bitkeeper
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

8ae89bb7

Merge work.mysql.com:/home/bk/mysql · 0111add2

unknown authored Feb 21, 2001

into tetra.spaceapes.com:/usr/home/jcole/bk/mysql


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

0111add2

21 Feb, 2001 4 commits

Update for Innobase · 30566fc0
unknown authored Feb 21, 2001

30566fc0

Fixes for innobase · 6839b172

unknown authored Feb 21, 2001

Added test for ALTER TABLE ORDER BY


BUILD/FINISH.sh:
  Fixes for innobase
BUILD/compile-pentium-debug:
  Fixes for innobase
Docs/manual.texi:
  Fixes for innobase
include/my_pthread.h:
  Fixes for innobase
innobase/Makefile.am:
  Fixes for innobase
innobase/btr/Makefile.am:
  Fixes for innobase
innobase/data/Makefile.am:
  Fixes for innobase
innobase/eval/Makefile.am:
  Fixes for innobase
innobase/include/Makefile.i:
  Fixes for innobase
innobase/os/Makefile.am:
  Fixes for innobase
mysql-test/t/alter_table.test:
  Added test for ALTER TABLE ORDER BY
mysys/my_error.c:
  Skip 'l' in '%lu'
mysys/my_vsnprintf.c:
  cleanup
sql/ha_innobase.cc:
  Fixed type + remove warnings
sql/ha_innobase.h:
  Remove warnings
sql/handler.cc:
  cleanup
sql/sql_class.cc:
  remove warnings
sql/sql_parse.cc:
  remove warnings
sql/sql_table.cc:
  Fixed bug in ALTER TABLE ... ORDER BY
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

6839b172

Merge work.mysql.com:/home/bk/mysql · 1e5c62b0
unknown authored Feb 21, 2001
```
into tetra.spaceapes.com:/usr/home/jcole/bk/mysql


sql/mysqld.cc:
  Auto merged
```
1e5c62b0
Cleanups... · 81c92d5a
unknown authored Feb 20, 2001

81c92d5a

20 Feb, 2001 1 commit
- Merge donna.mysql.com:/home/my/bk/mysql · 0897a73a
  unknown authored Feb 21, 2001
```
into donna.mysql.com:/home/tim/my/work


innobase/os/os0sync.c:
  Auto merged
```
  0897a73a