Commits · fb531dae58d0ea75f44eba7bc1ee2bfaab20e690 · Kirill Smelkov / mariadb

30 Oct, 2001 6 commits

srv0srv.c Test if bk now works · fb531dae
unknown authored Oct 30, 2001
```
innobase/srv/srv0srv.c:
  Test if bk now works
```
fb531dae

Merge · 7b24c57c

unknown authored Oct 30, 2001


include/my_base.h:
  Try again merge InnoDB-3.23.44
include/mysqld_error.h:
  Try again merge InnoDB-3.23.44
sql/handler.cc:
  Try again merge InnoDB-3.23.44
sql/mysqld.cc:
  Try again merge InnoDB-3.23.44
sql/ha_innobase.cc:
  Try again merge InnoDB-3.23.44
sql/ha_innobase.h:
  Try again merge InnoDB-3.23.44
sql/share/czech/errmsg.txt:
  Try again merge InnoDB-3.23.44
sql/share/danish/errmsg.txt:
  Try again merge InnoDB-3.23.44
sql/share/dutch/errmsg.txt:
  Try again merge InnoDB-3.23.44
sql/share/english/errmsg.txt:
  Try again merge InnoDB-3.23.44
sql/share/estonian/errmsg.txt:
  Try again merge InnoDB-3.23.44
sql/share/french/errmsg.txt:
  Try again merge InnoDB-3.23.44
sql/share/german/errmsg.txt:
  Try again merge InnoDB-3.23.44
sql/share/greek/errmsg.txt:
  Try again merge InnoDB-3.23.44
sql/share/hungarian/errmsg.txt:
  Try again merge InnoDB-3.23.44
sql/share/italian/errmsg.txt:
  Try again merge InnoDB-3.23.44
sql/share/japanese/errmsg.txt:
  Try again merge InnoDB-3.23.44
sql/share/korean/errmsg.txt:
  Try again merge InnoDB-3.23.44
sql/share/norwegian-ny/errmsg.txt:
  Try again merge InnoDB-3.23.44
sql/share/norwegian/errmsg.txt:
  Try again merge InnoDB-3.23.44
sql/share/polish/errmsg.txt:
  Try again merge InnoDB-3.23.44
sql/share/portuguese/errmsg.txt:
  Try again merge InnoDB-3.23.44
sql/share/romanian/errmsg.txt:
  Try again merge InnoDB-3.23.44
sql/share/russian/errmsg.txt:
  Try again merge InnoDB-3.23.44
sql/share/slovak/errmsg.txt:
  Try again merge InnoDB-3.23.44
sql/share/spanish/errmsg.txt:
  Try again merge InnoDB-3.23.44
sql/share/swedish/errmsg.txt:
  Try again merge InnoDB-3.23.44
sql/share/ukrainian/errmsg.txt:
  Try again merge InnoDB-3.23.44
innobase/btr/btr0btr.c:
  Try again merge InnoDB-3.23.44
innobase/buf/buf0flu.c:
  Try again merge InnoDB-3.23.44
innobase/buf/buf0lru.c:
  Try again merge InnoDB-3.23.44
innobase/dict/dict0boot.c:
  Try again merge InnoDB-3.23.44
innobase/dict/dict0crea.c:
  Try again merge InnoDB-3.23.44
innobase/dict/dict0dict.c:
  Try again merge InnoDB-3.23.44
innobase/ibuf/ibuf0ibuf.c:
  Try again merge InnoDB-3.23.44
innobase/include/dict0boot.h:
  Try again merge InnoDB-3.23.44
innobase/include/dict0boot.ic:
  Try again merge InnoDB-3.23.44
innobase/include/dict0dict.h:
  Try again merge InnoDB-3.23.44
innobase/include/os0file.h:
  Try again merge InnoDB-3.23.44
innobase/include/os0sync.h:
  Try again merge InnoDB-3.23.44
innobase/include/page0page.ic:
  Try again merge InnoDB-3.23.44
innobase/include/read0read.h:
  Try again merge InnoDB-3.23.44
innobase/include/row0mysql.h:
  Try again merge InnoDB-3.23.44
innobase/include/srv0srv.h:
  Try again merge InnoDB-3.23.44
innobase/include/srv0start.h:
  Try again merge InnoDB-3.23.44
innobase/include/trx0purge.h:
  Try again merge InnoDB-3.23.44
innobase/include/trx0rec.h:
  Try again merge InnoDB-3.23.44
