1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-09 11:41:36 +03:00
Commit Graph

19274 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
29e9750ad9 ha_innobase.cc:
Add better instructions on how to specify innodb_data_file_path etc.


sql/ha_innobase.cc:
  Add better instructions on how to specify innodb_data_file_path etc.
2001-12-18 19:35:28 +02:00
unknown
e4921f2159 Fix after merge
BitKeeper/etc/ignore:
  Added libmysqld/sql_do.cc to the ignore list
include/m_string.h:
  Fix for purify
libmysql/Makefile.shared:
  Fix for purify
libmysqld/Makefile.am:
  Fix for purify
sql/sql_handler.cc:
  Cleanup
2001-12-17 23:24:51 +02:00
unknown
11cbe4271c merge with 3.23.47 (DO statement)
innobase/dict/dict0dict.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
Docs/manual.texi:
  merge
sql/Makefile.am:
  merge
sql/mysql_priv.h:
  merge
sql/sql_lex.h:
  merge
sql/sql_yacc.yy:
  merge
2001-12-17 20:47:20 +02:00
unknown
621be521f8 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2001-12-17 19:59:59 +02:00
unknown
1808d80fb3 Added DO command
Docs/manual.texi:
  ChangeLog
sql/gen_lex_hash.cc:
  Safety fix
2001-12-17 19:59:20 +02:00
unknown
1af1c70d71 Portability fixes
include/my_pthread.h:
  Fix for HPUX
mysql-test/mysql-test-run.sh:
  Wait for socket instead of pid file
mysys/my_static.c:
  Portability fix (for OSF1)
mysys/raid.cc:
  Portability fix (for OSF1)
sql/mysqld.cc:
  Fixed typo for FreeBSD.
strings/bcmp.c:
  Fix for purify
2001-12-17 15:00:14 +02:00
unknown
d7bd586873 ha_innobase.cc, dict0dict.c:
Cleanup


innobase/dict/dict0dict.c:
  Cleanup
sql/ha_innobase.cc:
  Cleanup
2001-12-17 13:32:22 +02:00
unknown
56a8ad593e ha_innobase.cc:
Do not automatically calculate new statistics when a temporary table is used by MySQL in a query. The fact that some ORDER BY queries were slow may have been explained by this unnecessary statistics calculation.


sql/ha_innobase.cc:
  Do not automatically calculate new statistics when a temporary table is used by MySQL in a query. The fact that some ORDER BY queries were slow may have been explained by this unnecessary statistics calculation.
2001-12-17 12:17:07 +02:00
unknown
10b89ff5e7 Don't use symlinks when using HAVE_purify.
Fix compile problem in sql_cache.cc


sql/mysqld.cc:
  Don't use symlinks if you are using HAVE_purify
sql/sql_cache.cc:
  Don't call bins_dump() when not debugging.
2001-12-17 04:16:10 +02:00
unknown
8f05035c27 Lots of portability fixes.
Fixed shutdown on HPUX.
Fixed bug in query cache.


Docs/manual.texi:
  Changelog
configure.in:
  Fixes for HPUX
include/m_string.h:
  Fixes for Purify
include/my_pthread.h:
  Fixes for HPUX
include/raid.h:
  Portability fix.
innobase/include/univ.i:
  Portability fix.
mysql-test/mysql-test-run.sh:
  Added --manual-gdb
mysql-test/r/rpl_log.result:
  Portability fix
mysql-test/t/rpl_log.test:
  Portability fix
mysys/my_pthread.c:
  Portability fix (HPUX)
mysys/raid.cc:
  Portability fix
mysys/thr_mutex.c:
  Portability fix
scripts/mysql_install_db.sh:
  Clean up install message
sql-bench/test-alter-table.sh:
  Fix testsuite
sql/ha_innobase.cc:
  Fixed stack overwrite.
sql/log_event.cc:
  Fixed purify warning
