Commit graph

3410 commits

Author SHA1 Message Date
unknown
1ab1e75806 Patched conversion system to generate well-formed XML
Docs/Support/docbook-fixup.pl:
  Series of minor changes to convert the output of makeinfo to well-formed XML
   - Discarded DTD - ORA can add their own appropriate DTD
   - Added required XML PI - included appropriate character encoding information
   - Added missing abstract and bookinfo tags
   - Escaped ampersands in HTML escape sequences to allow validation - need to review
Docs/Support/make-docbook:
  Forced validation of XML document at end of conversion process
  Removed temporary files - set makeinfo output to stdout
BitKeeper/etc/ignore:
  Added Docs/safe-mysql.xml to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-02-15 16:14:38 -07:00
unknown
2ecb9836c2 manual.texi:
Remove link to sqlscreens in the contrib section


Docs/manual.texi:
  Remove link to sqlscreens in the contrib section
2002-02-16 01:14:10 +02:00
unknown
9f7fe921c4 Merge work:/home/bk/mysql into mysql.sashanet.com:/reiser-data/mysql 2002-02-15 14:03:21 -07:00
unknown
1e94643c61 updates for the new build
configure.in:
  support for static nss on Linux when compiling --with-other-libc
mysql-test/mysql-test-run.sh:
  --user-test option
2002-02-15 14:02:48 -07:00
unknown
00f6850dfe Zapped trailing spaces. 2002-02-15 18:53:27 +10:00
unknown
f3e4d4e3ae Merge heikki@work.mysql.com:/home/bk/mysql
into hundin.mysql.fi:/home/heikki/mysql
2002-02-15 10:45:58 +02:00
unknown
fcd875cf4e dict0dict.c:
If the string foreign was succeeded by a non-space character, that confused the foreign key syntax parser


innobase/dict/dict0dict.c:
  If the string foreign was succeeded by a non-space character, that confused the foreign key syntax parser
2002-02-15 10:39:12 +02:00
unknown
0983c695a9 Cleanup @example blocks in manual for XML/DocBook/PS/PDF output.
Docs/manual.texi:
  All lines in @example blocks need to be <76 chars.
  Minor cleanup of other stuff in @example blocks.
2002-02-15 18:37:31 +10:00
unknown
1cdde35139 Clarified USE/IGNORE INDEX in all relevant sections.
Added mention of USE/IGNORE KEY as alias for USE/IGNORE INDEX.
Fixups references to this feature throughout manual.
2002-02-15 14:18:13 +10:00
unknown
c627eb7601 Improved USE INDEX / IGNORE INDEX info.
Docs/manual.texi:
  Added USE INDEX / IGNORE INDEX syntax to table_references info in SELECT.
  Added USE INDEX / IGNORE INDEX to function index.
2002-02-15 12:53:10 +10:00
unknown
e501e96425 Fixups for XML/DocBook output.
Docs/Support/docbook-fixup.pl:
  Added fixup for xref closing /> tag to prevent malformed XML.
  Improved /para whitespace removal.
Docs/manual.texi:
  Removed double whitespace in middle of sentence.
2002-02-15 12:36:57 +10:00
unknown
0ee35d6da9 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
sql/sql_parse.cc:
  Auto merged
2002-02-15 02:51:43 +02:00
unknown
93c1f96f7d Fix after merge from 3.23
Docs/manual.texi:
  Added section about LOAD DATA LOCAL
libmysqld/lib_sql.cc:
  Remove not used option
mysql-test/r/comments.result:
  Updated results
sql/sql_parse.cc:
  Fix queries / second
2002-02-15 02:49:02 +02:00
unknown
a95fba4d22 Fixed too bugs in MySQL client 'mysql', interactive command 'tee'.
client/mysql.cc:
  Fixed two bugs in 'tee'.
  It's now possible to change the 'tee-file' on the fly without
  need to run 'notee' in between. 'tee' will now also accept quotes
  around the file name.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-02-15 02:34:48 +02:00
unknown
d44aef016c Use --enable-local-infile as default
Build-tools/Do-compile:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
2002-02-14 19:41:32 +02:00
unknown
4c16462118 Enable LOAD DATA LOCAL by default 2002-02-14 19:24:49 +02:00
unknown
5fa6df3081 merge with 3.23.49
BitKeeper/etc/logging_ok:
  auto-union