innobase/include/trx0trx.h:
  Try again merge InnoDB-3.23.44
innobase/lock/lock0lock.c:
  Try again merge InnoDB-3.23.44
innobase/log/log0log.c:
  Try again merge InnoDB-3.23.44
innobase/log/log0recv.c:
  Try again merge InnoDB-3.23.44
innobase/os/os0file.c:
  Try again merge InnoDB-3.23.44
innobase/page/page0page.c:
  Try again merge InnoDB-3.23.44
innobase/read/read0read.c:
  Try again merge InnoDB-3.23.44
innobase/rem/rem0cmp.c:
  Try again merge InnoDB-3.23.44
innobase/rem/rem0rec.c:
  Try again merge InnoDB-3.23.44
innobase/row/row0ins.c:
  Try again merge InnoDB-3.23.44
innobase/row/row0mysql.c:
  Try again merge InnoDB-3.23.44
innobase/row/row0purge.c:
  Try again merge InnoDB-3.23.44
innobase/row/row0row.c:
  Try again merge InnoDB-3.23.44
innobase/row/row0sel.c:
  Try again merge InnoDB-3.23.44
innobase/row/row0umod.c:
  Try again merge InnoDB-3.23.44
innobase/row/row0upd.c:
  Try again merge InnoDB-3.23.44
innobase/row/row0vers.c:
  Try again merge InnoDB-3.23.44
innobase/srv/srv0start.c:
  Try again merge InnoDB-3.23.44
innobase/sync/sync0arr.c:
  Try again merge InnoDB-3.23.44
innobase/trx/trx0purge.c:
  Try again merge InnoDB-3.23.44
innobase/trx/trx0rec.c:
  Try again merge InnoDB-3.23.44
innobase/trx/trx0roll.c:
  Try again merge InnoDB-3.23.44
innobase/trx/trx0sys.c:
  Try again merge InnoDB-3.23.44
innobase/trx/trx0trx.c:
  Try again merge InnoDB-3.23.44
innobase/trx/trx0undo.c:
  Try again merge InnoDB-3.23.44
innobase/srv/srv0srv.c:
  Commit change made by heikki
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

7b24c57c

Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql · fed395c7
unknown authored Oct 30, 2001

fed395c7

Fix for gcc 3.0 · 7b1cfb63

unknown authored Oct 30, 2001

Fix for using quoted table names with the SJIS character set.


BUILD/FINISH.sh:
  Fix for gcc 3.0
BUILD/SETUP.sh:
  Fix for gcc 3.0
Docs/manual.texi:
  Changelog
innobase/include/univ.i:
  Fix for gcc 3.0
sql/sql_lex.cc:
  Fix for using quoted table names with the SJIS character set.

7b1cfb63

Merge work:/home/bk/mysql · bbd88314
unknown authored Oct 29, 2001
```
into mysql.sashanet.com:/home/sasha/src/bk/mysql
```
bbd88314
fixed bug with temporary tables replication if one does FLUSH LOGS · 4af3c668
unknown authored Oct 29, 2001
```
mysql-test/t/rpl000012.test:
  test for replication of temp tables with FLUSH LOGS
```
4af3c668

29 Oct, 2001 2 commits
- ha_innobase.cc Another test · 928963f6
  unknown authored Oct 29, 2001
```
sql/ha_innobase.cc:
  Another test
```
  928963f6
- ha_innobase.cc Test · e984d676
  unknown authored Oct 29, 2001
```
sql/ha_innobase.cc:
  Test
```
  e984d676
25 Oct, 2001 1 commit

Adding code for NT service in the install and remove · 859371bb

unknown authored Oct 25, 2001

routines for avoid to leave the Service Control Manager
in bad state. Print messages for to reduce the current
user errors when are trying to install or start the service.
Adding the option to install the service for manual start:
--install-manual.


sql/mysqld.cc:
  Changes on install and remove service
sql/nt_servc.cc:
  Changes for install and remove routine.
  Adding the seek status routine
sql/nt_servc.h:
  Changes for install and remove routines
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

859371bb

24 Oct, 2001 2 commits
- bug in libmysql.c:mysql_reconnect() fixed · 7fd95741
  unknown authored Oct 24, 2001
```
libmysql/libmysql.c:
  bug fixed (if mysql_real_connect() failed there were two pointers to malloc'ed strings, with memory corruption on free(), of course)
```
  7fd95741
