Commit graph

2051 commits

Author SHA1 Message Date
unknown
c9dbb4b726 merged
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/etc/ignore:
  auto-union
acinclude.m4:
  Auto merged
BitKeeper/deleted/.del-rpc_server_ext.h~952741fb85de2b80:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
sql-bench/Makefile.am:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
Docs/manual.texi:
  merge
include/mysql_com.h:
  merge
include/mysqld_error.h:
  merge
mysql-test/install_test_db.sh:
  merge
sql/mysql_priv.h:
  merge
sql/mysqld.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_base.cc:
  merge
sql/sql_table.cc:
  merge
2001-08-11 17:28:41 -06:00
unknown
d7c5327db6 Merge work:/home/bk/mysql-4.0
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
2001-08-11 17:08:21 -06:00
unknown
7a4b7c4fda temp commit working on a merge
client/mysqlbinlog.cc:
  remove unused variables
sql/log_event.h:
  fix bad merge
2001-08-11 17:07:27 -06:00
unknown
23d5f3f965 Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysqlbinlog.cc:
  Auto merged
2001-08-11 15:27:10 -06:00
unknown
f6751dd8db Portability fix for windows
Docs/manual.texi:
  Changelog
2001-08-11 14:10:27 +03:00
unknown
48d48eac0b Merge hundin:/my/mysql into bitch.mysql.fi:/my/mysql
BitKeeper/etc/ignore:
  auto-union
2001-08-11 11:54:23 +03:00
unknown
cc32440ce9 delete generated files
BitKeeper/deleted/.del-rpc_server_ext.h~952741fb85de2b80:
  Delete: bdb/include/rpc_server_ext.h
BitKeeper/deleted/.del-rpc_client_ext.h~85436ca9b5691338:
  Delete: bdb/include/rpc_client_ext.h
BitKeeper/etc/ignore:
  added bdb/include/rpc_client_ext.h
2001-08-11 11:53:50 +03:00
unknown
1e5b7a20fe ignore generated include file
BitKeeper/etc/ignore:
  added include/widec.h
