Commit graph

385 commits

Author SHA1 Message Date
unknown
2e0dc69895 merge
BitKeeper/etc/logging_ok:
  auto-union
client/Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
strings/strmake.c:
  Auto merged
mysql-test/t/rpl000017-slave.sh:
  Auto merged
2001-10-02 21:33:47 +02:00
unknown
b00668c59d Added Arjen to doc maintainer list.
Initial cleanup of SSL/X509 explanation.


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-10-02 12:51:12 +10:00
unknown
0000958303 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
2001-09-28 19:49:21 +02:00
unknown
1a57e278c2 merge
BitKeeper/etc/logging_ok:
  auto-union
acinclude.m4:
  Auto merged
mysql-test/r/null_key.result:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/udf_example.cc:
  Auto merged
2001-09-28 06:28:04 +02:00
unknown
6ba992fb5d Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
2001-09-27 22:04:06 +03:00
unknown
e47b763f86 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-09-27 21:35:36 +03:00
unknown
a75a59f083 manual.texi correct date error in manual.
Docs/manual.texi:
  correct date error in manual.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-09-27 12:25:36 -05:00
unknown
eb01c92934 manual cleanups
Docs/manual.texi:
  cleanups
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-09-26 12:56:19 +02:00
unknown
2b8c677a32 Changes on NT service for a more faster stop of the service on Win2k
and free the main thread of the service.


sql/mysqld.cc:
  Time out to permit the clean shutdown of the server
sql/nt_servc.cc:
  Time out and free the main thread of the service.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-09-25 01:13:19 -03:00
unknown
a6397f17f7 SSL parser changes to allow SSL specific GRANT commands
Build-tools/Do-all-build-steps:
  We need to test SSL stuff. Now we do it.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-09-22 22:32:43 +08:00
unknown
abb2aaa279 merged replication fixes from 3.23
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  merged
sql/mini_client.cc:
  merged
sql/mysqld.cc:
  merged
sql/sql_repl.cc:
  merged
2001-08-15 15:57:47 -06:00
unknown
5cc716b159 manual.texi:
Added mirror in Hong Kong


Docs/manual.texi:
  Added mirror in Hong Kong
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-08-15 16:37:54 +02:00
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
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
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
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
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
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
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
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
aee57a52b8 Hong Kong mirrors information updated
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-08-03 02:10:36 +08:00
unknown
55fbccfd81 Merge work.mysql.com:/home/bk/mysql-4.0
into x153.internalnet:/home/tonu/mysql-x


BitKeeper/etc/logging_ok:
  auto-union
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
libmysql/libmysql.c:
  Auto merged
2001-07-24 15:00:36 +08:00
unknown
2ec8dce13d OpenSSL fixes. Should not affect anything else.
Makefile.am:
  Moved bio dir into server_dirs in acinclude.in
client/Makefile.am:
  We need OpenSSL includes here
include/global.h:
  Workaround for OPENSSL librar bug with defining crypt()
include/violite.h:
  small fixes
libmysql/Makefile.am:
  We need OpenSSL includes here
libmysql/Makefile.shared:
  Yes, we need to compile more programs whtn --with-openssl is used
libmysql/libmysql.c:
  Make it work! (openssl)
libmysql_r/Makefile.am:
  We need OpenSSL includes here
sql/mysqld.cc:
  Memory was not freed before
sql/sql_parse.cc:
  fix
vio/Makefile.am:
  Added testprogram compilation and openssl libraries linking
vio/viossl.c:
  Cleanups, fixes, etc...
vio/viosslfactories.c:
  Copyright was missing. Fixed renamed macros for newer OpenSSL
vio/viotest-ssl.c:
  Made testprogram work again
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-07-24 14:07:46 +08:00
unknown
ff0e718de6 merged
BitKeeper/etc/logging_ok:
  auto-union
myisam/ft_update.c:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
2001-07-12 14:58:20 +02:00
unknown
65876c1ffd Include latest GPL and LGPL texts from fsf.org
Docs/manual.texi:
  Include latest GPL and LGPL texts from fsf.org
  
  Fix syntax error in email address
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-07-11 13:32:32 +02:00
unknown
0f9ea6f45d Corrected misleading syntax example.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-07-10 15:57:23 -05:00
unknown
5d63584e60 merged
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/spanish/errmsg.txt:
  merged and translated the new 4.0 errors - had to type them in 
  anyway so figured I'd do it in Spanish - Jorge/Miguel - can you do QA
  on my translation?
2001-07-07 15:17:25 -06:00
unknown
02d0232e73 Merge work.mysql.com:/home/bk/mysql into white.box:/home/tim/my/3
BitKeeper/etc/logging_ok:
  auto-union
2001-06-29 15:28:50 -04:00
unknown
7452fb69cd Merge miguel@work.mysql.com:/home/bk/mysql
into light.local:/home/miguel/bk/mysql


BitKeeper/etc/logging_ok:
  auto-union
2001-06-29 05:18:58 -03:00
unknown
63f3702cda Completed the translation for the errmsg.txt Spanish file.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-29 05:15:54 -03:00
unknown
1ed2bcc888 merged with 3.23 replication updates
mysql-test/r/type_float.result:
  Auto merged
sql/sql_repl.h:
  Auto merged
BitKeeper/triggers/post-commit:
  merged with 3.23 updates
sql/mysqld.cc:
  merged
sql/slave.cc:
  merged
sql/sql_repl.cc:
  merged