- bug (introduced yesterday) fixed · d320ee1a
  unknown authored Oct 24, 2001
  
  d320ee1a
23 Oct, 2001 2 commits

Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql · adb261ec
unknown authored Oct 23, 2001
```
sql/ha_innobase.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
```
adb261ec

HA_NO_FULLTEXT_KEY and an appropriate error message · 11572916

unknown authored Oct 23, 2001


include/mysqld_error.h:
  New error message added
libmysql/violite.c:
  FreeBSD fix
sql/ha_berkeley.h:
  HA_NO_FULLTEXT_KEY
sql/ha_heap.h:
  HA_NO_FULLTEXT_KEY
sql/ha_innobase.h:
  HA_NO_FULLTEXT_KEY
sql/ha_isam.h:
  HA_NO_FULLTEXT_KEY
sql/ha_isammrg.h:
  HA_NO_FULLTEXT_KEY
sql/ha_myisammrg.h:
  HA_NO_FULLTEXT_KEY
sql/share/czech/errmsg.txt:
  New error message added
sql/share/danish/errmsg.txt:
  New error message added
sql/share/dutch/errmsg.txt:
  New error message added
sql/share/english/errmsg.txt:
  New error message added
sql/share/estonian/errmsg.txt:
  New error message added
sql/share/french/errmsg.txt:
  New error message added
sql/share/german/errmsg.txt:
  New error message added
sql/share/greek/errmsg.txt:
  New error message added
sql/share/hungarian/errmsg.txt:
  New error message added
sql/share/italian/errmsg.txt:
  New error message added
sql/share/japanese/errmsg.txt:
  New error message added
sql/share/korean/errmsg.txt:
  New error message added
sql/share/norwegian-ny/errmsg.txt:
  New error message added
sql/share/norwegian/errmsg.txt:
  New error message added
sql/share/polish/errmsg.txt:
  New error message added
sql/share/portuguese/errmsg.txt:
  New error message added
sql/share/romanian/errmsg.txt:
  New error message added
sql/share/russian/errmsg.txt:
  New error message added
sql/share/slovak/errmsg.txt:
  New error message added
sql/share/spanish/errmsg.txt:
  New error message added
sql/share/swedish/errmsg.txt:
  New error message added
sql/share/ukrainian/errmsg.txt:
  New error message added
sql/sql_table.cc:
  FULLTEXT checks fixed
sql/violite.c:
  FreeBSD fix

11572916

19 Oct, 2001 2 commits

Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql · 87e036a2
unknown authored Oct 19, 2001

87e036a2

Don't use signal() on windows. · 253b9ecb

unknown authored Oct 19, 2001

Added missing InnoDB variables to SHOW VARIABLES.
Fixed bug when doing WHERE 'column_name=NULL' on an indexed column that had NULL values.
Fixed bug when doing 'LEFT JOIN ...  ON (column_name = constant) WHERE column_name = constant'


Docs/manual.texi:
  Changelog
libmysql/libmysql.c:
  Don't use signal() on windows.
mysql-test/r/join_outer.result:
  Test for bugfix
mysql-test/r/null.result:
  Test for bugfix
mysql-test/t/join_outer.test:
  Test for bugfix
mysql-test/t/null.test:
  Test for bugfix
sql/mysqld.cc:
  Add missing InnoDB variables to SHOW VARIABLES.
sql/sql_select.cc:
  Fixed bug when doing WHERE 'column_name=NULL' on an indexed column that had NULL values.
  Fixed bug when doing 'LEFT JOIN ...  ON (column_name = constant) WHERE column_name = constant'

253b9ecb

17 Oct, 2001 1 commit
- fixed sleep · 0889d8dc
  unknown authored Oct 17, 2001
```
bug on reconnect


sql/slave.cc:
  fixed sleep bug
```
  0889d8dc
11 Oct, 2001 1 commit

InnoDB portability fixes · 6f2d5616

unknown authored Oct 11, 2001


innobase/configure.in:
  Remove LOCALTIME_R (Already checked in config.h)
innobase/os/os0file.c:
  Fix syntax bug when using HAVE_PREAD/HAVE_PWRITE
mysql-test/r/innodb.result:
  Update results

6f2d5616

10 Oct, 2001 1 commit

ut0mem.c Merge changes in InnoDB-3.23.43b · 1904897b

unknown authored Oct 10, 2001

