Commits · 8b02ffbaf18cd7dc0dcd01571339922feaea89c9 · Kirill Smelkov / mariadb

20 May, 2001 3 commits

.del-violite.c~984c09cffe14a11b Delete: libmysql/violite.c · 8b02ffba

unknown authored May 20, 2001

acconfig.h	openssl support
acinclude.m4	openssl support


acinclude.m4:
  openssl support
acconfig.h:
  openssl support
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Delete: libmysql/violite.c
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

8b02ffba

viotcpip.c BitKeeper file /home/tonu/bk/mysql-4.0/vio/viotcpip.c · f70e8a23

unknown authored May 20, 2001

viosslfactories.c BitKeeper file /home/tonu/bk/mysql-4.0/vio/viosslfactories.c
viossl.c BitKeeper file /home/tonu/bk/mysql-4.0/vio/viossl.c
vio.c BitKeeper file /home/tonu/bk/mysql-4.0/vio/vio.c

f70e8a23

.del-vio-global.h~c261412c01b2f4 Delete: vio/vio-global.h · 0fc76938

unknown authored May 20, 2001

.del-viotypes.h~f5a38e7326bd50f3	Delete: vio/viotypes.h
.del-violite.h~58d2942a52ea7a83	Delete: vio/violite.h
.del-VioSSLFactoriesFd.h~1d63ae149a63f85	Delete: vio/VioSSLFactoriesFd.h
.del-VioPipe.cc~12cf83b9a2f48f6c	Delete: vio/VioPipe.cc
.del-VioSSLAcceptorFd.cc~4c828f3688ed74ec	Delete: vio/VioSSLAcceptorFd.cc
.del-VioSSL.cc~6e85340b11fa42a8	Delete: vio/VioSSL.cc
.del-VioSSLFactoriesFd.cc~89f6bf5073937947	Delete: vio/VioSSLFactoriesFd.cc
.del-vioelitexx.cc~3eaba70da792a7fc	Delete: vio/vioelitexx.cc
.del-version.cc~7237acf12bed4a97	Delete: vio/version.cc
.del-VioSocket.cc~71c615783f29b5e1	Delete: vio/VioSocket.cc
.del-VioSSL.h~70d367b7ec8cac3e	Delete: vio/VioSSL.h
.del-VioPipe.h~21cebbe61a1da546	Delete: vio/VioPipe.h
.del-VioFd.h~8294293a88c7b4b8	Delete: vio/VioFd.h
.del-VioFd.cc~6e444647affef63b	Delete: vio/VioFd.cc
.del-VioConnectorFd.h~58bc11cdc885b951	Delete: vio/VioConnectorFd.h
.del-VioAcceptorFd.cc~a5a08947a31f88de	Delete: vio/VioAcceptorFd.cc
.del-VioConnectorFd.cc~ddbd7821c43c83a2	Delete: vio/VioConnectorFd.cc
.del-VioAcceptorFd.h~7f9c4358477ba9a3	Delete: vio/VioAcceptorFd.h
.del-Vio.cc~60737ce02ab2bc25	Delete: vio/Vio.cc
.del-Vio.h~f4416b2949647602	Delete: vio/Vio.h
.del-VioSocket.h~a26d535bd5a1a6	Delete: vio/VioSocket.h


BitKeeper/deleted/.del-VioSocket.h~a26d535bd5a1a6:
  Delete: vio/VioSocket.h
BitKeeper/deleted/.del-Vio.cc~60737ce02ab2bc25:
  Delete: vio/Vio.cc
BitKeeper/deleted/.del-Vio.h~f4416b2949647602:
  Delete: vio/Vio.h
BitKeeper/deleted/.del-VioAcceptorFd.cc~a5a08947a31f88de:
  Delete: vio/VioAcceptorFd.cc
BitKeeper/deleted/.del-VioAcceptorFd.h~7f9c4358477ba9a3:
  Delete: vio/VioAcceptorFd.h
BitKeeper/deleted/.del-VioConnectorFd.cc~ddbd7821c43c83a2:
  Delete: vio/VioConnectorFd.cc
BitKeeper/deleted/.del-VioConnectorFd.h~58bc11cdc885b951:
  Delete: vio/VioConnectorFd.h
BitKeeper/deleted/.del-VioFd.cc~6e444647affef63b:
  Delete: vio/VioFd.cc
BitKeeper/deleted/.del-VioFd.h~8294293a88c7b4b8:
  Delete: vio/VioFd.h
BitKeeper/deleted/.del-VioPipe.h~21cebbe61a1da546:
  Delete: vio/VioPipe.h
