Commit graph

3037 commits

Author SHA1 Message Date
unknown
62c4fa399e merge with 3.23
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
Docs/manual.texi:
  Auto merged
client/client_priv.h:
  Auto merged
extra/resolveip.c:
  Auto merged
innobase/btr/btr0sea.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/my_bitmap.c:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/ha_innobase.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_do.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
client/mysqldump.c:
  Use local version in 4.0
configure.in:
  Use 4.0 code
2002-01-02 21:34:12 +02:00
unknown
f4fee3d90e Added macros for nice TIMESPEC usage.
Fixes for building MySQL with gcc 3.0
Added SIGNED / UNSIGNED casts
Fixed core dump bug in net_clear() with libmysqld.
Back to using semaphores in query cache.
Added 'Null' and 'Index_type' to SHOW INDEX.


BUILD/FINISH.sh:
  Fixes for gcc 3.0
BUILD/SETUP.sh:
  Fixes for gcc 3.0
Docs/manual.texi:
  Changelog + SIGNED/UNSIGNED casts.
Makefile.am:
  include BUILD scripts in source distribution.
client/Makefile.am:
  Fixes for gcc 3.0
client/mysql.cc:
  Cleanup
client/mysqldump.c:
  Changed 'K' to mean 'disable-keys' instead of 'no-disabled-keys'
client/readline.cc:
  Cleanup
configure.in:
  Include BUILD in source distrbution
extra/my_print_defaults.c:
  Cleanup
include/my_global.h:
  Fix for HPUX and setrlimit.
  Portability fix.
  Added macros for nice TIMESPEC usage.
innobase/include/dyn0dyn.h:
  Fix for AIX
libmysql/Makefile.shared:
  Added strxmov to libmysqld
libmysqld/examples/Makefile.am:
  Fixes for gcc 3.0
libmysqld/lib_vio.c:
  Cleanup
myisam/ft_dump.c:
  Portability fixes
myisam/ftdefs.h:
  Portability fixes
mysql-test/r/bdb.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/bigint.result:
  New test for SIGNED/UNSIGNED
mysql-test/r/fulltext.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/heap.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/innodb.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/isam.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/key.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/myisam.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/query_cache.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/select.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/show_check.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/type_ranges.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/t/bigint.test:
  New test for SIGNED/UNSIGNED
mysql-test/t/key.test:
  New test for SIGNED/UNSIGNED
mysql-test/t/query_cache.test:
  Test for FOUND_ROWS()
sql-bench/crash-me.sh:
  Safety fixes
sql/derror.cc:
  Cleanup
sql/ha_berkeley.h:
  New test for SIGNED/UNSIGNED
sql/ha_heap.h:
  New test for SIGNED/UNSIGNED
sql/ha_innobase.cc:
  New test for SIGNED/UNSIGNED
sql/ha_innobase.h:
  New test for SIGNED/UNSIGNED
sql/ha_isam.h:
  New test for SIGNED/UNSIGNED
sql/ha_myisam.cc:
  New test for SIGNED/UNSIGNED
sql/ha_myisam.h:
  New test for SIGNED/UNSIGNED
sql/handler.h:
  New test for SIGNED/UNSIGNED
sql/item_func.cc:
  Cleanup TIMESPEC usage
sql/item_func.h:
  Added SIGNED / UNSIGNED casts
sql/lex.h:
  Added SIGNED / UNSIGNED casts
sql/mysqld.cc:
  Cleanup TIMESPEC usage
sql/net_pkg.cc:
  Cleanup
sql/net_serv.cc:
  Fixed core dump bug in net_clear()
sql/slave.cc:
  Cleanup
sql/sql_cache.cc:
  Back to using semaphores
sql/sql_cache.h:
  Back to using semaphores
sql/sql_insert.cc:
  Cleanup TIMESPEC usage
sql/sql_manager.cc:
  Cleanup TIMESPEC usage
sql/sql_parse.cc:
  Cleanup
sql/sql_repl.cc:
  Cleanup TIMESPEC usage