ut0ut.c 	Merge changes in InnoDB-3.23.43b
trx0purge.c	Merge changes in InnoDB-3.23.43b
trx0rec.c	Merge changes in InnoDB-3.23.43b
trx0trx.c	Merge changes in InnoDB-3.23.43b
trx0undo.c	Merge changes in InnoDB-3.23.43b
thr0loc.c	Merge changes in InnoDB-3.23.43b
sync0arr.c	Merge changes in InnoDB-3.23.43b
sync0rw.c	Merge changes in InnoDB-3.23.43b
sync0sync.c	Merge changes in InnoDB-3.23.43b
srv0srv.c	Merge changes in InnoDB-3.23.43b
srv0start.c	Merge changes in InnoDB-3.23.43b
row0ins.c	Merge changes in InnoDB-3.23.43b
row0mysql.c	Merge changes in InnoDB-3.23.43b
row0purge.c	Merge changes in InnoDB-3.23.43b
row0sel.c	Merge changes in InnoDB-3.23.43b
row0umod.c	Merge changes in InnoDB-3.23.43b
row0upd.c	Merge changes in InnoDB-3.23.43b
row0vers.c	Merge changes in InnoDB-3.23.43b
rem0cmp.c	Merge changes in InnoDB-3.23.43b
que0que.c	Merge changes in InnoDB-3.23.43b
pars0opt.c	Merge changes in InnoDB-3.23.43b
pars0pars.c	Merge changes in InnoDB-3.23.43b
lexyy.c 	Merge changes in InnoDB-3.23.43b
pars0grm.c	Merge changes in InnoDB-3.23.43b
page0page.c	Merge changes in InnoDB-3.23.43b
os0file.c	Merge changes in InnoDB-3.23.43b
mtr0log.c	Merge changes in InnoDB-3.23.43b
mem0pool.c	Merge changes in InnoDB-3.23.43b
log0log.c	Merge changes in InnoDB-3.23.43b
log0recv.c	Merge changes in InnoDB-3.23.43b
lock0lock.c	Merge changes in InnoDB-3.23.43b
ibuf0ibuf.c	Merge changes in InnoDB-3.23.43b
fil0fil.c	Merge changes in InnoDB-3.23.43b
dict0crea.c	Merge changes in InnoDB-3.23.43b
dict0dict.c	Merge changes in InnoDB-3.23.43b
dict0load.c	Merge changes in InnoDB-3.23.43b
dict0mem.c	Merge changes in InnoDB-3.23.43b
data0data.c	Merge changes in InnoDB-3.23.43b
data0type.c	Merge changes in InnoDB-3.23.43b
buf0buf.c	Merge changes in InnoDB-3.23.43b
buf0lru.c	Merge changes in InnoDB-3.23.43b
btr0btr.c	Merge changes in InnoDB-3.23.43b
btr0cur.c	Merge changes in InnoDB-3.23.43b
btr0pcur.c	Merge changes in InnoDB-3.23.43b
btr0sea.c	Merge changes in InnoDB-3.23.43b
data0type.ic	Merge changes in InnoDB-3.23.43b
dict0dict.ic	Merge changes in InnoDB-3.23.43b
mtr0mtr.ic	Merge changes in InnoDB-3.23.43b
row0upd.ic	Merge changes in InnoDB-3.23.43b
sync0ipm.ic	Merge changes in InnoDB-3.23.43b
sync0rw.ic	Merge changes in InnoDB-3.23.43b
sync0sync.ic	Merge changes in InnoDB-3.23.43b
trx0rseg.ic	Merge changes in InnoDB-3.23.43b
btr0pcur.ic	Merge changes in InnoDB-3.23.43b
buf0buf.ic	Merge changes in InnoDB-3.23.43b
data0data.ic	Merge changes in InnoDB-3.23.43b
row0upd.h	Merge changes in InnoDB-3.23.43b
srv0srv.h	Merge changes in InnoDB-3.23.43b
sync0arr.h	Merge changes in InnoDB-3.23.43b
sync0rw.h	Merge changes in InnoDB-3.23.43b
sync0sync.h	Merge changes in InnoDB-3.23.43b
trx0trx.h	Merge changes in InnoDB-3.23.43b
ut0mem.h	Merge changes in InnoDB-3.23.43b
data0data.h	Merge changes in InnoDB-3.23.43b
data0type.h	Merge changes in InnoDB-3.23.43b
db0err.h	Merge changes in InnoDB-3.23.43b
dict0crea.h	Merge changes in InnoDB-3.23.43b
dict0dict.h	Merge changes in InnoDB-3.23.43b
dict0load.h	Merge changes in InnoDB-3.23.43b
dict0mem.h	Merge changes in InnoDB-3.23.43b
dict0types.h	Merge changes in InnoDB-3.23.43b
fil0fil.h	Merge changes in InnoDB-3.23.43b
ibuf0ibuf.h	Merge changes in InnoDB-3.23.43b
lock0lock.h	Merge changes in InnoDB-3.23.43b
log0log.h	Merge changes in InnoDB-3.23.43b
mtr0mtr.h	Merge changes in InnoDB-3.23.43b
rem0cmp.h	Merge changes in InnoDB-3.23.43b
row0ins.h	Merge changes in InnoDB-3.23.43b
row0mysql.h	Merge changes in InnoDB-3.23.43b
btr0cur.h	Merge changes in InnoDB-3.23.43b
btr0pcur.h	Merge changes in InnoDB-3.23.43b
btr0sea.h	Merge changes in InnoDB-3.23.43b
buf0buf.h	Merge changes in InnoDB-3.23.43b
sql_table.cc	Merge changes in InnoDB-3.23.43b
sql_db.cc	Merge changes in InnoDB-3.23.43b
ha_innobase.cc	Merge changes in InnoDB-3.23.43b
handler.cc	Merge changes in InnoDB-3.23.43b
ha_innobase.h	Merge changes in InnoDB-3.23.43b
handler.h	Merge changes in InnoDB-3.23.43b


