Commit graph

5194 commits

Author SHA1 Message Date
unknown
2c664eb58d manual.texi FULLTEXT works with CHAR, too.
Docs/manual.texi:
  FULLTEXT works with CHAR, too.
2002-09-23 16:35:40 -05:00
unknown
d7bbd4454a - modified mysql-test/mysql-test-run.sh to only probe for "gcov", if
"--gcov" is actually passed as a command line option (to avoid
   failures on systems with no gcov installed)


mysql-test/mysql-test-run.sh:
   - only probe for gcov, if it's actually required
2002-09-23 21:30:08 +02:00
unknown
a05ad2445c Merge work.mysql.com:/home/bk/mysql-4.0
into build.mysql2.com:/home/serg/mysql-4.0
2002-09-23 19:57:36 +02:00
unknown
d2083add3a Merge
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
sql/sql_yacc.yy:
  merged
2002-09-23 16:39:18 +02:00
unknown
41f7307a18 configure.in:
static nss linkingg issue


configure.in:
  static nss linkingg issue
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-09-23 16:39:17 +02:00
unknown
a24d4b9949 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 2002-09-23 14:39:16 +00:00
unknown
14d3ff6b73 followup: s/st_table_list->name/st_table_list->alias/ 2002-09-23 14:38:35 +00:00
unknown
617274f723 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-09-23 16:46:17 +03:00
unknown
4c3d874345 Made mysql-test results independent of MASTER_PORT and SLAVE_PORT
mysql-test/r/rpl_flush_log_loop.result:
  Made results independent of MASTER_PORT and SLAVE_PORT
mysql-test/t/rpl_flush_log_loop.test:
  Made results independent of MASTER_PORT and SLAVE_PORT
2002-09-23 16:34:49 +03:00
unknown
ea2f013035 - added missing line from the 4.0 configure.in patch
configure.in:
   - Added missing line from 4.0 patch for static glibc linking
2002-09-23 14:06:48 +02:00
unknown
21afbc4c57 Clarifications from Monty (by Zak). 2002-09-23 10:23:44 +10:00
unknown
4bdf92af41 Caps keywords (OJ is Outer Join; ODBC compatibility). 2002-09-23 10:00:02 +10:00
unknown
7b0e5506fd Explanation fixup (noted by Dean Ellis, info from Peter Zaitsev). 2002-09-23 09:47:16 +10:00
unknown
3e77f4c667 - Bugfix for static glibc linking in configure.in (taken from 4.0)
configure.in:
   - Fixed bug in previous patch for linking against libc (taken from 4.0)
2002-09-22 18:43:33 +02:00
unknown
a4732af939 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
Docs/manual.texi:
  Auto merged
2002-09-22 18:04:13 +03:00
unknown
92dd03932d Don't give the anonymous user create temp table or lock tables privileges.
SET PASSWORD=... closed connection on error.


Docs/manual.texi:
  Changelog
mysql-test/r/rpl_rotate_logs.result:
  Fixed test
scripts/mysql_fix_privilege_tables.sh:
  Don't give the anonymous user create temp table or lock tables privileges.
sql/set_var.cc:
  SET PASSWORD=... closed connection on error, because MySQL sent the error message twice.
sql/set_var.h:
  SET PASSWORD=... closed connection on error, because MySQL sent the error message twice.
sql/sql_acl.cc:
  Added function comment
sql/sql_db.cc:
  Change type of variable
sql/sql_parse.cc:
  SET PASSWORD=... closed connection on error, because MySQL sent the error message twice.
tests/grant.pl:
  Updated grant test case to work with latest MySQL version
tests/grant.res:
  updated test results
2002-09-22 18:02:39 +03:00
unknown
6546f36e2d Merge with 3.23.53
Docs/manual.texi:
  Auto merged
sql/lock.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
tests/grant.pl:
  Auto merged
sql/sql_acl.cc:
  Merge with 3.23.53 (fixes problem with critical region in GRANT)
sql/sql_insert.cc:
  Merge with 3.23.53 (no changes)