acconfig.h:
  Auto merged
Docs/manual.texi:
  Auto merged
client/client_priv.h:
  Auto merged
include/mysql.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
mysql-test/t/comments.test:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
sql/unireg.h:
  Auto merged
2002-02-14 18:58:24 +02:00
unknown
7bff1b0c34 Fix for gethostbyname_r detection (for solaris).
configure.in:
  Fix for gethostbyname_r (for solaris)
mysql-test/r/innodb.result:
  Fix innodb results
sql/mysql_priv.h:
  Added OPTION_FOUND_COMMENTS
2002-02-14 18:10:44 +02:00
unknown
3a231663f0 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2002-02-14 15:25:26 +02:00
unknown
4866455558 Don't give warnings for empty statements with comments 2002-02-14 15:04:14 +02:00
unknown
ce81db2e0d row0mysql.c:
Add a warning to drop database wait if there are still open handles on a table


innobase/row/row0mysql.c:
  Add a warning to drop database wait if there are still open handles on a table
2002-02-14 11:30:14 +02:00
unknown
199e17e577 dict0dict.h, dict0dict.c, row0mysql.c, ha_innobase.cc:
Add some more safety if MySQL tries to drop a table on which there are open handles


sql/ha_innobase.cc:
  Add some more safety if MySQL tries to drop a table on which there are open handles
innobase/row/row0mysql.c:
  Add some more safety if MySQL tries to drop a table on which there are open handles
innobase/dict/dict0dict.c:
  Add some more safety if MySQL tries to drop a table on which there are open handles
innobase/include/dict0dict.h:
  Add some more safety if MySQL tries to drop a table on which there are open handles
2002-02-14 10:24:27 +02:00
unknown
5c08b0fbab row0mysql.c, sql_db.cc:
Try to make sure DROP DATABASE does not cause a deadlock because we now let InnoDB wait MySQL does not have open handles to tables we drop


sql/sql_db.cc:
  Try to make sure DROP DATABASE does not cause a deadlock because we now let InnoDB wait MySQL does not have open handles to tables we drop
innobase/row/row0mysql.c:
  Try to make sure DROP DATABASE does not cause a deadlock because we now let InnoDB wait MySQL does not have open handles to tables we drop
2002-02-14 03:45:45 +02:00
unknown
01f1db421f changed bool -> my_bool 2002-02-14 02:41:29 +02:00
unknown
a3e6a43d0f Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2002-02-14 02:39:38 +02:00
unknown
74e8b0a60d ha_innobase.cc:
DROP DATABASE required that the database name is in lower case to work; put it always to lower case in innobase_drop_database


sql/ha_innobase.cc:
  DROP DATABASE required that the database name is in lower case to work; put it always to lower case in innobase_drop_database
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-02-14 00:00:09 +02:00
unknown
429abf3560 Added --user=userid to mysqld
Fix for ctypes on windows
Cleanup max_queries_per_hour


mysql-test/t/dirty_close.test:
  Rename: mysql-test/t/dirty-close.test -> mysql-test/t/dirty_close.test
mysql-test/r/dirty_close.result:
  Rename: mysql-test/r/dirty-close.result -> mysql-test/r/dirty_close.result
Docs/manual.texi:
  Added --user=userid
include/m_ctype.h:
  Fix for ctypes on windows
mysql-test/r/join.result:
  Update join results
sql/mysqld.cc:
  Added --user=userid
sql/sql_parse.cc:
  Cleanup max_queries_per_hour
2002-02-13 22:37:19 +02:00
unknown
26b57d2a15 Use NAMES_SEP_CHAR also for enums (Fix for supportwizard)
sql/unireg.cc:
  Use NAMES_SEP_CHAR also for enums
sql/unireg.h:
  cleanup
2002-02-13 22:01:43 +02:00
unknown
345f385451 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
BitKeeper/etc/logging_ok:
  auto-union
2002-02-13 22:01:42 +02:00
unknown
a0ea16f1c2 Fix for LOAD DATA LOCAL INFILE patch 2002-02-13 22:01:41 +02:00
unknown
bf67d42f2d Merge hundin:/my/mysql-3.23 into tik.mysql.fi:/home/my/mysql-3.23
sql/mysqld.cc:
  Auto merged
