Commits · b4a417109c16fcb15c2ad050ba156f1bdf099e5e · nexedi / MariaDB

02 Sep, 2001 9 commits

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 · b4a41710
unknown authored Sep 02, 2001
```
configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
```
b4a41710

merge · bbf28118

unknown authored Sep 02, 2001


configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
myisam/mi_create.c:
  Auto merged

bbf28118

Fix to not running mysqld as root by default · 76ec780f

unknown authored Sep 02, 2001


Docs/manual.texi:
  Small changes for INNER JOIN
configure.in:
  Use 'mysql' as the default MySQL user
myisam/mi_create.c:
  Test for right create information

76ec780f

merge · 3719b873

unknown authored Sep 02, 2001


configure.in:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

3719b873

merge with 3.23.42 · ddee00a6

unknown authored Sep 02, 2001


config.guess:
  Auto merged
config.sub:
  Auto merged
ltconfig:
  Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
client/Makefile.am:
  Auto merged
include/errmsg.h:
  Auto merged
include/global.h:
  Auto merged
include/heap.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
isam/isamlog.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
merge/open.c:
  Auto merged
myisam/ft_search.c:
  Auto merged
myisam/ftdefs.h:
  Auto merged
myisam/mi_test_all.sh:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamlog.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
myisam/sort.c:
  Auto merged
myisammrg/myrg_open.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/mf_casecnv.c:
  Auto merged
mysys/mf_format.c:
  Auto merged
mysys/my_lib.c:
  Auto merged
mysys/tree.c:
  Auto merged
sql-bench/bench-init.pl.sh:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
mysql-test/t/err000001.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/overflow.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
strings/ctype.c:
  Auto merged
Docs/manual.texi:
  Change to 3.23 manual.
  (I will later add the changes for 4.0 to this copy)
client/mysql.cc:
  merge
client/mysqlbinlog.cc:
  merge
client/mysqldump.c:
  merge
client/mysqltest.c:
  merge
client/thread_test.c:
  merge
configure.in:
  merge
include/my_pthread.h:
  merge
include/mysqld_error.h:
  merge
libmysql/net.c:
  merge
myisam/mi_cache.c:
  merge
myisam/mi_check.c:
  merge
mysql-test/t/fulltext.test:
  merge
mysys/mf_qsort.c:
  merge
sql/lock.cc:
  merge
sql/md5.c:
  merge
sql/mini_client.cc:
  merge
sql/share/czech/errmsg.txt:
  merge
sql/share/danish/errmsg.txt:
  merge
sql/share/dutch/errmsg.txt:
  merge
sql/share/english/errmsg.txt:
  merge
sql/share/estonian/errmsg.txt:
  merge
sql/share/french/errmsg.txt:
  merge
sql/share/german/errmsg.txt:
  merge
sql/share/greek/errmsg.txt:
  merge
sql/share/hungarian/errmsg.txt:
  merge
sql/share/italian/errmsg.txt:
  merge
sql/share/japanese/errmsg.txt:
  merge
sql/share/korean/errmsg.txt:
  merge
sql/share/norwegian-ny/errmsg.txt:
  merge
sql/share/norwegian/errmsg.txt:
  merge
sql/share/polish/errmsg.txt:
  merge
sql/share/portuguese/errmsg.txt:
  merge
sql/share/romanian/errmsg.txt:
  merge
sql/share/russian/errmsg.txt:
  merge
sql/share/slovak/errmsg.txt:
  merge
sql/share/spanish/errmsg.txt:
  merge
sql/share/swedish/errmsg.txt:
  merge
sql/sql_load.cc:
  merge
sql/sql_repl.cc:
  merge

ddee00a6

Small changes in benchmark suite · 1e97b27e

unknown authored Sep 02, 2001


sql-bench/test-insert.sh:
  Change IN() test to use LEFT JOIN to be comparable to IN()

1e97b27e

Added testing of IN(value-list) · 992e7da0

unknown authored Sep 02, 2001

Portability fixes


Build-tools/Do-compile:
  Fix for Linux ia64
sql-bench/bench-init.pl.sh:
  Added help function time_fetch_all_rows
sql-bench/test-insert.sh:
  Added testing of IN(value-list)
