Commit graph

4871 commits

Author SHA1 Message Date
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
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
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
unknown
f0fbecca27 fixed so that --ssl and --skip-ssl works with the MySQL clients.
Fixed core dump bug when sending wrong string to AES_DECRYPT()


BitKeeper/deleted/.del-explain_log.sh~e570be5f63576fe1:
  Delete: scripts/explain_log.sh
Docs/manual.texi:
  Updated bug reporting. Added somew new changelog entries and changed some old
client/mysql.cc:
  Fixed so that --ssl and --skip-ssl works
client/mysqladmin.c:
  Fixed so that --ssl and --skip-ssl works
client/mysqlcheck.c:
  Fixed so that --ssl and --skip-ssl works
client/mysqldump.c:
  Fixed so that --ssl and --skip-ssl works
client/mysqlimport.c:
  Fixed so that --ssl and --skip-ssl works
client/mysqlshow.c:
  Fixed so that --ssl and --skip-ssl works
include/sslopt-case.h:
  Fixed so that --ssl and --skip-ssl works
mysql-test/r/func_str.result:
  Test of problem with AES_DECRYPT()
mysql-test/t/func_str.test:
  Test of problem with AES_DECRYPT()
mysys/my_aes.c:
  Fixed problem with wrong decrypt string.
scripts/mysql_explain_log.sh:
  Applied missed patch
sql/item_strfunc.cc:
  Fixed aes_encrypt() and aes_decrypt() to be safer and avoid some mallocs()
sql/net_pkg.cc:
  Return ER_UNKNOWN_ERROR instead of errocode 0 in some cases.
2002-09-17 23:46:53 +03:00
unknown
475f7300e9 Merge
Docs/manual.texi:
  SCCS merged
2002-09-17 21:09:39 +02:00
unknown
5f6bd7ddb1 ft-boolean + ORDER BY (ftb tree reusing) bug 2002-09-17 21:04:10 +02:00
unknown
590a0ed3fc comment corrected 2002-09-17 20:37:26 +02:00
unknown
ddcc49ec62 Merge with 3.23.53
Docs/manual.texi:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/filesort.cc:
  merge
2002-09-17 05:17:32 +03:00
unknown
afe8d4fc24 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
Docs/manual.texi:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
2002-09-16 15:56:55 +03:00
unknown
9ce6267ebe Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tables
Fixed bug in SELECT ... ORDER BY ... LIMIT
Fixed bug in ALTER TABLE and RENAME TABLE with --lower-case-table-names
Fixed hang when using --with-openssl


Docs/manual.texi:
  Updated SHOW VARIABLES
  Changelog
  Moved some missplaced changelog entries
include/violite.h:
  updated prototypes
libmysqld/lib_sql.cc:
  Moved init_update_queries() to sql_parse.cc
mysql-test/install_test_db.sh:
  Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tables
mysql-test/r/grant.result:
  Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tables
mysql-test/t/grant.test:
  Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tables
scripts/mysql_fix_privilege_tables.sh:
  Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tables
scripts/mysql_install_db.sh:
  Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tables
sql/filesort.cc:
  Fixed bug in SELECT ... ORDER BY ... LIMIT
sql/mysql_priv.h:
  New prototypes
sql/mysqld.cc:
  Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tables
sql/sql_acl.cc:
  Moved init_update_queries() to sql_parse.cc
  Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host
sql/sql_acl.h:
  Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host
sql/sql_parse.cc:
  Moved init_update_queries() to sql_parse.cc
sql/sql_show.cc:
  Fixed wrong output in SHOW TABLE STATUS for compressed tables.
sql/sql_table.cc:
  Fixed bug in ALTER TABLE and RENAME TABLE with --lower-case-table-names
vio/viosocket.c:
  Fixed hang when using --with-openssl
vio/viossl.c:
  Fixed hang when using --with-openssl
2002-09-16 15:55:19 +03:00
unknown
6f8b510a2b Fixed bug in ALTER TABLE and RENAME TABLE when running with lower-case-table-names.
Docs/manual.texi:
  changelog
