Commits · 128d1bad54c440c735a01b85ae48a7a59773ccf9 · nexedi / MariaDB

17 Sep, 2001 14 commits

Merge work:/home/bk/mysql-4.0 · 128d1bad

unknown authored Sep 18, 2001

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


myisam/mi_write.c:
  Auto merged

128d1bad

merge · d8ae9669

unknown authored Sep 17, 2001


Docs/manual.texi:
  Auto merged
extra/perror.c:
  Auto merged
include/my_base.h:
  Auto merged
include/mysql.h:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
client/mysqltest.c:
  Auto merged

d8ae9669

Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql · 9d62e4a0
unknown authored Sep 17, 2001

9d62e4a0

Added unique error for DEADLOCK · ffe99461

unknown authored Sep 17, 2001

Include missing man pages into binary distribution


BitKeeper/deleted/.del-make_mysql_pkg.sh~c616a18bed4b9c2:
  Delete: support-files/make_mysql_pkg.sh
Docs/manual.texi:
  Changelog
extra/perror.c:
  Added missing error codes
include/my_base.h:
  Added unique error for DEADLOCK
include/mysql.h:
  Portability fix for the LCC windows compiler
include/mysqld_error.h:
  Added unique error for DEADLOCK
scripts/make_binary_distribution.sh:
  Include missing man pages into binary distribution
sql/ha_berkeley.cc:
  Added unique error for DEADLOCK
sql/ha_berkeley.h:
  Added unique error for DEADLOCK
sql/handler.h:
  Added unique error for DEADLOCK
sql/mysqld.cc:
  Portability fix
sql/share/czech/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/danish/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/dutch/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/english/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/estonian/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/french/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/german/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/greek/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/hungarian/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/italian/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/japanese/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/korean/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/norwegian-ny/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/norwegian/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/polish/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/portuguese/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/romanian/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/russian/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/slovak/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/spanish/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/swedish/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/ukrainian/errmsg.txt:
  Added unique error for DEADLOCK

ffe99461

Fix to get all files into the distribution · 9f939ecc
unknown authored Sep 17, 2001

9f939ecc

Fixed bug in UNION when doing UNION with the same tables · 05821367

unknown authored Sep 17, 2001


myisam/mi_extra.c:
  More debugging information
mysql-test/r/union.result:
  Added test for UNION bug
mysql-test/t/union.test:
  Added test for UNION bug
sql/sql_base.cc:
  Clear field->query_id when using UNION
sql/sql_parse.cc:
  Fix for UNION bug
sql/sql_union.cc:
  Cleanup
sql/table.h:
  Fix for UNION bug
tools/Makefile.am:
  Fix for compiling with MIT-threads

05821367

log0log.c Eliminate a Purify warning · 79ce69d7

unknown authored Sep 17, 2001

buf0buf.c	Fix uninitilaized flush field noticed with Purify


innobase/buf/buf0buf.c:
  Fix uninitilaized flush field noticed with Purify
innobase/log/log0log.c:
  Eliminate a Purify warning

79ce69d7

Fixed locking problem when using bulk insert · 28097f40

unknown authored Sep 17, 2001

Fixed array overrun when using drop_db
Portability fixes


BitKeeper/etc/ignore:
  Added libmysqld/examples/completion_hash.cc libmysqld/examples/completion_hash.h libmysqld/examples/my_readline.h libmysqld/examples/mysql.cc libmysqld/examples/mysqltest.c libmysqld/examples/readline.cc libmysqld/examples/sql_string.cc libmysqld/examples/sql_string.h to the ignore list
acinclude.m4:
  Fixed reference to top_builddir
myisam/mi_write.c:
  Fixed locking problem when using bulk insert
sql/sql_db.cc:
  Fixed array overrun when using drop_db

28097f40

Fixed bug with SELECT * ... UNION · 3324d0a7

unknown authored Sep 17, 2001


client/mysql.cc:
  Increased version number
client/mysqltest.c:
  Changed to use default path
include/mysql.h:
  Changed prototype of mysql_server_init
libmysql/libmysql.c:
  Changed prototype of mysql_server_init
libmysqld/lib_sql.cc:
  Changed prototype of mysql_server_init
mysql-test/r/union.result:
  Added test for UNION bug