sql/ha_innobase.h:
  Merge changes in InnoDB-3.23.43b
sql/handler.h:
  Merge changes in InnoDB-3.23.43b
sql/ha_innobase.cc:
  Merge changes in InnoDB-3.23.43b
sql/handler.cc:
  Merge changes in InnoDB-3.23.43b
sql/sql_db.cc:
  Merge changes in InnoDB-3.23.43b
sql/sql_table.cc:
  Merge changes in InnoDB-3.23.43b
innobase/include/btr0cur.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/btr0pcur.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/btr0sea.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/buf0buf.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/data0data.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/data0type.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/db0err.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/dict0crea.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/dict0dict.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/dict0load.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/dict0mem.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/dict0types.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/fil0fil.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/ibuf0ibuf.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/lock0lock.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/log0log.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/mtr0mtr.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/rem0cmp.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/row0ins.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/row0mysql.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/row0upd.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/srv0srv.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/sync0arr.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/sync0rw.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/sync0sync.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/trx0trx.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/ut0mem.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/btr0pcur.ic:
  Merge changes in InnoDB-3.23.43b
innobase/include/buf0buf.ic:
  Merge changes in InnoDB-3.23.43b
innobase/include/data0data.ic:
  Merge changes in InnoDB-3.23.43b
innobase/include/data0type.ic:
  Merge changes in InnoDB-3.23.43b
innobase/include/dict0dict.ic:
  Merge changes in InnoDB-3.23.43b
innobase/include/mtr0mtr.ic:
  Merge changes in InnoDB-3.23.43b
innobase/include/row0upd.ic:
  Merge changes in InnoDB-3.23.43b
innobase/include/sync0ipm.ic:
  Merge changes in InnoDB-3.23.43b
innobase/include/sync0rw.ic:
  Merge changes in InnoDB-3.23.43b
innobase/include/sync0sync.ic:
  Merge changes in InnoDB-3.23.43b
innobase/include/trx0rseg.ic:
  Merge changes in InnoDB-3.23.43b
innobase/btr/btr0btr.c:
  Merge changes in InnoDB-3.23.43b
innobase/btr/btr0cur.c:
  Merge changes in InnoDB-3.23.43b
innobase/btr/btr0pcur.c:
  Merge changes in InnoDB-3.23.43b
innobase/btr/btr0sea.c:
  Merge changes in InnoDB-3.23.43b
innobase/buf/buf0buf.c:
  Merge changes in InnoDB-3.23.43b
innobase/buf/buf0lru.c:
  Merge changes in InnoDB-3.23.43b
innobase/data/data0data.c:
  Merge changes in InnoDB-3.23.43b
innobase/data/data0type.c:
  Merge changes in InnoDB-3.23.43b
innobase/dict/dict0crea.c:
  Merge changes in InnoDB-3.23.43b
innobase/dict/dict0dict.c:
  Merge changes in InnoDB-3.23.43b