sql/mysqld.cc:
  Added patch from FreeBSD port.
  Fixed shutdown on HPUX.
sql/slave.cc:
  Cleanup
sql/sql_cache.cc:
  Binary search in 'step' searching
  Check maximal block in bin
  Limit of comparasions number in list of memory blocks.
  Fixed bug in pack()
sql/sql_cache.h:
  Binary search in 'step' searching
  Check maximal block in bin
  Limit of comparasions number in list of memory blocks.
  Fixed bug in pack()
sql/sql_parse.cc:
  Optimize
tools/mysqlmanager.c:
  Portability fix
2001-12-17 03:02:58 +02:00
unknown
565e5cc71d freebsd fix for openssl
horrible bug fixed


mysql-test/r/fulltext_multi.result:
  Change mode to -rw-rw-r--
mysql-test/r/fulltext_order_by.result:
  Change mode to -rw-rw-r--
mysql-test/r/fulltext_update.result:
  Change mode to -rw-rw-r--
mysql-test/r/fulltext_var.result:
  Change mode to -rw-rw-r--
mysql-test/r/bulk_replace.result:
  Change mode to -rw-rw-r--
mysql-test/r/handler.result:
  Change mode to -rw-rw-r--
include/my_global.h:
  FreeBSD fix for openssl
myisam/ft_static.c:
  some boolean search operators added
sql/sql_parse.cc:
  fixed horrible bug that makes mysqld CRASH when mysql client is started
2001-12-15 21:39:26 +01:00
unknown
b63538f1f5 Last changes after merge with 3.23.47
libmysqld/lib_sql.cc:
  Fix for new bitmap
mysql-test/r/rpl_get_lock.result:
  Fix results after merge
mysql-test/r/rpl_skip_error.result:
  Fix results after merge
sql/log_event.cc:
  Finish merge of slave.cc
sql/slave.cc:
  Finish merge
2001-12-15 06:00:01 +02:00
unknown
63e4dec244 Merge with 3.23.47
extra/resolve_stack_dump.c:
  Auto merged
include/my_bitmap.h:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
mysql-test/t/rpl_get_lock.test:
  Auto merged
2001-12-15 05:12:21 +02:00
unknown
f8b4629cf7 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
sql/mysqld.cc:
  Auto merged
2001-12-15 04:40:08 +02:00
unknown
1f39a9295a Fixed wrong case in variablename 2001-12-15 04:39:29 +02:00
unknown
c03330d584 Removed not used functions from sql_cache
Added new tests to testsuite.


extra/resolveip.c:
  Portabilit fix.
mysql-test/create-test-result:
  Fix for new mysql-test-run
mysql-test/r/query_cache.result:
  Updated benchmarks
mysql-test/t/query_cache-master.opt:
  Updated benchmarks
mysql-test/t/query_cache.test:
  Updated benchmarks
sql/sql_cache.cc:
  Removed not used functions
sql/sql_cache.h:
  Removed not used functions
2001-12-14 16:02:41 +02:00
unknown
601b545eed misc cleanup
Docs/manual.texi:
  fixed bad merge
include/my_bitmap.h:
  fixed comment format
mysql-test/r/rpl_get_lock.result:
  make the test results predicable
mysql-test/t/rpl_get_lock.test:
  predicatable test results
mysys/my_bitmap.c:
  do not init/destroy mutex if bitmap is not declared thread safe
sql/slave.cc:
  clean-up suggested by Monty to make init_slave_skip_errors() more compact
2001-12-13 17:21:04 -07:00
unknown
4577aac40b Always compile rPM's with --enable-thread-safe-client
sql-bench/bench-init.pl.sh:
  Add new options.
sql/mysqld.cc:
  Fix --des-key-file
support-files/mysql.spec.sh:
  Always compile with --enable-thread-safe-client
2001-12-13 23:57:55 +02:00
unknown
961f7be52f merged
sql/mysqld.cc:
  Auto merged