BitKeeper/deleted/.del-VioSSL.h~70d367b7ec8cac3e:
  Delete: vio/VioSSL.h
BitKeeper/deleted/.del-VioSSLFactoriesFd.cc~89f6bf5073937947:
  Delete: vio/VioSSLFactoriesFd.cc
BitKeeper/deleted/.del-VioSocket.cc~71c615783f29b5e1:
  Delete: vio/VioSocket.cc
BitKeeper/deleted/.del-version.cc~7237acf12bed4a97:
  Delete: vio/version.cc
BitKeeper/deleted/.del-vioelitexx.cc~3eaba70da792a7fc:
  Delete: vio/vioelitexx.cc
BitKeeper/deleted/.del-VioPipe.cc~12cf83b9a2f48f6c:
  Delete: vio/VioPipe.cc
BitKeeper/deleted/.del-VioSSL.cc~6e85340b11fa42a8:
  Delete: vio/VioSSL.cc
BitKeeper/deleted/.del-VioSSLAcceptorFd.cc~4c828f3688ed74ec:
  Delete: vio/VioSSLAcceptorFd.cc
BitKeeper/deleted/.del-VioSSLFactoriesFd.h~1d63ae149a63f85:
  Delete: vio/VioSSLFactoriesFd.h
BitKeeper/deleted/.del-vio-global.h~c261412c01b2f4:
  Delete: vio/vio-global.h
BitKeeper/deleted/.del-violite.h~58d2942a52ea7a83:
  Delete: vio/violite.h
BitKeeper/deleted/.del-viotypes.h~f5a38e7326bd50f3:
  Delete: vio/viotypes.h
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

0fc76938

15 May, 2001 2 commits

Merge · 83e3058c

unknown authored May 15, 2001


Docs/manual.texi:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  SCCS merged

83e3058c

Merge work:/home/bk/mysql-4.0 into donna.mysql.fi:/home/my/bk/mysql-4.0 · fe983ca7
unknown authored May 15, 2001

fe983ca7

13 May, 2001 2 commits

mysql-test/mysql-test-run.sh · e3201ef2
unknown authored May 12, 2001
```
    fixed typo


mysql-test/mysql-test-run.sh:
  fixed typo
```
e3201ef2

option to free_root() to not my_free() the blocks · b7b7eb9c

unknown authored May 12, 2001

fixed bug/updated count_distinct2 test
changed reset in count distinct to avoid calls to my_free()


include/my_sys.h:
  option to free_root() not to do my_free()
include/my_tree.h:
  reset_tree()
mysql-test/r/count_distinct2.result:
  added group by test
mysql-test/t/count_distinct2.test:
  group by test + fixed bug - need to drop table
mysys/my_alloc.c:
  mark_blocks_free()
mysys/tree.c:
  reset_tree()
sql/item_sum.cc:
  in count distinct reset_tree instead of delete_tree

b7b7eb9c

12 May, 2001 3 commits

fixes/optimizations for count(distinct) · 64984296

unknown authored May 12, 2001

more extensive testing of count(distinct)


sql/item_sum.cc:
  fixes/optimizations for count(distinct)

64984296

Merge work:/home/bk/mysql-4.0 into donna.mysql.fi:/home/my/bk/mysql-4.0 · a51554b9
unknown authored May 12, 2001
```
sql/sql_select.cc:
  Auto merged
```
a51554b9

Only mark MERGE readonly if all tables are readonly · e5f9ca3d

unknown authored May 12, 2001

Optimize some queries when using LIMIT


merge/open.c:
  Only mark MERGE readonly if all tables are readonly
myisammrg/myrg_open.c:
  Only mark MERGE readonly if all tables are readonly
sql/sql_select.cc:
  Optimize some queries when using LIMIT

e5f9ca3d

11 May, 2001 3 commits

use tree for count(distinct) when possible · 1d56c032

unknown authored May 11, 2001


include/my_tree.h:
  fixed typo in comment
mysys/tree.c:
  fixed typo in comment
sql/item_sum.h:
  use tree for count distinct when possible

1d56c032

ALTER TABLE ... DISABLE KEYS / ALTER TABLE ... ENABLE KEYS · 5e52875b
unknown authored May 11, 2001

5e52875b

change tree to use qsort_cmp2 - compare function with 3 instead of 2 arguments · 89d6e639

unknown authored May 10, 2001


include/global.h:
  qsort_cmp2
include/my_tree.h:
  use qsort_cmp2
myisam/ft_boolean_search.c:
  use qsort_cmp2
myisam/ft_nlq_search.c:
  use qsort_cmp2
myisam/ft_parser.c:
  use qsort_cmp2