sql/sql_parse.cc:
  Merge with 3.23.53 (no changes)
sql/sql_udf.cc:
  Merge with 3.23.53 (indent change)
sql/table.h:
  Merge with 3.23.53 (no changes)
2002-09-22 10:59:33 +03:00
unknown
cc71ac185d Fixed bug in previous patch when using a libc with static nss
client/mysql.cc:
  Fixed help text
mysql-test/t/rpl_rotate_logs.test:
  Updated test
sql/sql_acl.cc:
  comments and safety checks
2002-09-22 10:35:15 +03:00
unknown
0e88d440d6 Merge work:/my/mysql-3.23 into mashka.mysql.fi:/home/my/mysql-3.23 2002-09-22 10:01:22 +03:00
unknown
2047f3e185 Merge paul@work.mysql.com:/home/bk/mysql-4.0
into teton.kitebird.com:/home/paul/mysql-4.0
2002-09-21 19:07:52 -05:00
unknown
15112e4316 manual.texi Fix typo in option name.
Docs/manual.texi:
  Fix typo in option name.
2002-09-21 19:07:07 -05:00
unknown
3b7333b484 row0ins.c, ha_innodb.cc:
Table hash key len in query cache also includes null char at end


sql/ha_innodb.cc:
  Table hash key len in query cache also includes null char at end
innobase/row/row0ins.c:
  Table hash key len in query cache also includes null char at end
2002-09-22 01:38:48 +03:00
unknown
b804e278c8 Change name -> alias in TABLE_LIST.
Added missing mutex-lock around critical section in GRANT handling.


Docs/manual.texi:
  ChangeLog
sql/lock.cc:
  Change name -> alias in TABLE_LIST.
sql/slave.cc:
  Change name -> alias in TABLE_LIST.
sql/sql_acl.cc:
  Added missing mutex-lock around critical section in GRANT handling.
  Changed name -> alias
sql/sql_base.cc:
  Change name -> alias in TABLE_LIST.
sql/sql_insert.cc:
  Change name -> alias in TABLE_LIST.
sql/sql_parse.cc:
  Change name -> alias in TABLE_LIST.
sql/sql_show.cc:
  Change name -> alias in TABLE_LIST.
sql/sql_table.cc:
  Change name -> alias in TABLE_LIST.
sql/sql_udf.cc:
  Change name -> alias in TABLE_LIST.
sql/table.h:
  Change name -> alias in TABLE_LIST.
tests/grant.pl:
  Fixed grant test
2002-09-21 21:36:23 +03:00
unknown
01be46e20e dict0dict.c:
Fix a crash introduced when we grew foreign key comment to 16000 chars


innobase/dict/dict0dict.c:
  Fix a crash introduced when we grew foreign key comment to 16000 chars
2002-09-21 18:47:56 +03:00
unknown
3e55ff618d ha_innodb.cc:
Add return statement


sql/ha_innodb.cc:
  Add return statement
2002-09-21 03:39:27 +03:00
unknown
02392941c0 ha_innodb.cc:
Fix typos in last push
  Fix typo


sql/ha_innodb.cc:
  Fix typos in last push
2002-09-21 03:15:54 +03:00
unknown
a72de62ac9 ha_innodb.cc, ha_innodb.h:
Fix assertion when a temporary table is created and used inside LOCK TABLES


sql/ha_innodb.h:
  Fix assertion when a temporary table is created and used inside LOCK TABLES
sql/ha_innodb.cc:
  Fix assertion when a temporary table is created and used inside LOCK TABLES
2002-09-20 23:26:21 +03:00
unknown
c2eabae4b1 manual.texi fix capitalization, clarify context for
manual.texi	LAST_INSERT_ID() usage.


Docs/manual.texi:
  fix capitalization, clarify context for
  LAST_INSERT_ID() usage.
2002-09-20 09:13:25 -05:00
unknown
841acab192 - merge some of the 4.0 configure.in modifications (mainly because
of the static_nss stuff required for linking against the patched
   glibc)