sql/item_func.cc:
  Cleanup
sql/mysqld.cc:
  Portability fix
sql/stacktrace.c:
  Portability fix

992e7da0

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 · fa7b17e9
unknown authored Sep 02, 2001
```
sql/sql_yacc.yy:
  Auto merged
```
fa7b17e9

Changed DB_TYPE_INNOBASE to DB_TYPE_INNODB · b67d11e1

unknown authored Sep 02, 2001

Fix that DROP DATABASE works with all table types
Use BULK_INSERT when inserting more than one row
Better TRUNCATE TABLE


BitKeeper/deleted/.del-compilation_finished.au.gz~70bd14095a918139:
  Delete: sounds/compilation_finished.au.gz
BUILD/FINISH.sh:
  Removed 'finished' sound as this isn't a general solution.
Docs/manual.texi:
  Added upgrading from 3.23
configure.in:
  Fixed version number
sql/ha_innobase.cc:
  Default creation of InnoDB tables.
sql/ha_myisam.cc:
  Disable BULK_INSERT of using safe mode
sql/handler.cc:
  Changed DB_TYPE_INNOBASE to DB_TYPE_INNODB
sql/handler.h:
  Changed DB_TYPE_INNOBASE to DB_TYPE_INNODB
sql/lock.cc:
  Added lock_and_wait_for_table_name
sql/mysql_priv.h:
  Better TRUNCATE TABLE
sql/sql_db.cc:
  Fix that DROP DATABASE works with all table types
sql/sql_delete.cc:
  Better TRUNCATE TABLE
sql/sql_insert.cc:
  Use BULK_INSERT when inserting more than one row
sql/sql_load.cc:
  Small bug fix.
sql/sql_parse.cc:
  Better TRUNCATE TABLE
sql/sql_select.cc:
  Change INNOBASE -> INNODB
sql/sql_table.cc:
  Better TRUNCATE TABLE
sql/sql_yacc.yy:
  INNOBASE -> INNODB
sql/thr_malloc.cc:
  Fix for replication

b67d11e1

01 Sep, 2001 4 commits
- Fixed compilation problems when HAVE_OPENSSL is not defined · 3c951b6d
  unknown authored Sep 01, 2001
  
  3c951b6d
- SSL parser change · 39fdbbbb
  unknown authored Sep 01, 2001
  
  39fdbbbb
- Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql · 62c3fe9b
  unknown authored Sep 01, 2001
```
sql/item_func.cc:
  Auto merged
```
  62c3fe9b
- Make killing of threads safer · 9591abbd
  unknown authored Sep 01, 2001
```
Docs/manual.texi:
  Changelog
sql/sql_insert.cc:
  Fix problem with INSERT DELAYED during shutdown
```
  9591abbd
31 Aug, 2001 15 commits

Yet another SSL fixes · 8c03a589

unknown authored Sep 01, 2001


mysql-test/t/openssl_1.test:
  SSL fix
mysql-test/t/openssl_2.test:
  SSL fix
sql/mysqld.cc:
  C

8c03a589

OpenSSL fixes · bf10717a
unknown authored Sep 01, 2001
```
SSL/NOTES:
  Comments added
```
bf10717a
Merge work:/home/bk/mysql · aaedaa0b
unknown authored Aug 31, 2001
```
into mysql.sashanet.com:/home/sasha/src/bk/mysql
```
aaedaa0b

replicated get_lock() properly · 09c35c69

unknown authored Aug 31, 2001


sql/item_func.cc:
  log all lock releases to binary log for safe handling of get_lock()
  in updates

09c35c69

DH stuff added to OpenSSL · 3e899543
unknown authored Sep 01, 2001

3e899543
SSL fixes · 07daa973
unknown authored Sep 01, 2001

07daa973
OpenSSL tests added · 88cfe762
unknown authored Sep 01, 2001

88cfe762
SSL fixes · 5fb52a19
unknown authored Sep 01, 2001

5fb52a19

configure.in · d8f7e2a8

unknown authored Aug 31, 2001

        Add #undef inline to all C++ tests.
        This is needed to work with some C++ compilers....