2001-12-13 13:17:19 -07:00
unknown
d3d30c0145 Fix that SHOW STATUS works with SSL.
Add 4.0 commands to SHOW STATUS.


Docs/manual.texi:
  Cleanup
mysql-test/r/innodb.result:
  Fixe results
sql/mysqld.cc:
  Add commands unique for 4.0
sql/sql_lex.h:
  Cleanup
sql/sql_parse.cc:
  Cleanup
sql/sql_show.cc:
  Fix that SHOW STATUS works with SSL.
sql/sql_yacc.yy:
  Cleanup
2001-12-13 22:03:09 +02:00
unknown
6e31c2ca7d merge
innobase/btr/btr0cur.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
Docs/manual.texi:
  Merge
2001-12-13 20:54:20 +02:00
unknown
e12119dcc4 Added status variables for all MySQL commands.
Docs/manual.texi:
  Changelog
2001-12-13 20:06:44 +02:00
unknown
c0de7ffcc8 Fixed problem with default & InnoDB tables.
Docs/manual.texi:
  ChangeLog
2001-12-13 19:06:14 +02:00
unknown
a63ecdd3b1 Added FLUSH DES_KEY_FILE.
New HEX() function.
Final (?) cleanup of des_encrypt() / des_decrypt().
Added missing files to Makefiles.


Docs/Makefile.am:
  Add missing files
Docs/manual.texi:
  Added information about HEX() and des_encrypt() / des_decrypt().
include/mysql_com.h:
  Added FLUSH DES_KEY_FILE
myisam/ft_update.c:
  Removed compiler warnings
mysql-test/mysql-test-run.sh:
  Fixes needed for des_key tests.
mysql-test/r/func_crypt.result:
  Moved crypt test from func_str to func_crypt
mysql-test/r/func_encrypt.result:
  Moved crypt test from func_str to func_crypt
mysql-test/r/func_str.result:
  Moved crypt test from func_str to func_crypt
mysql-test/t/func_crypt.test:
  Moved crypt test from func_str to func_crypt
mysql-test/t/func_encrypt.test:
  New tests
mysql-test/t/func_str.test:
  Moved crypt test from func_str to func_crypt
sql/des_key_file.cc:
  Changes needed for FLUSH DES_KEY_FILE
sql/item_create.cc:
  New HEX() function
sql/item_strfunc.cc:
  Changes needed for FLUSH DES_KEY_FILE
sql/item_strfunc.h:
  New HEX() function
sql/item_timefunc.cc:
  cleanup
sql/lex.h:
  FLUSH DES_KEY_FILE
sql/mysql_priv.h:
  FLUSH DES_KEY_FILE
sql/mysqld.cc:
  FLUSH DES_KEY_FILE
sql/sql_parse.cc:
  Cleanup sql_yacc.yy
sql/sql_yacc.yy:
  Cleanup sql_yacc.yy
2001-12-13 15:53:18 +02:00
unknown
623eedda26 slave-skip-errors
added extra/mysql_install.c - will work on it in 4.0, but it does not hurt
to have it sit in 3.23 tree for now since it will eventually be backported 
to 3.23 anyway 


Docs/manual.texi:
  documented slave-skip-errors
  updated change history
extra/resolve_stack_dump.c:
  fixed wrong help message
include/my_bitmap.h:
  bitmap code updates
mysql-test/r/rpl_get_lock.result:
  test for a possible bug in release_lock() replication
mysql-test/t/rpl_get_lock.test:
  test for possible bug in release_lock replication
mysys/my_bitmap.c:
  bitmap code updates/clean-up
sql/mysqld.cc:
  slave-skip-errors
sql/slave.cc:
  slave-skip-errors
sql/slave.h:
  slave skip errors
2001-12-12 18:55:33 -07:00
unknown
1ad683a4ff Fixes for des_crypt functions.
sql/Makefile.am:
  Added missing header file
sql/des_key_file.cc:
  Fixed compiler errors