configure.in:
   - Applied some modifications from the 4.0 configure.in to fix some
     typos and platform-specific issues (Solaris 2.6, Mac OS 10.2)
2002-09-20 14:45:28 +02:00
unknown
f72b93abd4 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-09-20 14:45:04 +03:00
unknown
c0e97536a6 Added testing of glibc compiled with static nss (as on the MySQL build machine) 2002-09-20 14:42:47 +03:00
unknown
f631f93ed8 Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
This should fix some issues where --lower-case-table-names doesn't work properly under windows.


client/mysql.cc:
  Added missing sslopt-case.h
sql/lock.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/log_event.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/mysqld.cc:
  Fixed that --ssl and --skip-ssl works
sql/slave.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_acl.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_base.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_cache.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_handler.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_insert.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_parse.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_show.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_table.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_udf.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_union.cc:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/sql_yacc.yy:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
sql/table.h:
  Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
2002-09-20 14:05:18 +03:00
unknown
a8b221addb srv0srv.c:
Fix typo


innobase/srv/srv0srv.c:
  Fix typo
2002-09-20 05:50:25 +03:00
unknown
010a8b922e srv0srv.h, srv0srv.c, row0mysql.c:
Put back a change unintentionally removed in the last 2 pushes


innobase/row/row0mysql.c:
  Put back a change unintentionally removed in the last 2 pushes
innobase/srv/srv0srv.c:
  Put back a change unintentionally removed in the last 2 pushes
innobase/include/srv0srv.h:
  Put back a change unintentionally removed in the last 2 pushes
2002-09-20 05:44:41 +03:00
unknown
ce62618ca7 trx0trx.ic, trx0trx.h, srv0srv.h, row0sel.h, dict0mem.h:
Modifications for query cache + trxs, fix of q.c.+ foreign keys


innobase/include/dict0mem.h:
  Modifications for query cache + trxs, fix of q.c.+ foreign keys
innobase/include/row0sel.h:
  Modifications for query cache + trxs, fix of q.c.+ foreign keys
innobase/include/srv0srv.h:
  Modifications for query cache + trxs, fix of q.c.+ foreign keys
innobase/include/trx0trx.h:
  Modifications for query cache + trxs, fix of q.c.+ foreign keys
innobase/include/trx0trx.ic:
  Modifications for query cache + trxs, fix of q.c.+ foreign keys
2002-09-20 05:18:55 +03:00
unknown
b8cfcf768e Many files:
Modifications for query cache + trxs, fix of q.c.+ foreign keys
os0file.c:
  Use unbuffered i/o in Windows


innobase/dict/dict0mem.c:
  Modifications for query cache + trxs, fix of q.c.+ foreign keys
innobase/os/os0file.c:
  Use unbuffered i/o in Windows
innobase/lock/lock0lock.c:
  Modifications for query cache + trxs, fix of q.c.+ foreign keys
innobase/row/row0ins.c:
  Modifications for query cache + trxs, fix of q.c.+ foreign keys
innobase/row/row0mysql.c:
  Modifications for query cache + trxs, fix of q.c.+ foreign keys
innobase/row/row0sel.c:
  Modifications for query cache + trxs, fix of q.c.+ foreign keys
innobase/srv/srv0srv.c:
  Modifications for query cache + trxs, fix of q.c.+ foreign keys
sql/ha_innodb.h:
  Modifications for query cache + trxs, fix of q.c.+ foreign keys
sql/ha_innodb.cc:
  Modifications for query cache + trxs, fix of q.c.+ foreign keys
2002-09-20 05:11:08 +03:00
unknown
ebf518bc45 Merge abelkin@work.mysql.com:/home/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/mysql-4.0
2002-09-19 20:14:00 +03:00
unknown
e4c26f854e fixed typo 2002-09-19 20:10:06 +03:00
unknown
7953870346 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-09-19 18:46:35 +03:00
unknown
a1e75ac0ce Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
Docs/manual.texi:
  Auto merged