sql/sql_show.cc:
  Added 'Null' and 'Index_type' to SHOW INDEX.
sql/sql_table.cc:
  Sort keys in table in a more logical order.
sql/sql_yacc.yy:
  Support for SIGNED/UNSIGNED casts.
2002-01-02 21:29:41 +02:00
unknown
38e174cc59 Removed Heikki's changes to the manual that was meant for 4.0
configure.in:
  Update to 3.23.48
2002-01-02 14:12:37 +02:00
unknown
7e0fa9b69e Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
Docs/manual.texi:
  Auto merged
2002-01-02 13:52:01 +02:00
unknown
db528bfca5 Backport of mysqldump from 4.0
Docs/manual.texi:
  Cleanup
include/global.h:
  Portability fix
2002-01-02 13:50:31 +02:00
unknown
c7552758bc row0mysql.c:
Remove erroneous warning of a duplicate key when the key in a UNIQUE secondary index contains a NULL


innobase/row/row0mysql.c:
  Remove erroneous warning of a duplicate key when the key in a UNIQUE secondary index contains a NULL
2001-12-31 14:41:58 +02:00
unknown
3b84c77452 Merge heikki@work.mysql.com:/home/my/mysql
into donna.mysql.fi:/home/heikki/mysqlm


Docs/manual.texi:
  Auto merged
2001-12-30 21:17:50 +02:00
unknown
e7e0994e80 Minors changes for the Windows 3.23.47 release
mysys/my_bitmap.c:
  Eliminate unresolved external linkage for bzero
sql/sql_do.cc:
  Eliminate warning for unreferenced local variable
2001-12-30 00:22:01 -02:00
unknown
aa43a0595a manual.texi:
Make InnoDB startup option samples easier to understand, recommend not setting log files too big, because recovery slow


Docs/manual.texi:
  Make InnoDB startup option samples easier to understand, recommend not setting log files too big, because recovery slow
2001-12-27 20:17:49 +02:00
unknown
62b5dbf9fd btr0sea.c:
Eliminate a gcc compiler bug in inlining


innobase/btr/btr0sea.c:
  Eliminate a gcc compiler bug in inlining
2001-12-27 18:43:49 +02:00
unknown
5a7177fd46 Portability fix for SCO 2001-12-27 15:16:08 +02:00
unknown
31e8b48c2f Portability fixes
include/global.h:
  Portability fix for HPUX
sql/mysqld.cc:
  Add missing declaration.
2001-12-27 13:31:10 +02:00
unknown
14b7e7c97a Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2001-12-27 02:05:12 +02:00
unknown
aa3bce07ab Bugfix for WHERE key=@a OR key=@b
Docs/manual.texi:
  Changelog
sql/sql_select.cc:
  Cleanup
2001-12-27 02:04:27 +02:00
unknown
cb25ddd100 os0file.c:
Make os_file_flush to ignore the error we get from a raw device in fsync


innobase/os/os0file.c:
  Make os_file_flush to ignore the error we get from a raw device in fsync
2001-12-27 00:56:40 +02:00
unknown
1b6afd02b0 mysqld.cc:
Changed default of file_io_threads to 4 and lock_wait_timeout to 50 seconds
  Added a missing break: if not specified, innodb_fast_shutdown got the same value as ..flush_log_at_trx commit


sql/mysqld.cc:
  Changed default of file_io_threads to 4 and lock_wait_timeout to 50 seconds
2001-12-25 23:44:41 +02:00
unknown
42c224c388 log0recv.c:
Print progress info of the applying log records to the database phase in recovery
srv0srv.c:
  Do buffer pool flush and checkpoints more often to make recovery faster


innobase/srv/srv0srv.c:
  Do buffer pool flush and checkpoints more often to make recovery faster
innobase/log/log0recv.c:
  Print progress info of the applying log records to the database phase in recovery
2001-12-24 22:27:11 +02:00
unknown
c428e8073e ha_innobase.cc:
Increase table comment print size to 500 bytes to be able to print more foreign key constraint infos
ha_innobase.h:
  Change max key len back to 500 bytes because MySQL interpreter cannot handle more