2002-09-16 15:24:54 +03:00
unknown
3c438bea38 Merge mysql.com:/home/pz/mysql/mysql-4.0-root
into mysql.com:/home/pz/mysql/mysql-4.0
2002-09-16 00:06:24 +04:00
unknown
f2d256e87a manual.texi clarify that FULLTEXT is for MyISAM tables.
Docs/manual.texi:
  clarify that FULLTEXT is for MyISAM tables.
2002-09-15 12:10:33 -05:00
unknown
bda0d5499c Merge heikki@work.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.0
2002-09-15 02:24:42 +03:00
unknown
57a2cf1377 ha_innodb.h, ha_innodb.cc:
Reverted the change which allowed use of HA_READ_PREFIX_LAST in InnoDB


sql/ha_innodb.cc:
  Reverted the change which allowed use of HA_READ_PREFIX_LAST in InnoDB
sql/ha_innodb.h:
  Reverted the change which allowed use of HA_READ_PREFIX_LAST in InnoDB
2002-09-15 02:23:53 +03:00
unknown
ca851d2011 Merge work:/my/mysql-3.23 into mashka.mysql.fi:/home/my/mysql-3.23 2002-09-15 01:24:18 +03:00
unknown
20ec6183fe Fixed core dump bug in ORDER BY ... LIMIT
Docs/manual.texi:
  Changelog
2002-09-15 01:23:01 +03:00
unknown
38b34b0a7e Fix MySQL Test so it will not depend on current host in log file naming.
mysql-test/r/rpl_flush_log_loop.result:
  Fix result
mysql-test/t/rpl_flush_log_loop-master.opt:
  Fix master options
mysql-test/t/rpl_flush_log_loop-slave.opt:
  Fix slave options
2002-09-15 02:17:20 +04:00
unknown
2808e52d8d Merge mysql.com:/home/pz/mysql/mysql-4.0-root
into mysql.com:/home/pz/mysql/mysql-4.0


BitKeeper/deleted/.del-rpl_flush_log_loop-master.opt:
  Delete: mysql-test/t/rpl_flush_log_loop-master.opt
BitKeeper/deleted/.del-rpl_flush_log_loop-slave.opt:
  Delete: mysql-test/t/rpl_flush_log_loop-slave.opt
BitKeeper/deleted/.del-rpl_flush_log_loop.test:
  Delete: mysql-test/t/rpl_flush_log_loop.test
2002-09-14 22:45:09 +04:00
unknown
4240a7f13d mysqlbinlog.cc:
a few changes to test resolving


client/mysqlbinlog.cc:
  a few changes to test resolving
2002-09-14 11:26:40 -05:00
unknown
63bdec30bf mysqlbinlog.cc:
fixed typo


client/mysqlbinlog.cc:
  fixed typo
2002-09-14 11:12:02 -05:00
unknown
0b5c1838bf ha_innodb.cc:
Add some comments
ha_innodb.h:
  Remove the flag HA_NOT_READ_PREFIX_LAST from ha_innodb.h: InnoDB has supported this from the start, but not tested yet


sql/ha_innodb.h:
  Remove the flag HA_NOT_READ_PREFIX_LAST from ha_innodb.h: InnoDB has supported this from the start, but not tested yet
sql/ha_innodb.cc:
  Add some comments
2002-09-14 03:12:00 +03:00
unknown
5886a7d33d manual.texi minor tweaks/fixups to charset section.
manual.texi	minor fixups to mysql_real_connect() section.


Docs/manual.texi:
  minor tweaks/fixups to charset section.
2002-09-13 10:47:02 -05:00
unknown
0891bc24d0 row0mysql.c:
Fix typos in previous push


innobase/row/row0mysql.c:
  Fix typos in previous push
2002-09-13 14:23:09 +03:00
unknown
5ab7b94ba0 row0mysql.c:
Allow CREATE TABLE and DROP TABLE even if innodb_force_recovery is used, the user can drop a problematic table


innobase/row/row0mysql.c:
  Allow CREATE TABLE and DROP TABLE even if innodb_force_recovery is used, the user can drop a problematic table
2002-09-13 13:55:25 +03:00
unknown
bdf11b22cd Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
Docs/manual.texi:
  Auto merged
2002-09-13 01:09:50 +03:00