innobase/dict/dict0load.c:
  Merge changes in InnoDB-3.23.43b
innobase/dict/dict0mem.c:
  Merge changes in InnoDB-3.23.43b
innobase/fil/fil0fil.c:
  Merge changes in InnoDB-3.23.43b
innobase/ibuf/ibuf0ibuf.c:
  Merge changes in InnoDB-3.23.43b
innobase/lock/lock0lock.c:
  Merge changes in InnoDB-3.23.43b
innobase/log/log0log.c:
  Merge changes in InnoDB-3.23.43b
innobase/log/log0recv.c:
  Merge changes in InnoDB-3.23.43b
innobase/mem/mem0pool.c:
  Merge changes in InnoDB-3.23.43b
innobase/mtr/mtr0log.c:
  Merge changes in InnoDB-3.23.43b
innobase/os/os0file.c:
  Merge changes in InnoDB-3.23.43b
innobase/page/page0page.c:
  Merge changes in InnoDB-3.23.43b
innobase/pars/lexyy.c:
  Merge changes in InnoDB-3.23.43b
innobase/pars/pars0grm.c:
  Merge changes in InnoDB-3.23.43b
innobase/pars/pars0opt.c:
  Merge changes in InnoDB-3.23.43b
innobase/pars/pars0pars.c:
  Merge changes in InnoDB-3.23.43b
innobase/que/que0que.c:
  Merge changes in InnoDB-3.23.43b
innobase/rem/rem0cmp.c:
  Merge changes in InnoDB-3.23.43b
innobase/row/row0ins.c:
  Merge changes in InnoDB-3.23.43b
innobase/row/row0mysql.c:
  Merge changes in InnoDB-3.23.43b
innobase/row/row0purge.c:
  Merge changes in InnoDB-3.23.43b
innobase/row/row0sel.c:
  Merge changes in InnoDB-3.23.43b
innobase/row/row0umod.c:
  Merge changes in InnoDB-3.23.43b
innobase/row/row0upd.c:
  Merge changes in InnoDB-3.23.43b
innobase/row/row0vers.c:
  Merge changes in InnoDB-3.23.43b
innobase/srv/srv0srv.c:
  Merge changes in InnoDB-3.23.43b
innobase/srv/srv0start.c:
  Merge changes in InnoDB-3.23.43b
innobase/sync/sync0arr.c:
  Merge changes in InnoDB-3.23.43b
innobase/sync/sync0rw.c:
  Merge changes in InnoDB-3.23.43b
innobase/sync/sync0sync.c:
  Merge changes in InnoDB-3.23.43b
innobase/thr/thr0loc.c:
  Merge changes in InnoDB-3.23.43b
innobase/trx/trx0purge.c:
  Merge changes in InnoDB-3.23.43b
innobase/trx/trx0rec.c:
  Merge changes in InnoDB-3.23.43b
innobase/trx/trx0trx.c:
  Merge changes in InnoDB-3.23.43b
innobase/trx/trx0undo.c:
  Merge changes in InnoDB-3.23.43b
innobase/ut/ut0mem.c:
  Merge changes in InnoDB-3.23.43b
innobase/ut/ut0ut.c:
  Merge changes in InnoDB-3.23.43b
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

1904897b

08 Oct, 2001 1 commit

merge sql/violite.c with libmysql/violite.c · 151ffe88

unknown authored Oct 08, 2001


libmysql/violite.c:
  cleanup
sql/violite.c:
  merge with libmysql/violite.c
  (These files 'should' be symlinked but..)

151ffe88

07 Oct, 2001 1 commit

Fix for 'mysqladmin -w1 unknown-command' · 63c7276f

unknown authored Oct 07, 2001

Manual Changelog update


Docs/manual.texi:
  Changelog
client/mysqladmin.c:
  Fix for 'mysqladmin -w1 unknown-command'
libmysql/violite.c:
  Fix for TCP_NODELAY
mysql-test/mysql-test-run.sh:
  Portability fixes
sql/sql_lex.cc:
  Cleanup
sql/sql_lex.h:
  Cleanup

63c7276f

05 Oct, 2001 1 commit

fixed crash on slave when master aborts a query that has % in it. · 9def7003

unknown authored Oct 05, 2001


mysql-test/t/rpl000001.test:
  test for coredump on slave while trying to print aborted query
sql/slave.cc:
  do not coredump printing aborted query if it has % in it.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