sql/ha_innobase.h:
  Change max key len back to 500 bytes because MySQL interpreter cannot handle more
sql/ha_innobase.cc:
  Increase table comment print size to 500 bytes to be able to print more foreign key constraint infos
2001-12-23 13:06:48 +02:00
unknown
27f652efef Fixed test case after HANDLER CLOSE fix
mysql-test/mysql-test-run.sh:
  Safety fix
2001-12-23 03:03:09 +02:00
unknown
b5f5980497 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2001-12-23 02:44:28 +02:00
unknown
953ac1a5cf Limit created keys to MAX_KEY_LENGTH.
Fix problem with query cache and database names


mysql-test/mysql-test-run.sh:
  Portability fixes
mysql-test/r/query_cache.result:
  More tests when using different databases
mysql-test/t/query_cache.test:
  More tests when using different databases
sql-bench/test-wisconsin.sh:
  Portability fix
sql/sql_cache.cc:
  Fix problem with query cache and database names
sql/sql_parse.cc:
  Remove pre and end space in query.
sql/sql_table.cc:
  Limit created keys to MAX_KEY_LENGTH.
2001-12-23 02:43:46 +02:00
unknown
6ad422802b Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2001-12-22 19:13:53 +00:00
unknown
5a75207c12 data0type.ic, rem0cmp.c:
Allow foreign keys refer between fixed and var length strings


innobase/rem/rem0cmp.c:
  Allow foreign keys refer between fixed and var length strings
innobase/include/data0type.ic:
  Allow foreign keys refer between fixed and var length strings
2001-12-22 21:08:25 +02:00
unknown
4588c007c5 HANDLER CLOSE unknown table should produce an error
Docs/manual.texi:
  FreeBSD and News entries updated
2001-12-22 18:40:26 +00:00
unknown
f70786085b Fix compiler warning 2001-12-22 19:08:57 +02:00
unknown
3a5f66292d Merge hundin.mysql.fi:/my/mysql-3.23
into hundin.mysql.fi:/my/bk/mysql-4.0


sql/ha_innobase.cc:
  Auto merged
sql/ha_innobase.h:
  Auto merged
2001-12-22 15:47:23 +02:00
unknown
b24d5e4ef0 Fix for error message when using HANDLER OPEN on InnoDB tables.
mysql-test/r/innodb.result:
  Test that handler doesn't work with InnoDB
mysql-test/t/innodb.test:
  Test that handler doesn't work with InnoDB
2001-12-22 15:44:44 +02:00
unknown
6844ecca88 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
  Auto merged
2001-12-22 15:14:41 +02:00
unknown
9625a39ddd Fixed access privilege bug in query cache.
Change tests to use database 'mysqltest' instead of 'foo'
Add option to not print access denied messages to check_table_access()


Docs/manual.texi:
  Updated query cache information.
client/mysqltest.c:
  When connection to the database '*NO-ONE*, connect without specify a database.
include/raid.h:
  Portability fix
mysql-test/r/drop.result:
  Change test to use database 'mysqltest' instead of 'foo'
mysql-test/r/flush.result:
  Change test to use database 'mysqltest' instead of 'foo'
mysql-test/r/innodb.result:
  Change test to use database 'mysqltest' instead of 'foo'
mysql-test/r/query_cache.result:
  Change test to use database 'mysqltest' instead of 'foo'
mysql-test/t/drop.test:
  Change test to use database 'mysqltest' instead of 'foo'
mysql-test/t/flush.test:
  Change test to use database 'mysqltest' instead of 'foo'
mysql-test/t/innodb.test:
  Change test to use database 'mysqltest' instead of 'foo'
mysql-test/t/query_cache.test:
  Change test to use database 'mysqltest' instead of 'foo'
sql/mysql_priv.h:
  Add option to not print access denied messages
sql/net_pkg.cc:
  Fix for query cache
sql/net_serv.cc:
  Speed improvment