configure.in:
  Add #undef inline to all C++ tests.
  This is needed to work with some C++ compilers....

d8f7e2a8

Fixed problem with INSERT DELAYED · 42959176

unknown authored Aug 31, 2001

Make killing threads safer


Docs/manual.texi:
  Portability fix
mysys/thr_lock.c:
  Fixed problem with INSERT DELAYED
sql/mysqld.cc:
  Make shutdown safer
sql/sql_class.cc:
  Make kill thread safer
sql/sql_insert.cc:
  Make kill thread safer

42959176

OpenSSL testing added · a485f382
unknown authored Sep 01, 2001

a485f382

ha_innobase.cc Add better error message if innodb_data_file_path is not set · e19a292c

unknown authored Aug 31, 2001

ha_innobase.h	Remove HA_NOT_READ_AFTER_KEY from table han
ha_innobase.h	dler flags: it prevented the use of an index in MAX()


sql/ha_innobase.h:
  Remove HA_NOT_READ_AFTER_KEY from table han
  dler flags: it prevented the use of an index in MAX()
sql/ha_innobase.cc:
  Add better error message if innodb_data_file_path is not set

e19a292c

SSL stuff fix · 7a593259
unknown authored Aug 31, 2001
```
sql/sql_acl.cc:
  SSL stuff
```
7a593259

ix compilition for computer in a previous timezone · 421e64ae

unknown authored Aug 31, 2001


Build-tools/Do-compile:
  Fix compilition for computer in a previous timezone
sql/net_serv.cc:
  Added comment
sql/sql_parse.cc:
  Cleanup

421e64ae

Portability fixes · 308839fe
unknown authored Aug 31, 2001

308839fe

30 Aug, 2001 11 commits
- Make things compile with ssl · fc140664
  unknown authored Aug 31, 2001
  
  fc140664
- Portability fixes · 83c86c85
  unknown authored Aug 30, 2001
```
Docs/manual.texi:
  Changelog
client/mysqlbinlog.cc:
  Portability fix
myisam/ft_test1.c:
  Portability fix
sql/log_event.cc:
  Portability fix
```
  83c86c85
- Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql · 634378a5
  unknown authored Aug 30, 2001
```
configure.in:
  Auto merged
```
  634378a5
- Increase version number · 18cd5fe5
  unknown authored Aug 30, 2001
```
sql/ha_myisam.cc:
  Added comments
```
  18cd5fe5
- Merge work.mysql.com:/home/bk/mysql into white.box:/home/tim/my/3 · e6a8e97c
  unknown authored Aug 30, 2001
  
  e6a8e97c
- Fixed problem in myisampack with blobs · 16a25020
  unknown authored Aug 30, 2001
```
myisam/myisamchk.c:
  Fixes bug when not using --set-character-set
myisam/myisampack.c:
  Fixed problem with blobs
```
  16a25020
- Portability fix · a0549694
  unknown authored Aug 30, 2001
  
  a0549694
- Fix problem with comments/blank lines in MERGE files. · 0fbb50b5
  unknown authored Aug 30, 2001
```
Docs/manual.texi:
  Changelog
```
  0fbb50b5
- Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql · 9001f351
  unknown authored Aug 30, 2001
  
  9001f351
- Portability fixes · d66c0987
  unknown authored Aug 30, 2001
```
dbug/dbug.c:
  Portability fix
include/heap.h:
  Portability fix
strings/conf_to_src.c:
  Portability fix
```
  d66c0987
- manual.texi minor change log fixes · 2fb15239
  unknown authored Aug 29, 2001
```
manual.texi	fix age calculations in the tutorial section to
manual.texi	determine age in integer years and to account for
manual.texi	relative order of dates within calendar year.


Docs/manual.texi:
  minor change log fixes
```
  2fb15239
29 Aug, 2001 1 commit

fixed coredump, and changed mngd->manager · 7d6644ad

unknown authored Aug 29, 2001


sql/sql_acl.cc:
  fixed coredump when running without SSL
tools/Makefile.am:
  mysqlmngd -> mysqlmanager
tools/mysqlmanager.c:
  mngd->manager
BitKeeper/etc/ignore:
  Added tools/mysqlmanager to the ignore list

7d6644ad