Commits · d7c5327db62886135dcb14ba1d9d117eaeaf6100 · Kirill Smelkov / mariadb

11 Aug, 2001 2 commits

Merge work:/home/bk/mysql-4.0 · d7c5327d

unknown authored Aug 11, 2001

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
libmysql/libmysql.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

d7c5327d

temp commit working on a merge · 7a4b7c4f

unknown authored Aug 11, 2001


client/mysqlbinlog.cc:
  remove unused variables
sql/log_event.h:
  fix bad merge

7a4b7c4f

10 Aug, 2001 6 commits

Automerge · 46aeed09
unknown authored Aug 10, 2001

46aeed09

Embedded mysql fixes. · b538ff90

unknown authored Aug 10, 2001

There is now a mysql_server_init() function which needs to be
called at the beginning of the program (and _end() for the end
of the program).  This routine handles argument parsing for the
embedded server.

Use the embedded version of mysql_load_file() (ignore the LOCAL
argument, since the client and server are the same program).

There are now mysql_thread_init/end() functions for the client
to use in a multi-threaded app.  They are just wrappers for
my_thread_init/end().



BitKeeper/deleted/.del-README~434e9cae5fa9a4c4:
  Delete: libmysqld/README
libmysqld/lib_load.cc:
  minor cleanup
include/mysql.h:
  add mysql_server/thread_init/end()
libmysql/libmysql.c:
  add mysql_server/thread_init/end()
libmysqld/lib_sql.cc:
  add mysql_server/thread_init/end()
libmysqld/libmysqld.c:
  add mysql_server/thread_init/end()
sql/mysqld.cc:
  allow get_options() to be called more than once
libmysqld/Makefile.am:
  use lib_load.cc instead of sql_load.cc
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

b538ff90

Merge work:/home/bk/mysql-4.0 · 8af8098d

unknown authored Aug 09, 2001

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


configure.in:
  Auto merged

8af8098d

merged · 9a6a7bf5

unknown authored Aug 09, 2001


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
ltmain.sh:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

9a6a7bf5

Merge work:/home/bk/mysql · ebb3bd0f

unknown authored Aug 09, 2001

into mysql.sashanet.com:/home/sasha/src/bk/mysql


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

ebb3bd0f

mysqlbinlog->client · 8ddf0c44

unknown authored Aug 09, 2001


BitKeeper/etc/ignore:
  Added client/log_event.cc client/log_event.h client/mf_iocache.c client/mf_iocache.cc client/mysqlbinlog client/mysys_priv.h mysql.kdevprj to the ignore list
Makefile.am:
  do symlink hack in the client directory 
  ( originally needed to get log_event.cc for mysqlbinlog)
client/mysqlbinlog.cc:
  fixes to make it compile in the client directory
libmysql/Makefile.shared:
  link mysqlbinlog dependencies into libmysqlclient
libmysql/libmysql.c:
  make simple_command and net_safe_read extern ( for mysqlbinlog)
sql/log_event.cc:
  removed pthread dependency in mysqlbinlog
sql/log_event.h:
  removed pthread dependency in mysqlbinlog

8ddf0c44

09 Aug, 2001 11 commits