sql/sql_cache.cc:
  Fixed access privilege bug in query cache
sql/sql_cache.h:
  Always compiled with integrity check function prototypes.
sql/sql_do.cc:
  Removed warning
sql/sql_parse.cc:
  Add option to not print access denied messages
2001-12-22 15:13:31 +02:00
unknown
1b9930b1a8 ha_innobase.h:
Lower max key len to 3500 bytes because a secondary index record must also contain the primary key value


sql/ha_innobase.h:
  Lower max key len to 3500 bytes because a secondary index record must also contain the primary key value
2001-12-22 11:18:22 +02:00
unknown
474ed9fdfc ha_innobase.cc:
Make sure no memory overrun of key buffer in range estimation


sql/ha_innobase.cc:
  Make sure no memory overrun of key buffer in range estimation
2001-12-22 02:29:23 +02:00
unknown
36c20a7db7 manual.texi:
Update OLEDB section


Docs/manual.texi:
  Update OLEDB section
2001-12-22 00:58:09 +02:00
unknown
54108b2fce Merge
BitKeeper/etc/ignore:
  auto-union
sql/sql_handler.cc:
  Auto merged
Docs/manual.texi:
  SCCS merged
2001-12-21 13:38:06 +00:00
unknown
ad24c890ac HANDLER works only with MyISAM tables
HA_NO_FULLTEXT_KEY property -> HA_CAN_FULLTEXT


sql/ha_berkeley.h:
  HA_NO_FULLTEXT_KEY property -> HA_CAN_FULLTEXT
sql/ha_heap.h:
  HA_NO_FULLTEXT_KEY property -> HA_CAN_FULLTEXT
sql/ha_innobase.h:
  HA_NO_FULLTEXT_KEY property -> HA_CAN_FULLTEXT
sql/ha_isam.h:
  HA_NO_FULLTEXT_KEY property -> HA_CAN_FULLTEXT
sql/ha_isammrg.h:
  HA_NO_FULLTEXT_KEY property -> HA_CAN_FULLTEXT
sql/ha_myisammrg.h:
  HA_NO_FULLTEXT_KEY property -> HA_CAN_FULLTEXT
sql/sql_handler.cc:
  HANDLER works only with MyISAM tables
sql/sql_table.cc:
  HA_NO_FULLTEXT_KEY property -> HA_CAN_FULLTEXT
2001-12-21 13:28:51 +00:00
unknown
5478a2adb7 merge with 3.23.47
Docs/manual.texi:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
sql/mysqld.cc:
  Use local version.
2001-12-21 07:03:03 +02:00
unknown
9603291efd Cleanup of alarm macros.
Fixed data corruption bug in query cache.
Made queries be dependent of the database in use.


Docs/manual.texi:
  Update binary log reference
client/mysql.cc:
  Removed warning
include/thr_alarm.h:
  Cleanup of alarm macros.
libmysql/libmysql.c:
  Portabiliy fix
libmysql/net.c:
  Cleanup of alarm macros.
mysql-test/t/rpl_get_lock.test:
  Fixed results after merge.
mysys/my_bitmap.c:
  Removed warning.
sql/log_event.cc:
  Use thd->db_length
sql/mini_client.cc:
  Cleanup of alarm macros.
sql/net_serv.cc:
  Cleanup of alarm macros.
sql/sql_acl.cc:
  Use thd->db_length
sql/sql_cache.cc:
  Store used database together with the query.
sql/sql_class.cc:
  Use thd->db_length
sql/sql_class.h:
  Use thd->db_length
sql/sql_db.cc:
  Use thd->db_length
sql/sql_parse.cc:
  Use thd->db_length
sql/sql_udf.cc:
  Use thd->db_length
2001-12-21 07:00:58 +02:00
unknown
8ab263d18c Fixed shutdown problem on HPUX
Docs/manual.texi:
  Changelog
mysql-test/r/innodb.result:
  Update results after InnoDB optimizer changes.