myisam/ft_stopwords.c:
  use qsort_cmp2
myisam/myisampack.c:
  use qsort_cmp2
mysys/tree.c:
  use qsort_cmp2
sql/sql_analyse.cc:
  use qsort_cmp2
sql/sql_analyse.h:
  use qsort_cmp2

89d6e639

10 May, 2001 5 commits

fixes after merge. Now it compiles and passes the test suite · 174fdf05

unknown authored May 10, 2001


Docs/manual.texi:
  fixed bug from merge
sql/sql_delete.cc:
  examined rows fix
sql/sql_select.cc:
  fix bugs from merge
sql/sql_update.cc:
  examined rows merge completion
sql/sql_yacc.yy:
  fixed bugs from merge

174fdf05

Merged with 3.23, needs further fix-up · 9192600e

unknown authored May 10, 2001


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
include/myisam.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7:
  Auto merged
BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439:
  Auto merged
client/mysqltest.c:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
Docs/manual.texi:
  merged
client/errmsg.c:
  merged
configure.in:
  merged
sql/mysqld.cc:
  merged
sql/sql_select.cc:
  merged, needs manual fixing
sql/sql_yacc.yy:
  merged, needs manual fixing

9192600e

sql/mysqld.cc · b59b5f4b

unknown authored May 09, 2001

    put back the things that the merge removed


sql/mysqld.cc:
  put back the things that the merge removed

b59b5f4b

merged · a4a4a1c2
unknown authored May 09, 2001
```
sql/mysqld.cc:
  merged - need to fix
```
a4a4a1c2

stack trace updates: · 68ebea2d

unknown authored May 09, 2001

limited support on Alpha - in general case, even with frame pointer,
stack trace on alpha is impossible without looking at the symbol table
frame pointer does get saved on the stack, but you have no idea where
and where the return address is saved. So the best we can do without
the symbol table is look for magic opcodes and try to guess how big 
each frame is and where the return address was hidden from the 
instruction parameters. In practice, we can usually go up 3-4 frames 
before we hit some nasty frame that the current code cannot figure
out. This is actually not too bad, especially when we already have the query

Also cleaned up messages, print more variables, tell the user of
how much memory mysqld could potentially use, and warn of
what can happen with default STACK_SIZE and a lot of connections if
coredump happens when there are more than 200 connections. 


sql/mysqld.cc:
  stack trace updates

68ebea2d

09 May, 2001 4 commits

Merge heikki@work.mysql.com:/home/my/mysql · f15a46eb
unknown authored May 09, 2001
```
into donna.mysql.fi:/home/heikki/mysqle
```
f15a46eb
row0sel.c Fix a bug in consistent read through secondary key · 50d5bb5b
unknown authored May 09, 2001
```
innobase/row/row0sel.c:
  Fix a bug in consistent read through secondary key
```
50d5bb5b
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql · c6d9cbfa
unknown authored May 09, 2001
```
Docs/manual.texi:
  Auto merged
```
c6d9cbfa

Applied patches for BDB tables · 0fece375

unknown authored May 09, 2001

Fixes to InnoDB to compile on Windows
Fix for temporary InnoDB tables
Fixed bug in REPLACE()
Fixed sub char keys for InnoDB


Docs/manual.texi:
  Changelog + update of table types
bdb/include/log.h:
  Patch from Sleepycat
bdb/log/log.c:
  Patch from Sleepycat
bdb/log/log_rec.c:
  Patch from Sleepycat
client/mysqladmin.c:
  Cleanup
innobase/include/univ.i:
  Fix for compilation on Windows
innobase/os/os0file.c:
  cleanup
innobase/pars/pars0grm.y:
  Fix for compilation on Windows
mysql-test/r/innodb.result:
  New test case
mysql-test/t/innodb.test:
  New test case
sql/ha_innobase.cc:
  cleanup
sql/ha_innobase.h:
  Fix for prefix keys
sql/handler.h:
  Fix for temporary Innodb tables
sql/item_strfunc.cc:
  Fixed bug in REPLACE()
sql/lock.cc:
  Fix for temporary Innodb tables
sql/mysqld.cc:
  Added --skip-stack-trace
sql/share/english/errmsg.txt:
  Better error messages
sql/sql_base.cc:
  Fix for temporary Innodb tables
sql/sql_select.cc:
  Fix for temporary Innodb tables
sql/sql_table.cc:
  Fixed sub char keys for InnoDB
sql/table.h:
  Fix for temporary Innodb tables

0fece375

07 May, 2001 1 commit

Docs/manual.texi · f1eb3ce3

unknown authored May 07, 2001

    removed porn site



Docs/manual.texi:
  removed porn site