2002-02-13 22:01:40 +02:00
unknown
33d2d76549 Made LOAD DATA LOCAL INFILE more secure
Docs/manual.texi:
  Changelog
sql/sql_yacc.yy:
  optimization
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-02-13 21:53:26 +02:00
unknown
67d8e88241 Don't print out 'got signal' if not using --warnings 2002-02-13 17:49:21 +02:00
unknown
700513a41a mysqldump.c:
Changed C++ style comments to ANSI C style.


client/mysqldump.c:
  Changed C++ style comments to ANSI C style.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-02-12 08:24:40 -06:00
unknown
e5c3d1c366 Merge paul@work.mysql.com:/home/bk/mysql-4.0
into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged
2002-02-11 19:23:08 -06:00
unknown
728c191b11 reverting wrong fix 2002-02-11 14:47:22 +02:00
unknown
e0ccdc17a2 merge with 3.23.48
BUILD/FINISH.sh:
  Auto merged
BUILD/SETUP.sh:
  Auto merged
BUILD/compile-alpha:
  Auto merged
BUILD/compile-pentium-gcov:
  Auto merged
BUILD/compile-pentium-gprof:
  Auto merged
BUILD/compile-pentium:
  Auto merged
BitKeeper/deleted/.del-my_new.cc:
  Delete: mysys/my_new.cc
Build-tools/Do-compile:
  Auto merged
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
Docs/manual.texi:
  Auto merged
bdb/dist/configure.in:
  Auto merged
client/Makefile.am:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/trx/trx0purge.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysys/Makefile.am:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/my_lock.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/my-huge.cnf.sh:
  Auto merged
support-files/my-large.cnf.sh:
  Auto merged
support-files/my-medium.cnf.sh:
  Auto merged
support-files/my-small.cnf.sh:
  Auto merged
configure.in:
  merge
innobase/row/row0mysql.c:
  merge
innobase/trx/trx0trx.c:
  merge
mysql-test/r/innodb.result:
  merge
mysql-test/r/join.result:
  merge
sql/ha_innodb.cc:
  merge
sql/slave.cc:
  merge
2002-02-11 13:48:59 +02:00
unknown
af932b5db2 Fixed typo 2002-02-11 13:28:25 +02:00
unknown
501650c5b1 Updated changelog of 3.23.48 with InnoDB changes.
sql/sql_table.cc:
  Fixed comment
2002-02-11 12:56:48 +02:00
unknown
8a99eebe92 Changelog fixups. 2002-02-11 14:27:56 +10:00
unknown
ed30774e8b Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2002-02-11 05:04:09 +02:00
unknown
4122b3928b Cleanup
Docs/manual.texi:
  Update information about IS NULL.
myisam/myisamchk.c:
  Portability fix
sql/mysqld.cc:
  Changed log_long_queries -> log_slow_queries
2002-02-11 04:55:52 +02:00
unknown
5081986810 Remove uage of static variable from file locks.
mysql-test/mysql-test-run.sh:
  Cleanup
2002-02-10 20:28:58 +02:00
unknown
87adcd7cf7 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2002-02-10 12:55:21 +02:00
unknown
c1caaf756f Fixed bug in full join with many NULL fields.
Build-tools/Do-compile:
  Fixed 'touch' and 'chmod' of files.
Docs/manual.texi:
  Changelog
2002-02-10 12:47:37 +02:00
unknown
f9df684760 Merge heikki@work.mysql.com:/home/my/mysql
into donna.mysql.fi:/home/heikki/mysqln
2002-02-10 04:51:47 +02:00
unknown
e370bdeeb6 srv0srv.c:
If the default character set was set to non-latin1 then the collation order of DATA_CHAR and DATA_VARCHAR was not defined, and foreign key system tables did not work, because they contain DATA_VARCHAR columns


innobase/srv/srv0srv.c:
  If the default character set was set to non-latin1 then the collation order of DATA_CHAR and DATA_VARCHAR was not defined, and foreign key system tables did not work, because they contain DATA_VARCHAR columns
2002-02-10 04:50:46 +02:00
unknown
61b769d94a Fix for customer build 2002-02-10 02:28:24 +02:00
unknown
c9a4dde5de Add forgotten argument to --version-suffix 2002-02-10 00:34:05 +02:00
unknown
6f11331945 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0
2002-02-09 13:59:30 -07:00