9def7003

03 Oct, 2001 4 commits

Portability fix · 80f52d45
unknown authored Oct 03, 2001

80f52d45
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql · e9a620e6
unknown authored Oct 03, 2001
```
Build-tools/Do-compile:
  Auto merged
```
e9a620e6

Cleanup between compilations · 8fa4fe08

unknown authored Oct 03, 2001


Build-tools/Do-compile:
  Cleanups
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

8fa4fe08

Added usage of --master-retry-count to make mysql-test-run safer. · 2529b817

unknown authored Oct 03, 2001


Build-tools/Do-compile:
  Remove --no-delete
Docs/manual.texi:
  Udated IA64 section
mysql-test/mysql-test-run.sh:
  Added usage of --master-retry-count
  set LD_LIBRARY_PATH
sql/mysqld.cc:
  Added master-retry-count (needed by mysql-test-run)
sql/slave.cc:
  Added master-retry-count
  Don't write same error to log on retry
sql/slave.h:
  Added master-retry-count (needed by mysql-test-run)

2529b817

02 Oct, 2001 4 commits

Portability fix · 32bc9157
unknown authored Oct 02, 2001

32bc9157

Fix for make dist · abf1b80c

unknown authored Oct 02, 2001

Made replication test portable
Fixed buffer overrun bug in replication


client/Makefile.am:
  Fix for make dist
mysql-test/t/rpl000017-slave.sh:
  Made replication test portable
sql/slave.cc:
  Fixed buffer overrun bug
strings/strmake.c:
  More documentation

abf1b80c

Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql · 777df004
unknown authored Oct 02, 2001
```
Docs/manual.texi:
  Auto merged
```
777df004

Fixed bug in INSERT DELAYED · 77b02100

unknown authored Oct 02, 2001

Fixed some problems in SHOW CREATE TABLE
Fixed calculation of checksums in myisamchk


Docs/manual.texi:
  ChangelogWh
client/mysql.cc:
  Added comment
myisam/mi_check.c:
  Fixed calcualtion of checksums
sql/sql_insert.cc:
  Fixed bug in INSERT DELAYED
sql/sql_show.cc:
  Fixed some problems in SHOW CREATE TABLE

77b02100

01 Oct, 2001 1 commit
- three column types (added to parser - but not to the manual - long time ago) documented · 6ee4a0d2
  unknown authored Oct 01, 2001
  
  6ee4a0d2
28 Sep, 2001 4 commits
- Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql · 00009583
  unknown authored Sep 28, 2001
```
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
```
  00009583
- manual.texi typos · a4a8427d
  unknown authored Sep 28, 2001
```
Docs/manual.texi:
  typos
```
  a4a8427d
- Update version number · 39649090
  unknown authored Sep 28, 2001
  
  39649090
- Fix that postscript generation of the manual works again · d973a9f8
  unknown authored Sep 28, 2001
```
Docs/manual.texi:
  Fix that postscript generation works again
```
  d973a9f8
27 Sep, 2001 6 commits

Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql · 6ba992fb
unknown authored Sep 27, 2001
```
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
```
6ba992fb

Fixed bug in counting open files when using many files · 0edc02d6

unknown authored Sep 27, 2001

Fixed bug in JOIN


Docs/manual.texi:
  Changlog
mysql-test/r/join.result:
  New test for join bug
mysql-test/r/null_key.result:
  Fix result after fixing join bug
mysql-test/t/join.test:
  New test for join bug
mysys/my_open.c:
  Fixed bug in counting open files when using many files.
sql/sql_select.cc:
  Fixed join bug

0edc02d6

Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql · e47b763f
unknown authored Sep 27, 2001
```
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
```
e47b763f

Cleaned up udf_example.cc and mysql_fix_privilege_tables · b39ab709

unknown authored Sep 27, 2001


acinclude.m4:
  Fixed typo in configure
scripts/mysql_fix_privilege_tables.sh:
  Use CREATE TABLE IF EXISTS to avoid warnings
sql/udf_example.cc:
  Fixed that avgcost() is compiled properly.
  Added more comments

b39ab709

manual.texi typo fixes. · fb70f219
unknown authored Sep 27, 2001
```
Docs/manual.texi:
  typo fixes.
```
fb70f219

manual.texi correct date error in manual. · a75a59f0

unknown authored Sep 27, 2001


Docs/manual.texi:
  correct date error in manual.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

a75a59f0