sql/item_strfunc.cc:
  Fixed compiler errors
sql/lex.h:
  Portablity fix
sql/mysql_priv.h:
  Fixed wrong type
sql/sql_yacc.yy:
  Portablity fix
2001-12-13 03:36:36 +02:00
unknown
33a096829b Fixed sleep time in mysql-test-run
Fixed bug in query cache.
Cleaned up des_crypt code.


BitKeeper/deleted/.del-fsck.mysql~87170d4358b50d60:
  Delete: fs/fsck.mysql
Docs/manual.texi:
  Changed != to <>
mysql-test/mysql-test-run.sh:
  Fix sleep times to take into account creation of InnoDB tables.
mysql-test/r/group_by.result:
  More tests
mysql-test/r/query_cache.result:
  More tests
mysql-test/r/union.result:
  More tests
mysql-test/t/func_str.test:
  Fix for FreeBSD
mysql-test/t/query_cache.test:
  More tests
mysql-test/t/union.test:
  More tests
mysys/my_winsem.c:
  Cleanup comments
sql/des_key_file.cc:
  Cleanup des_crypt code
sql/item_strfunc.cc:
  Cleanup des_crypt code
sql/item_strfunc.h:
  Cleanup des_crypt code
sql/mysql_priv.h:
  Cleanup des_crypt code
sql/mysqld.cc:
  Cleanup des_crypt code
sql/sql_acl.cc:
  For for GRANT and lower-case-table names
sql/sql_cache.cc:
  Function for integrity checking.
  Fixed bug when merging blocks.
sql/sql_cache.h:
  Function for integrity checking.
sql/sql_delete.cc:
  Cleanup
sql/sql_parse.cc:
  For for GRANT and lower-case-table names
sql/sql_union.cc:
  Cleanup & fixed bug in LIMIT handling
sql/sql_yacc.yy:
  C
2001-12-13 02:31:19 +02:00
unknown
f0f71accfc Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2001-12-11 20:47:07 +02:00
unknown
72ec7dfc65 Fix for MyISAM records > 16M
Docs/manual.texi:
  ChangeLog
innobase/os/os0file.c:
  Removed compiler warnings
myisam/mi_check.c:
  Fix for records > 16M
myisam/mi_dynrec.c:
  Fix for records > 16M
myisam/myisamdef.h:
  Fix for records > 16M
sql/sql_select.cc:
  Cleanup
sql/sql_yacc.yy:
  F
2001-12-11 20:45:48 +02:00
unknown
270976699c merge
Docs/manual.texi:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
sql/stacktrace.c:
  Auto merged
mysql-test/r/group_by.result:
  To be corrected..
2001-12-10 19:20:54 +02:00
unknown
315b8991e3 Portability fixes.
Changed mysql-test-run.sh to test for files to get shorter, more reliable timeouts.


Docs/manual.texi:
  Cleaned up SET PASSWORD stuff
client/mysqltest.c:
  Do more retrys
mysql-test/mysql-test-run.sh:
  Test for files to get shorter timeouts
mysql-test/r/query_cache.result:
  Portability fix
mysql-test/t/query_cache.test:
  Portability fix
sql/sql_cache.cc:
  Safety fix
2001-12-10 18:16:51 +02:00
unknown
2d1e16eb04 Fixed bug in GROUP BY ... DESC
Docs/manual.texi:
  Changelog
libmysql/libmysql.c:
  Fixed bug with mysql_use_result() when mysql_query() is called before mysql_free_result().
mysql-test/r/group_by.result:
  New tests
mysql-test/t/group_by.test:
  New tests
sql/stacktrace.c:
  Fix for SCO
2001-12-10 17:51:07 +02:00
unknown
d71c2b60ee --des-key-file functinality added
sql/mysqld.cc:
  Fixed coding standard miss
  --des-key-file functinality added
sql/sql_yacc.yy:
  Removed unused function variants
2001-12-10 11:02:26 +02:00