2001-12-21 06:54:58 +02:00
unknown
9d9e0a08d7 row0ins.c:
Allow equal key values in a unique secondary index if the key value contains an SQL NULL


innobase/row/row0ins.c:
  Allow equal key values in a unique secondary index if the key value contains an SQL NULL
2001-12-20 22:45:07 +02:00
unknown
e506cef831 mysqldump now adds "ALTER TABLE ... DISABLE KEYS" to the dump
manual updated


Docs/manual.texi:
  mysqldump, News, Upgrading entires updated
client/mysqldump.c:
  "ALTER TABLE ... DISABLE KEYS" is added to the dump.
  Invisible spaces deleted :-)
2001-12-20 18:14:55 +00:00
unknown
a1b810cc4a log0recv.c:
Add warnings to recovery in some cases where log file might be corrupt and consequently recovery can be trusted less than normally


innobase/log/log0recv.c:
  Add warnings to recovery in some cases where log file might be corrupt and consequently recovery can be trusted less than normally
2001-12-20 20:00:39 +02:00
unknown
10863a3590 merge
mysql-test/t/rpl_get_lock.test:
  Auto merged
sql/ha_innobase.cc:
  Merge
sql/sql_parse.cc:
  Clean up comments
2001-12-20 13:52:04 +02:00
unknown
0af41d8ea3 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2001-12-20 06:14:50 +02:00
unknown
c23e5a830c Fix insert delated + query cache.
Fix pthread_mutex_trylock on HPUX (needed for query cache).


include/my_pthread.h:
  Fixed mutex problem with pthread_mutex_trylock on HPUX.
mysql-test/mysql-test-run.sh:
  Wait for .pid file instead of .sock, because .pid is created later.
mysql-test/r/query_cache.result:
  Test insert delated + query cache
mysql-test/t/query_cache.test:
  Test insert delated + query cache
mysys/my_pthread.c:
  Fixed mutex problem with pthread_mutex_trylock on HPUX.
sql/repl_failsafe.cc:
  Safety
sql/sql_insert.cc:
  Fix insert delated + query cache
2001-12-20 06:14:11 +02:00
unknown
eada6ed9a6 Some Query Cache fixups.
Added info about two new Query Cache status variables.
2001-12-20 10:44:17 +10:00
unknown
7a8ce13128 Fixed a bug in mail_to_db.pl
tests/mail_to_db.pl:
  Fixed a bug in mail_to_db.pl; the program got confused by carriage
  return, if existed at the end of a line.
2001-12-19 22:40:17 +02:00
unknown
6a39d321ed mysql_fix_extensions added
BitKeeper/etc/ignore:
  Added scripts/mysql_fix_extensions to the ignore list
scripts/mysql_fix_extensions.sh:
  typo fixed
2001-12-19 16:15:31 +00:00
unknown
9f57d97fb2 Fixed bug in FLUSH QUERY CACHE
Changed 'send_file_to_server' to use less stack (Fixed replication problem on OSF1).


Docs/manual.texi:
  Changelog
libmysql/libmysql.c:
  Changed 'send_file_to_server' to use less stack (Fixed some problems in threaded applications)
mysql-test/mysql-test-run.sh:
  Fixed --sleep option
sql/mini_client.cc:
  Changed 'send_file_to_server' to use less stack (Fixed replication problem on OSF1).
sql/mysqld.cc:
  Destroy query cache properly
sql/sql_cache.cc:
  Fixed bug in FLUSH QUERY CACHE
2001-12-19 15:45:04 +02:00
unknown
836c5cac84 make replication work correctly if the master logs SELECT RELEASE_LOCK()
instead of DO RELEASE_LOCK()


mysql-test/t/rpl_get_lock.test:
  test for SELECT RELEASE() replication bug
2001-12-18 21:56:36 -07:00
unknown
dea21438b4 Merge work:/home/bk/mysql into mysql.sashanet.com:/reiser-data/mysql 2001-12-18 19:54:48 -07:00
unknown
97ea3b3807 temp commit 2001-12-18 19:53:56 -07:00