mysql-test/t/union.test:
  Added test for UNION bug

3324d0a7

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 · b69a91cc
unknown authored Sep 17, 2001

b69a91cc
Fixed typo in makefile · 7d1d2959
unknown authored Sep 17, 2001
```
tools/Makefile.am:
  Fixed typo
```
7d1d2959

manual.texi: · 0712369b

unknown authored Sep 17, 2001

  Change a mirror contact e-mail


Docs/manual.texi:
  Change a mirror contact e-mail

0712369b

Merge · dd02abb1

unknown authored Sep 16, 2001


BitKeeper/etc/ignore:
  auto-union
configure.in:
  SCCS merged
client/mysql.cc:
  SCCS merged
client/mysqltest.c:
  SCCS merged
mysql-test/mysql-test-run.sh:
  Auto merged
libmysqld/libmysqld.c:
  SCCS merged

dd02abb1

Add some examples for using libmysqld, including a hack for running the · 5fffbb12

unknown authored Sep 16, 2001

mysql test suite.

A few minor libmysqld fixes.

Add mysql_server_init() and _end() to mysql.cc and mysqltest.c, so they
can be linked against libmysqlclient or libmysqld.


sql/mysqld.cc:
  have unireg_end() exit(), instead of pthread_exit()
  if inside the EMBEDDED_LIBRARY.  This is a hack
  which hopefully won't be needed.  But without it,
  the program hangs at end.
client/mysql.cc:
  Don't call mysql_ssl_clear() unless HAVE_OPENSSL.
client/mysqltest.c:
  Add mysql_server_init() and _end().
acinclude.m4:
  change .. to $(top_builddir) in innodb_libs
Makefile.am:
  Add libmysqld/examples to link_sources target
configure.in:
  output libmysqld/examples/Makefile
  Also, change .. to $(top_builddir) in readline_link
BitKeeper/etc/ignore:
  added linked_libmysqldex_sources
mysql-test/mysql-test-run.sh:
  use latin1, not latin1_de, in tests
libmysqld/libmysqld.c:
  Add replication functions.

5fffbb12

16 Sep, 2001 4 commits

Portability fixes · 5810866b

unknown authored Sep 17, 2001


client/Makefile.am:
  Cleanup
sql/Makefile.am:
  Cleanup
sql/share/dutch/errmsg.txt:
  Added missing error messages
sql/share/ukrainian/errmsg.txt:
  Added missing error messages
sql/sql_handler.cc:
  Portability fix
tools/Makefile.am:
  Portability fix

5810866b

manual.texi: · 482735b5

unknown authored Sep 16, 2001

  Added a mirror in Finland


Docs/manual.texi:
  Added a mirror in Finland

482735b5

manual.texi: · 32456b9e

unknown authored Sep 16, 2001

  Added a mirror in Turkey
turkey.eps, turkey.gif, turkey.txt:
  new file


Docs/manual.texi:
  Added a mirror in Turkey

32456b9e

fixed bug in mysqltest · 3479f428

unknown authored Sep 15, 2001

updated mysql-test-run with features from 4.0
added a test case for broken load data from master for MyISAM tables
with checksum


client/mysqltest.c:
  fixed parser bug
mysql-test/mysql-test-run.sh:
  backported changes from 4.0 ( needed to be able to run client in gdb)
mysql-test/t/rpl000006.test:
  updated test case for a bug

3479f428

15 Sep, 2001 12 commits

flush bulk-insert tree on dup key · e3dee590
unknown authored Sep 15, 2001

e3dee590
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 · b7ae6103
unknown authored Sep 15, 2001
```
BitKeeper/etc/ignore:
  added vio/test-ssl
sql/net_serv.cc:
  Auto merged
```
b7ae6103
Portability fixes · 7dc2f1a6
unknown authored Sep 15, 2001
```
libmysql/libmysql.c:
  Cleanup & portability fixes
```
7dc2f1a6

Merge · 3c360e3e

unknown authored Sep 15, 2001


Docs/manual.texi:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/mysqld.cc:
  merge
sql/net_serv.cc:
  SCCS merged

3c360e3e

Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql · 45ea63fe
unknown authored Sep 15, 2001
```
Docs/manual.texi:
  Auto merged
```
45ea63fe