f1eb3ce3

05 May, 2001 2 commits

Merge · 2321260f

unknown authored May 05, 2001


sql/sql_yacc.yy:
  Auto merged
Docs/manual.texi:
  SCCS merged

2321260f

Added LOAD DATA CONCURRENT · 62bff11c

unknown authored May 05, 2001


Docs/manual.texi:
  Update information about REPAIR and optimize
scripts/mysqlhotcopy.sh:
  Changed Alpha -> Beta
sql/sql_yacc.yy:
  A

62bff11c

04 May, 2001 2 commits

manual.texi Fixed a typo in InnoDB record size · f8241523
unknown authored May 04, 2001
```
Docs/manual.texi:
  Fixed a typo in InnoDB record size
```
f8241523

Docs/manual.texi · 4b9ade89

unknown authored May 03, 2001

added reference to htCheck, and removed some broken links (incidentally, found by htCheck)

Docs/manual.texi:
added reference to htCheck, and removed some broken links (incidentally, found by htCheck)

4b9ade89

03 May, 2001 13 commits

better error message in replication when packet is too large · d6ad4bee

unknown authored May 03, 2001


sql/mini_client.cc:
  pass along ER_NET_PACKET_TOO_LARGE
sql/slave.cc:
  better error message when the packet is too large in slave thread

d6ad4bee

Docs/manual.texi · 9167c803

unknown authored May 03, 2001

    fixed bug
sql/sql_repl.cc
    undid virtual master change



Docs/manual.texi:
  fixed bug
sql/sql_repl.cc:
  undid virtual master change

9167c803

Merge work:/home/bk/mysql · a605a9f0
unknown authored May 03, 2001
```
into mysql.sashanet.com:/home/sasha/src/bk/mysql
```
a605a9f0

reversed virtual master · 70f585cb

unknown authored May 03, 2001


BitKeeper/deleted/.del-binlog-backup-restore.test~d5b0b9bd83738a9f:
  Delete: mysql-test/t/binlog-backup-restore.test
BitKeeper/deleted/.del-binlog-backup-restore.result~605de78abda64d27:
  Delete: mysql-test/r/binlog-backup-restore.result

70f585cb

row0umod.c Partial fix to concurrent drop table and rollback by other user of rows in that table · 045de0a5

unknown authored May 03, 2001

row0uins.c Partial fix to concurrent drop table and rollback by other user of rows in that table

innobase/row/row0uins.c:
Partial fix to concurrent drop table and rollback by other user of rows in that table
innobase/row/row0umod.c:
Partial fix to concurrent drop table and rollback by other user of rows in that table

045de0a5

univ.i Do not inline on Unix if non-gcc compiler · eef01ff2
unknown authored May 03, 2001
```
innobase/include/univ.i:
  Do not inline on Unix if non-gcc compiler
```
eef01ff2
manual.texi Update MySQL manual about the syntax change to ...LOCK IN SHARE MODE · 1a40dcc8
unknown authored May 03, 2001
```
Docs/manual.texi:
  Update MySQL manual about the syntax change to ...LOCK IN SHARE MODE
```
1a40dcc8

sql_yacc.yy changed ...IN SHARE MODE to ...LOCK IN SHARE MODE to resolve a... · 5461e671

unknown authored May 03, 2001

sql_yacc.yy changed ...IN SHARE MODE to ...LOCK IN SHARE MODE to resolve a parsing bug after a WHERE clause

sql/sql_yacc.yy:
changed ...IN SHARE MODE to ...LOCK IN SHARE MODE to resolve a parsing bug after a WHERE clause

5461e671

os0file.c Removed extraneous undef and inclde of aio.h, fixed typecasts to off_t · 491c2cbc

unknown authored May 03, 2001

os0file.c	Removed unnecessary code from os_file_read


innobase/os/os0file.c:
  Removed extraneous undef and inclde of aio.h, fixed typecasts to off_t

491c2cbc

Merge jcole@work.mysql.com:/home/bk/mysql · 43ea79bd
unknown authored May 03, 2001
```
into tetra.spaceapes.com:/usr/home/jcole/bk/mysql


Docs/manual.texi:
  Auto merged
```
43ea79bd
Fixed example that was wrong in manual. · 876707b2
unknown authored May 03, 2001
```
Docs/manual.texi:
  Fixed example that was wrong.
```
876707b2
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql · 203c3eeb
unknown authored May 03, 2001
```
Docs/manual.texi:
  Auto merged
```
203c3eeb
Fixed bug from last commit · 0f716142
unknown authored May 03, 2001
```
Docs/manual.texi:
  Changelog
```
0f716142