2001-08-11 11:43:45 +03:00
unknown
152de4fee9 Merge hundin:/my/mysql into bitch.mysql.fi:/my/mysql 2001-08-11 11:33:48 +03:00
unknown
cb1c0b0818 Made SIGTERM safer for Solaris
BitKeeper/etc/ignore:
  added */*_pure_*warnings
BUILD/compile-solaris-sparc:
  Optimized build for ultrasparc
sql/mysqld.cc:
  Made SIGTERM safer for Solaris as it sometimes delivered a not catched
  signal during shutdown
2001-08-11 11:24:43 +03:00
unknown
11b0c8322b Changed to use standard 'install' syntax 2001-08-11 02:16:13 +03:00
unknown
49a3cea4e0 Fixed handling of strings in mysqldumpslow
scripts/mysqldumpslow.sh:
  Handling of strings with \ and double ''
sql/mysqlbinlog.cc:
  Fixed type
2001-08-11 01:42:34 +03:00
unknown
46aeed0957 Automerge 2001-08-10 12:48:44 -04:00
unknown
b538ff90da Embedded mysql fixes.
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
2001-08-10 12:37:36 -04:00
unknown
1ddd584a23 Allow myisam-recover="" and --sql-mode=""
Docs/manual.texi:
  Changelog
mysql-test/r/distinct.result:
  new test case
mysql-test/r/innodb.result:
  Fixed result
2001-08-10 19:02:23 +03:00
unknown
73e86d62de merge
BitKeeper/etc/logging_ok:
  auto-union
innobase/buf/buf0flu.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
Docs/manual.texi:
  Will merge later..
2001-08-10 17:47:05 +03:00
unknown
aa3c430675 Portability fixes
Added record_rnd_buffer
Added --safe-user-create
Fix for ALTER TABLE RENAME on windows


Docs/manual.texi:
  Changelog and documentation of new features.
  More information about using threaded client libraries
include/mysql_com.h:
  Added prototype for my_thread_init()
include/mysqld_error.h:
  New error for --safe-create-user
innobase/buf/buf0flu.c:
  Portability fix
innobase/include/univ.i:
  Portability fix
mysql-test/t/distinct.test:
  Test for distinct bug
sql/mysql_priv.h:
  Added record_rnd_buffer
sql/mysqld.cc:
  Added record_rnd_buffer
sql/records.cc:
  Added record_rnd_buffer
sql/share/czech/errmsg.txt:
  New error message for --safe-user-create
sql/share/danish/errmsg.txt:
  New error message for --safe-user-create
sql/share/dutch/errmsg.txt:
  New error message for --safe-user-create
sql/share/english/errmsg.txt:
  New error message for --safe-user-create
sql/share/estonian/errmsg.txt:
  New error message for --safe-user-create
sql/share/french/errmsg.txt:
  New error message for --safe-user-create
sql/share/german/errmsg.txt:
  New error message for --safe-user-create
sql/share/greek/errmsg.txt:
  New error message for --safe-user-create
sql/share/hungarian/errmsg.txt:
  New error message for --safe-user-create
sql/share/italian/errmsg.txt:
  New error message for --safe-user-create
sql/share/japanese/errmsg.txt:
  New error message for --safe-user-create
sql/share/korean/errmsg.txt:
  New error message for --safe-user-create
sql/share/norwegian-ny/errmsg.txt:
  New error message for --safe-user-create
sql/share/norwegian/errmsg.txt:
  New error message for --safe-user-create
sql/share/polish/errmsg.txt:
  New error message for --safe-user-create
sql/share/portuguese/errmsg.txt:
  New error message for --safe-user-create
sql/share/romanian/errmsg.txt:
  New error message for --safe-user-create
sql/share/russian/errmsg.txt:
  New error message for --safe-user-create
sql/share/slovak/errmsg.txt:
  New error message for --safe-user-create
sql/share/spanish/errmsg.txt:
  New error message for --safe-user-create
sql/share/swedish/errmsg.txt:
  New error message for --safe-user-create
sql/sql_acl.cc:
  Checking of privileges for --safe-user-create
sql/sql_acl.h:
  --safe-user-create
sql/sql_base.cc:
  --safe-user-create
sql/sql_parse.cc:
  --safe-user-create
sql/sql_show.cc:
  --safe-user-create
sql/sql_table.cc:
  Fix for ALTER TABLE RENAME on windows
2001-08-10 17:37:37 +03:00
unknown
bffebc8e0b Fixed bug in ALTER TABLE for MERGE tables
Portability fixes
Fixed problem when giving wrong arguments to myisam_recover
Fix to remove warnings when using purify


BUILD/compile-solaris-sparc-purify:
  Added innodb and berkeleydb to test
mysql-test/install_test_db.sh:
  Portability fix.
sql/ha_myisam.cc:
  Fixed problem when giving wrong arguments to myisam_recover
sql/ha_myisammrg.cc:
  Fixed bug in ALTER TABLE for MERGE tables
sql/sql_list.h:
  Fix to remove warnings when using purify
sql/sql_select.cc:
  Fix to remove warnings from purify
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-08-10 17:05:54 +03:00
unknown
c0dbd4d981 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 2001-08-10 12:53:30 +02:00
unknown
0f670051e4 manual.texi PASSWORD() issue clarified
Docs/manual.texi:
  PASSWORD() issue clarified
2001-08-10 12:51:16 +02:00
unknown
16108af1d3 Fixed bug in show variables, it didn't show whether slow-query was
enabled or not.


sql/mysqld.cc:
  Added notification to "show variables" whether slow-query-log is
  enabled or not.
2001-08-10 13:47:27 +03:00
unknown
7f6b82ac0b Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-08-10 12:31:32 +02:00
unknown
d84ef9d949 New dutch error message file.
sql/share/dutch/errmsg.txt:
  New dutch error messages.
2001-08-10 13:01:42 +03:00
unknown
9e3a42fab5 Merge jamppa@work:/home/bk/mysql into hynda.mysql.fi:/data/my/bk/mysql 2001-08-10 12:51:34 +03:00
unknown
e24443b04b changed variable display from string to int (bits) for myisam-recover
and sql-mode options.


sql/mysqld.cc:
  Changed the sql-mode to be shown as a number (bits) instead
  of a string.
2001-08-10 12:40:49 +03:00
unknown
f73b05fff8 Fixed stupid node name in manual.texi.
Docs/manual.texi:
  Fixed stupid node name.
2001-08-10 04:11:34 -05:00
unknown
cd62fdf6d0 DocTOC Chapter 8 Complete! 2001-08-09 23:40:37 -05:00
unknown
7272b45457 Merge jcole@work.mysql.com:/home/bk/mysql
into tetra.spaceapes.com:/home/jcole/bk/mysql
2001-08-09 22:59:46 -05:00
unknown
51bc6118a4 DocTOC Chapter 9 Complete!
(Chapter 8 Skipped, will be next.)
2001-08-09 22:58:45 -05:00
unknown
8af8098de0 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


configure.in:
  Auto merged
2001-08-09 19:21:59 -06:00
unknown
9a6a7bf5f6 merged
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
2001-08-09 19:16:15 -06:00
unknown
ebb3bd0f75 Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-08-09 18:18:35 -06:00
unknown
8ddf0c4414 mysqlbinlog->client
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
2001-08-09 18:16:43 -06:00
unknown
95b28dbbb3 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)
2001-08-10 01:12:42 +03:00
unknown
9d5a520730 acinclude.m4:
Paste the libtool.m4 from libtool version 1.3.4
  into aclinclude.m4; this should make our configure
  work even when the user has libtool version 1.4
  installed.  This should be removed, and everyone
  should upgrade to libtool 1.4; until then, this is
  a quick hack to make things work.


acinclude.m4:
  Paste the libtool.m4 from libtool version 1.3.4
  into aclinclude.m4; this should make our configure
  work even when the user has libtool version 1.4
  installed.  This should be removed, and everyone
  should upgrade to libtool 1.4; until then, this is
  a quick hack to make things work.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-08-10 01:04:43 +03:00
unknown
70e03a2661 Merge work.mysql.com:/home/bk/mysql into work.mysql.com:/home/tim/my/3
BitKeeper/etc/logging_ok:
  auto-union
2001-08-09 21:24:11 +02:00
unknown
eff8ec494f Merge jcole@work.mysql.com:/home/bk/mysql
into tetra.spaceapes.com:/home/jcole/bk/mysql


Docs/manual.texi:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-08-09 13:17:51 -05:00
unknown
a04a6034e3 Fixes to DocTOC Chapter 6. 2001-08-09 13:14:05 -05:00
unknown
75ca573a52 DocTOC Chapter 6 Complete! 2001-08-09 13:08:06 -05:00
unknown
5c3764b5ab ha_innobase.h Fix Sort aborted bug
sql/ha_innobase.h:
  Fix Sort aborted bug
2001-08-09 20:42:32 +03:00
unknown
5ea83eed34 btr0cur.c Improve range size estimate for big ranges
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
2001-08-09 20:41:20 +03:00
unknown
799bf1cdb6 logging_ok Logging to logging@openlogging.org accepted
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
2001-08-09 19:10:24 +02:00
unknown
83fbd8d8db Merge jamppa@work:/home/bk/mysql into hynda.mysql.fi:/data/my/bk/mysql
Docs/manual.texi:
  Auto merged
2001-08-09 18:52:47 +03:00
unknown
b95d4398ff Added new optino --sql-mode to mysqld.
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
2001-08-09 18:51:38 +03:00
unknown
f8f08143c3 fixed some spacing and tag nesting problems in manual.texi
Docs/manual.texi:
  fixed some spacing and tag nesting problems
2001-08-09 01:34:11 -05:00
unknown
ea4a4de32f 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
2001-08-09 06:07:19 +08:00
unknown
40f6a1d693 row0upd.c Fix a memory overwrite which can happen if we update or delete a > 8000-byte row
innobase/row/row0upd.c:
  Fix a memory overwrite which can happen if we update or delete a > 8000-byte row
2001-08-08 22:31:44 +03:00
unknown
a9a445437a trx0purge.c Fix a bug which might stop purge from running
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
2001-08-08 21:35:43 +03:00
unknown
9e4545b791 Merge jcole@work.mysql.com:/home/bk/mysql
into tetra.spaceapes.com:/home/jcole/bk/mysql


Docs/manual.texi:
  Auto merged
2001-08-08 13:09:26 -05:00
unknown
064f6989e1 Merge work.mysql.com:/home/bk/mysql
into x153.internalnet:/home/tonu/mysql


Docs/manual.texi:
  Auto merged
2001-08-09 02:09:25 +08:00