Fixed bug in --safe-create-user · 1a9bf29e

unknown authored Sep 15, 2001


Docs/manual.texi:
  Changelog
isam/_dbug.c:
  Cleanup
sql/mysqld.cc:
  Cleanup
sql/net_serv.cc:
  Cleanup

1a9bf29e

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

unknown authored Sep 15, 2001

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


Docs/manual.texi:
  Auto merged

e0e42a79

manual.texi outdated line removed · b0528fc4
unknown authored Sep 15, 2001
```
Docs/manual.texi:
  outdated line removed
```
b0528fc4

manual.texi: · c1caa081

unknown authored Sep 15, 2001

  Add a mirror in Philippines
philippines.txt, philippines.gif, philippines.eps:
  new file


Docs/manual.texi:
  Add a mirror in Philippines

c1caa081

manual.texi fix example that uses INDEX() as function (there · 1efe6fe9

unknown authored Sep 14, 2001

manual.texi	is no such function)


Docs/manual.texi:
  fix example that uses INDEX() as function (there
  is no such function)

1efe6fe9

Added my_global.h · ef2e7508
unknown authored Sep 15, 2001
```
BitKeeper/etc/ignore:
  R
```
ef2e7508

Cleanups · 9f6d3894

unknown authored Sep 15, 2001


BitKeeper/etc/ignore:
  added vio/test-ssl
Docs/manual.texi:
  Cleanup
isam/isamchk.c:
  Cleanup
myisam/mi_check.c:
  Cleanup
myisam/myisamchk.c:
  Cleanup
myisam/myisamdef.h:
  Cleanup
sql/log_event.cc:
  Cleanup
sql/mysqld.cc:
  Cleanup

9f6d3894

14 Sep, 2001 10 commits

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 · 6612decf
unknown authored Sep 14, 2001
```
Docs/manual.texi:
  Auto merged
```
6612decf

Fixed bug in UNION · af19fa46

unknown authored Sep 14, 2001

Fixed replication bug in load_master_data


BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Delete: include/global.h
Docs/manual.texi:
  Cleaned up "Things to do in 4.0"
mysql-test/r/union.result:
  New test
mysql-test/t/union.test:
  New test
mysys/my_lib.c:
  Cleanup
sql/mysql_priv.h:
  Fixed replication bug load_master_data
sql/sql_base.cc:
  Fixed bug in UNION
sql/sql_db.cc:
  Fixed replication bug load_master_data
sql/sql_parse.cc:
  Fixed replication bug load_master_data
sql/sql_repl.cc:
  Fixed replication bug load_master_data
sql/sql_union.cc:
  Fixed bug in UNION
tools/mysqlmanager.c:
  Portability fix

af19fa46

manual.texi typo fixes · cf45545f
unknown authored Sep 14, 2001
```
Docs/manual.texi:
  typo fixes
```
cf45545f
Merge work.mysql.com:/home/bk/mysql · 687a1b06
unknown authored Sep 14, 2001
```
into work.mysql.com:/home/bk/mysql-4.0


configure.in:
  Auto merged
```
687a1b06

Merge work.mysql.com:/home/bk/mysql · 09f1278c

unknown authored Sep 14, 2001

into work.mysql.com:/home/bk/mysql-4.0


Docs/manual.texi:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged

09f1278c

Added ukrainian error messages · c97fb8f3
unknown authored Sep 14, 2001

c97fb8f3

Fixed problem with "record not found" in BDB tables. · bd98eb61

unknown authored Sep 14, 2001


Docs/manual.texi:
  Fixed wrong reference to --with-thread-safe-client
mysql-test/r/bdb.result:
  New tests
mysql-test/t/bdb.test:
  New tests

bd98eb61

belgium.txt: · 37604010

unknown authored Sep 14, 2001

  new file
belgium.eps:
  Fix EPS flag image


Docs/Flags/belgium.eps:
  Fix EPS flag image

37604010

Merge tfr@work.mysql.com:/home/bk/mysql-4.0 · 4b73603a
unknown authored Sep 14, 2001
```
into sarvik.tfr.cafe.ee:/usr/home/tfr/BK/mysql-4.0
```
4b73603a
belgium.eps, belgium.gif: · daa673af
unknown authored Sep 14, 2001
```
  new file
```
daa673af