2001-06-28 19:48:49 -06:00
unknown
656d118a58 chmod +x on post-incoming trigger
BitKeeper/triggers/post-incoming:
  Change mode to -rwxrwxr-x
2001-06-28 18:41:51 -06:00
unknown
c7e200cdd8 fixed message in post-commit trigger
added debugging options to master to behave sporadically, and a 
test case to make sure the slave can deal with it


BitKeeper/triggers/post-commit:
  fixed message
sql/mysqld.cc:
  added debugging options to force the master to occasionally break
  replication
sql/slave.cc:
  cosmetic change to improve readability
sql/sql_repl.cc:
  support for --sporadic-binlog-dump-fail and --max-binlog-dump-events
sql/sql_repl.h:
  support for --sporadic-binlog-dump-fail and --max-binlog-dump-events
2001-06-28 18:22:29 -06:00
unknown
a94cf89609 Merge work.mysql.com:/home/bk/mysql into white.box:/home/tim/my/3
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-28 17:39:53 -04:00
unknown
05e9925ada merge
BitKeeper/etc/logging_ok:
  auto-union
myisam/myisamchk.c:
  Auto merged
mysql-test/r/drop.result:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/sql_lex.cc:
  Auto merged
2001-06-28 14:51:18 +02:00
unknown
950a6871d9 Implement ORDER BY DESC optimization, which reads values in descending
order directly from the index instead of using a filesort.


mysql-test/mysql-test-run.sh:
  [ -n $SKIP_TEST ] --> [ -n "$SKIP_TEST" ]; portability fix
mysql-test/r/order_by.result:
  Added test for ORDER BY DESC optimization
mysql-test/t/order_by.test:
  Added test for ORDER BY DESC optimization
sql/opt_range.cc:
  Added QUICK_SELECT_DESC class which implements ORDER BY DESC optimization.
sql/opt_range.h:
  Added QUICK_SELECT_DESC class which implements ORDER BY DESC optimization.
sql/sql_select.cc:
  Added QUICK_SELECT_DESC class which implements ORDER BY DESC optimization.
BitKeeper/etc/ignore:
  Added .gdbinit .vimrc to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-28 03:06:23 -04:00
unknown
91239689e5 manual.texi add LIKE example illustrating case sensitivity.
Docs/manual.texi:
  add LIKE example illustrating case sensitivity.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-27 18:21:42 -05:00
unknown
e2029449a0 BitKeeper/triggers/post-commit
fixed post-commit message
mysql-test/t/check.test
    fixed bug from 3.23 merge


BitKeeper/triggers/post-commit:
  fixed post-commit message
mysql-test/t/check.test:
  fixed bug from 3.23 merge
2001-06-12 14:06:05 -06:00
unknown
e6138adbbd Merge work.mysql.com:/home/bk/mysql
into threads.polyesthetic.msg:/home/tim/my/3


BitKeeper/etc/logging_ok:
  auto-union
2001-06-12 11:51:48 -04:00
unknown
a9e6b975fc merge
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
sql-bench/server-cfg.sh:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2001-06-12 14:12:35 +02:00
unknown
be2b125bf8 Added --enable-shared to Do-compile
Build-tools/Do-compile:
  Added --enable-shared
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-12 11:04:31 +02:00
unknown
54fe14e2f6 send a separate commit message to internals
added a test for check table


BitKeeper/triggers/post-commit:
  send a separate commit message to internals
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-11 20:26:24 -06:00
unknown
8b76fb7f3e Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
Docs/manual.texi:
  Auto merged
2001-06-11 15:07:43 +03:00
unknown
036396bc66 Merge work:/my/mysql into tik.mysql.fi:/home/my/mysql
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
sql-bench/README:
  Auto merged
2001-06-11 15:07:42 +03:00
unknown
765940cb3a Changed compare in MyISAM to use my_pread()
Fixed that @VAR shows all decimals
Fixed problem with FLUSH TABLES and LOCK TABLE
CREATE ... SELECT now creates keys later
Reset AUTO_INCREMENT order if droping AUTO_INCREMENT key


Docs/manual.texi:
  Added MySQL/PostgreSQL comparison
isam/_dynrec.c:
  Fixed wrong compare (not used in MySQL)
myisam/mi_dynrec.c:
  Fixed wrong compare (not used in MySQL).
  Changed compare to use my_pread()
myisam/mi_packrec.c:
  cleanup
mysql-test/r/alter_table.result:
  Added test for ALTER TABLE
mysql-test/r/variables.result:
  Added test for variables with REAL values.
mysql-test/t/alter_table.test:
  Added test for ALTER TABLE
mysql-test/t/variables.test:
  Added test for variables with REAL values.
mysys/my_pread.c:
  Cleanup
sql-bench/Makefile.am:
  removed extra \
sql-bench/README:
  Fixed typo.
sql/item_func.cc:
  Fixed that @VAR shows all decimals
sql/share/swedish/errmsg.OLD:
  update
sql/sql_base.cc:
  Fixed problem with FLUSH TABLES and LOCK TABLE
sql/sql_insert.cc:
  CREATE ... SELECT now creates keys later
sql/sql_table.cc:
  Reset AUTO_INCREMENT order if droping AUTO_INCREMENT key.
BitKeeper/etc/ignore:
  Added sql-bench/graph-compare-results to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-11 15:01:28 +03:00
unknown
f4d5d2d979 manual.texi Contrib software additions.
Docs/manual.texi:
  Contrib software additions.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-08 15:54:20 -05:00