2002-09-19 18:03:48 +03:00
unknown
a355b6ac70 Increased max possible max_allowed_packet to 1G
Small optimization to not do external locking of temporary MyISAM tables.


BitKeeper/deleted/.del-sslopt-usage.h~3ab77eeeaad1ba0a:
  Delete: include/sslopt-usage.h
Docs/manual.texi:
  Fixed wrong descrtion of IF()
  Added information about automatic cast of integer to binary string
  ChangeLog
client/mysqlbinlog.cc:
  Portability fix
client/mysqldump.c:
  Increased max possible max_allowed_packet to 1G
include/Makefile.am:
  Removed sslopt-usage.h
  Made sslopt-case.h global
include/my_sys.h:
  Fixd protypes for my_strdup_with_length()
mysys/safemalloc.c:
  Fixd some prototypes
sql/ha_isam.cc:
  Don't do external locking on temporary tables
sql/ha_myisam.cc:
  Don't do external locking on temporary tables
sql/lock.cc:
  Added big description of how LOCK TABLES affects locking
sql/log_event.cc:
  cleanup
sql/mysqld.cc:
  Increased max possible max_allowed_packet to 1G
sql/sql_table.cc:
  Fixed portability problem
2002-09-19 17:49:41 +03:00
unknown
8ff9e7089f new function for innodb
windows case insensitive tables name work around


sql/sql_cache.h:
  new function for innodb
sql/sql_class.cc:
  new query cache invalidation function support
sql/sql_class.h:
  new query cache invalidation function support
2002-09-19 10:36:19 +03:00
unknown
2ba53ba51b manual.texi fix X'...' example to return correct result type
Docs/manual.texi:
  fix X'...' example to return correct result type
2002-09-18 16:39:26 -05:00
unknown
83fc12f216 Added code to flush a bulk_insert index.
This fixes a bug when doing multi-row inserts on table with an auto_increment key that is not in the first key segment.


Docs/manual.texi:
  Changelog
include/my_base.h:
  Added code to flush a bulk_insert index
myisam/mi_extra.c:
  Added code to flush a bulk_insert index
mysql-test/r/insert.result:
  test of auto_increment and bulk_insert
mysql-test/t/insert.test:
  test of auto_increment and bulk_insert
sql/ha_myisam.cc:
  Added code to flush a bulk_insert index
sql/sql_insert.cc:
  Mark that bulk_insert is used
sql/sql_load.cc:
  Mark that bulk_insert is used
  Remove duplicated call to initialize bulk insert
sql/table.h:
  Mark that bulk_insert is used
vio/viosslfactories.c:
  Remove compiler warning
2002-09-18 21:04:49 +03:00
unknown
ef0ae3f97d 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-09-18 10:37:59 -05:00
unknown
c0e64b9f02 manual.texi minor fixes
Docs/manual.texi:
  minor fixes
2002-09-18 10:35:29 -05:00
unknown
aef675029f Update mysql-test results after merge
include/my_sys.h:
  Portability fix
include/sslopt-longopts.h:
  Better help for --ssl
mysql-test/r/binary.result:
  Update results after merge
mysys/my_malloc.c:
  Portability fix
sql/udf_example.cc:
  Use longlong instead of 'long long' to make things works on windows
2002-09-18 02:21:29 +03:00
unknown
081023e8fd merge with 3.23.53 (only code cleanup and new test case)
Docs/manual.texi:
  Auto merged
mysql-test/t/binary.test:
  Auto merged
mysql-test/r/binary.result:
  merge with 3.23.53
sql/item_strfunc.h:
  Code cleanup
2002-09-18 02:04:56 +03:00
unknown
e4860747eb Fixed bug with BINARY NULL
Docs/manual.texi:
  ChangeLog
mysql-test/r/binary.result:
  Test of binary NULL
mysql-test/t/binary.test:
  Test of binary NULL
2002-09-18 02:00:56 +03:00
unknown
00b310fa54 Merge
Docs/manual.texi:
  SCCS merged
2002-09-18 00:44:58 +03:00