ibuf0ibuf.c Fix a potential hang in database shutdown (not known if there is... · 95b28dbb

unknown authored Aug 10, 2001

ibuf0ibuf.c Fix a potential hang in database shutdown (not known if there is such, but let us play safe)

innobase/ibuf/ibuf0ibuf.c:
Fix a potential hang in database shutdown (not known if there is such, but let us play safe)

95b28dbb

Merge work.mysql.com:/home/bk/mysql into work.mysql.com:/home/tim/my/3 · 70e03a26
unknown authored Aug 09, 2001
```
BitKeeper/etc/logging_ok:
  auto-union
```
70e03a26

Merge jcole@work.mysql.com:/home/bk/mysql · eff8ec49

unknown authored Aug 09, 2001

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


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

eff8ec49

Fixes to DocTOC Chapter 6. · a04a6034
unknown authored Aug 09, 2001

a04a6034
DocTOC Chapter 6 Complete! · 75ca573a
unknown authored Aug 09, 2001

75ca573a
ha_innobase.h Fix Sort aborted bug · 5c3764b5
unknown authored Aug 09, 2001
```
sql/ha_innobase.h:
  Fix Sort aborted bug
```
5c3764b5

btr0cur.c Improve range size estimate for big ranges · 5ea83eed

unknown authored Aug 09, 2001

ha_innobase.cc	Fix Sort aborted bug


sql/ha_innobase.cc:
  Fix Sort aborted bug
innobase/btr/btr0cur.c:
  Improve range size estimate for big ranges
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

5ea83eed

logging_ok Logging to logging@openlogging.org accepted · 799bf1cd

unknown authored Aug 09, 2001

ltmain.sh	Don't add -lc to deplibs on FreeBSD.


ltmain.sh:
  Don't add -lc to deplibs on FreeBSD.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

799bf1cd

Merge jamppa@work:/home/bk/mysql into hynda.mysql.fi:/data/my/bk/mysql · 83fbd8d8
unknown authored Aug 09, 2001
```
Docs/manual.texi:
  Auto merged
```
83fbd8d8

Added new optino --sql-mode to mysqld. · b95d4398

unknown authored Aug 09, 2001


Docs/manual.texi:
  New option, --sql-mode=option[,option[,option]]
sql/ha_myisam.cc:
  Fixed a segmentation fault -bug with myisam-recover which
  occurred if option specified was not a legal one.
sql/mysql_priv.h:
  New option --sql-mode
sql/mysqld.cc:
  New option --sql-mode
sql/sql_class.cc:
  New option --sql-mode
sql/sql_class.h:
  New option --sql-mode
sql/sql_lex.cc:
  option --sql-mode, ansi_quotes and ignore_space
sql/sql_parse.cc:
  option --sql-mode, ignore_space
sql/sql_select.cc:
  option --sql-mode, mode only_full_group_by
sql/sql_yacc.yy:
  option --sql-mode, modes pipes_as_concat and real_as_float
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

b95d4398

fixed some spacing and tag nesting problems in manual.texi · f8f08143
unknown authored Aug 09, 2001
```
Docs/manual.texi:
  fixed some spacing and tag nesting problems
```
f8f08143

08 Aug, 2001 12 commits

Added CPU automatic detection. It examines /proc/cpuinfo (if exists) and finds... · ea4a4de3

unknown authored Aug 09, 2001

Added CPU automatic detection. It examines /proc/cpuinfo (if exists) and finds out flags for -mcpu and -march.
TODO is --with-cpu configure option to force some other processor type.
Problem is not big as any Intel 686+ CPU will use -mcpu=pentiumpro anyway. Exceptions are Athlons and 586 processors.


BUILD/SETUP.sh:
  Removed hardcoded processor type as it will be added later by configure
acinclude.m4:
  Added CPU automatic detection
configure.in:
  Added CPU automatic detection

ea4a4de3

row0upd.c Fix a memory overwrite which can happen if we update or delete a > 8000-byte row · 40f6a1d6
unknown authored Aug 08, 2001
```
innobase/row/row0upd.c:
  Fix a memory overwrite which can happen if we update or delete a > 8000-byte row
```
40f6a1d6

trx0purge.c Fix a bug which might stop purge from running · a9a44543

unknown authored Aug 08, 2001

buf0flu.c	Add an include to fix compile problem in non-inlined version


innobase/buf/buf0flu.c:
  Add an include to fix compile problem in non-inlined version
innobase/trx/trx0purge.c:
  Fix a bug which might stop purge from running

a9a44543

Merge jcole@work.mysql.com:/home/bk/mysql · 9e4545b7
unknown authored Aug 08, 2001
```
into tetra.spaceapes.com:/home/jcole/bk/mysql


Docs/manual.texi:
  Auto merged
```
9e4545b7
Merge work.mysql.com:/home/bk/mysql · 064f6989
unknown authored Aug 09, 2001
```
into x153.internalnet:/home/tonu/mysql


Docs/manual.texi:
  Auto merged
```
064f6989
Merge work:/my/mysql into tik.mysql.fi:/home/my/mysql · b5545979
unknown authored Aug 08, 2001
```
Docs/manual.texi:
  Auto merged
```
b5545979
small fixes from users · ac60b56f
unknown authored Aug 08, 2001

ac60b56f
manual.texi Removed broken mirror · a102f17d
unknown authored Aug 09, 2001
```
Docs/manual.texi:
  Removed broken mirror
```
a102f17d
manual.texi Another Indonesian mirror · 5d7647dc
unknown authored Aug 08, 2001
```
Docs/manual.texi:
  Another Indonesian mirror
```
5d7647dc

manual.texi More mirror list maintenance · 671c6c93

unknown authored Aug 08, 2001

indonesia.eps BitKeeper file /home/mwagner/work/bk/mysql/Docs/Flags/indonesia.eps
yugoslavia.eps BitKeeper file /home/mwagner/work/bk/mysql/Docs/Flags/yugoslavia.eps
yugoslavia.gif BitKeeper file /home/mwagner/work/bk/mysql/Docs/Flags/yugoslavia.gif
yugoslavia.txt BitKeeper file /home/mwagner/work/bk/mysql/Docs/Flags/yugoslavia.txt
indonesia.gif BitKeeper file /home/mwagner/work/bk/mysql/Docs/Flags/indonesia.gif
indonesia.txt BitKeeper file /home/mwagner/work/bk/mysql/Docs/Flags/indonesia.txt

Docs/manual.texi:
More mirror list maintenance

671c6c93

Merge work:/my/mysql into tik.mysql.fi:/home/my/mysql · 5496e67d
unknown authored Aug 08, 2001
```
Docs/manual.texi:
  Auto merged
```
5496e67d
Fix of big in SELECT DISTINCT ... HAVING · 9d813519
unknown authored Aug 08, 2001
```
Docs/manual.texi:
  Update of changelog
```
9d813519

07 Aug, 2001 2 commits
- Add --default-character-set option to mysqlimport. Thanks to · 78a2de43
  unknown authored Aug 07, 2001
```
takeshi@softagent.co.jp for the patch.


client/mysqlimport.c:
  add --default-character-set option
```
  78a2de43
- manual.texi Mirror updates · c810b4a4
  unknown authored Aug 07, 2001
```
Docs/manual.texi:
  Mirror updates
```
  c810b4a4
06 Aug, 2001 2 commits

misc bug fixes · 4bb40187

unknown authored Aug 06, 2001


libmysqld/Makefile.am:
  sql_unions -> sql_union
BitKeeper/etc/ignore:
  Added libmysqld/sql_union.cc to the ignore list
mysql-test/mysql-test-run.sh:
  fix to get path-independent logging
mysql-test/r/rpl_log.result:
  fix for path-independent logging
sql/log.cc:
  fixed compile error with USING_TRANSACTIONS
sql/log_event.h:
  fixed compile error with USING_TRANSACTIONS

4bb40187

manual.texi added explicit entry for EXTRACT() function · a8c230ad
unknown authored Aug 06, 2001
```
Docs/manual.texi:
  added explicit entry for EXTRACT() function
```
a8c230ad

04 Aug, 2001 3 commits

fixed error message numbers in union test · ad5100da
unknown authored Aug 04, 2001
```
mysql-test/t/union.test:
  fixed error message numbers
```
ad5100da

srv0srv.h Support raw disk partitions as data files · c67510f0

unknown authored Aug 04, 2001

srv0start.c	Support raw disk partitions as data files
srv0srv.c	Support raw disk partitions as data files
row0purge.c	< 4 GB rows, doublewrite, hang fixes
row0row.c	< 4 GB rows, doublewrite, hang fixes
row0sel.c	< 4 GB rows, doublewrite, hang fixes
row0uins.c	< 4 GB rows, doublewrite, hang fixes
row0umod.c	< 4 GB rows, doublewrite, hang fixes
row0undo.c	< 4 GB rows, doublewrite, hang fixes
row0upd.c	< 4 GB rows, doublewrite, hang fixes
srv0srv.c	< 4 GB rows, doublewrite, hang fixes
srv0start.c	< 4 GB rows, doublewrite, hang fixes
sync0rw.c	< 4 GB rows, doublewrite, hang fixes
sync0sync.c	< 4 GB rows, doublewrite, hang fixes
trx0purge.c	< 4 GB rows, doublewrite, hang fixes
trx0rec.c	< 4 GB rows, doublewrite, hang fixes
trx0sys.c	< 4 GB rows, doublewrite, hang fixes
btr0btr.c	< 4 GB rows, doublewrite, hang fixes
btr0cur.c	< 4 GB rows, doublewrite, hang fixes
buf0buf.c	< 4 GB rows, doublewrite, hang fixes
buf0flu.c	< 4 GB rows, doublewrite, hang fixes
buf0rea.c	< 4 GB rows, doublewrite, hang fixes
data0data.c	< 4 GB rows, doublewrite, hang fixes
fil0fil.c	< 4 GB rows, doublewrite, hang fixes
fsp0fsp.c	< 4 GB rows, doublewrite, hang fixes
ibuf0ibuf.c	< 4 GB rows, doublewrite, hang fixes
lock0lock.c	< 4 GB rows, doublewrite, hang fixes
log0log.c	< 4 GB rows, doublewrite, hang fixes
log0recv.c	< 4 GB rows, doublewrite, hang fixes
os0file.c	< 4 GB rows, doublewrite, hang fixes
page0cur.c	< 4 GB rows, doublewrite, hang fixes
pars0pars.c	< 4 GB rows, doublewrite, hang fixes
rem0cmp.c	< 4 GB rows, doublewrite, hang fixes
rem0rec.c	< 4 GB rows, doublewrite, hang fixes
row0ins.c	< 4 GB rows, doublewrite, hang fixes
row0mysql.c	< 4 GB rows, doublewrite, hang fixes
univ.i  	< 4 GB rows, doublewrite, hang fixes
data0data.ic	< 4 GB rows, doublewrite, hang fixes
mach0data.ic	< 4 GB rows, doublewrite, hang fixes
rem0rec.ic	< 4 GB rows, doublewrite, hang fixes
row0upd.ic	< 4 GB rows, doublewrite, hang fixes
trx0rec.ic	< 4 GB rows, doublewrite, hang fixes
rem0cmp.h	< 4 GB rows, doublewrite, hang fixes
rem0rec.h	< 4 GB rows, doublewrite, hang fixes
row0ins.h	< 4 GB rows, doublewrite, hang fixes
row0mysql.h	< 4 GB rows, doublewrite, hang fixes
row0row.h	< 4 GB rows, doublewrite, hang fixes
row0upd.h	< 4 GB rows, doublewrite, hang fixes
srv0srv.h	< 4 GB rows, doublewrite, hang fixes
sync0sync.h	< 4 GB rows, doublewrite, hang fixes
trx0rec.h	< 4 GB rows, doublewrite, hang fixes
trx0sys.h	< 4 GB rows, doublewrite, hang fixes
trx0types.h	< 4 GB rows, doublewrite, hang fixes
trx0undo.h	< 4 GB rows, doublewrite, hang fixes
ut0dbg.h	< 4 GB rows, doublewrite, hang fixes
ut0ut.h 	< 4 GB rows, doublewrite, hang fixes
btr0btr.h	< 4 GB rows, doublewrite, hang fixes
btr0cur.h	< 4 GB rows, doublewrite, hang fixes
buf0buf.h	< 4 GB rows, doublewrite, hang fixes
buf0flu.h	< 4 GB rows, doublewrite, hang fixes
data0data.h	< 4 GB rows, doublewrite, hang fixes
dict0mem.h	< 4 GB rows, doublewrite, hang fixes
fil0fil.h	< 4 GB rows, doublewrite, hang fixes
fsp0fsp.h	< 4 GB rows, doublewrite, hang fixes
os0file.h	< 4 GB rows, doublewrite, hang fixes


innobase/include/btr0btr.h:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/btr0cur.h:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/buf0buf.h:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/buf0flu.h:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/data0data.h:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/dict0mem.h:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/fil0fil.h:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/fsp0fsp.h:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/os0file.h:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/rem0cmp.h:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/rem0rec.h:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/row0ins.h:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/row0mysql.h:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/row0row.h:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/row0upd.h:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/sync0sync.h:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/trx0rec.h:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/trx0sys.h:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/trx0types.h:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/trx0undo.h:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/ut0dbg.h:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/ut0ut.h:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/data0data.ic:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/mach0data.ic:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/rem0rec.ic:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/row0upd.ic:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/trx0rec.ic:
  < 4 GB rows, doublewrite, hang fixes
innobase/include/univ.i:
  < 4 GB rows, doublewrite, hang fixes
innobase/btr/btr0btr.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/btr/btr0cur.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/buf/buf0buf.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/buf/buf0flu.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/buf/buf0rea.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/data/data0data.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/fil/fil0fil.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/fsp/fsp0fsp.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/ibuf/ibuf0ibuf.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/lock/lock0lock.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/log/log0log.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/log/log0recv.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/os/os0file.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/page/page0cur.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/pars/pars0pars.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/rem/rem0cmp.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/rem/rem0rec.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/row/row0ins.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/row/row0mysql.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/row/row0purge.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/row/row0row.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/row/row0sel.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/row/row0uins.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/row/row0umod.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/row/row0undo.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/row/row0upd.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/sync/sync0rw.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/sync/sync0sync.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/trx/trx0purge.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/trx/trx0rec.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/trx/trx0sys.c:
  < 4 GB rows, doublewrite, hang fixes
innobase/srv/srv0srv.c:
  Support raw disk partitions as data files
innobase/srv/srv0start.c:
  Support raw disk partitions as data files
innobase/include/srv0srv.h:
  Support raw disk partitions as data files

c67510f0

new file_id generation method · 39045174

unknown authored Aug 04, 2001


mysql-test/r/rpl_log.result:
  fixed result for new file_id generating method
BitKeeper/etc/ignore:
  Added vio/viotest-ssl to the ignore list
sql/log.cc:
  use a different method to generate unique file_id
sql/log_event.cc:
  new file_id generationg method
sql/sql_class.h:
  new file_id generationg method

39045174

03 Aug, 2001 2 commits

Fixed bad manual merge · ee82985a
unknown authored Aug 04, 2001
```
Docs/manual.texi:
  Fixed bad merge
```
ee82985a

Merge work:/home/bk/mysql-4.0 · 8d89555e

unknown authored Aug 03, 2001

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_load.cc:
  Auto merged

8d89555e