Commit graph

4833 commits

Author SHA1 Message Date
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
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
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
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
unknown
aaa3075c9e Added missing nodes to InnoDB section 2002-09-13 01:08:03 +03:00
unknown
f3d5cb8b6a opt_range.cc:
Fix the crash in InnoDB when WHERE primarykey < x ORDER BY primarykey is used


sql/opt_range.cc:
  Fix the crash in InnoDB when WHERE primarykey < x ORDER BY primarykey is used
2002-09-12 01:57:45 +03:00
unknown
36cb35932f manual.texi fix mangled sentence (pointed out by Egor).
Docs/manual.texi:
  fix mangled sentence (pointed out by Egor).
2002-09-11 13:15:35 -05:00
unknown
4390ecd2c2 manual.texi formatting cleanups.
Docs/manual.texi:
  formatting cleanups.
2002-09-11 09:52:57 -05:00
unknown
b280017496 fixup after merge 2002-09-11 15:07:06 +03:00
unknown
26bf87c939 Merge with 3.23.53
Build-tools/Do-compile:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
innobase/trx/trx0undo.c:
  Auto merged
sql/ha_innodb.h:
  Auto merged
Docs/manual.texi:
  merge
sql/ha_innodb.cc:
  merge
sql/mysqld.cc:
  merge
2002-09-11 14:49:38 +03:00
unknown
d221f3ff17 merge
mysys/thr_alarm.c:
  Auto merged
sql/sql_table.cc:
  Auto merged
Docs/manual.texi:
  merge (Removed bug fix comments for not relesed version)
2002-09-11 06:44:45 +03:00
unknown
8f232cb75f Portability fixes.
Improve mysql-test to be more robust.
Fix that GRANT doesn't delete SSL options
Change innobase_flush_log_at_trx_commit to uint.
Don't rotate logs if we read a rotate log entry from the master.


Docs/manual.texi:
  Changelog
client/mysqlbinlog.cc:
  Handle empty binlogfiles gracefully
client/mysqltest.c:
  Do a sleep after 'sync_with_master'
  Cleaned up sleep() handling.
  Free all memory on exit
configure.in:
  Fix for Mac OS 10.2
include/my_sys.h:
  Added my_strdup_with_length()
innobase/btr/btr0cur.c:
  Fixed wrong printf()
libmysql/libmysql.c:
  Added DBUG_PRINT statements.
  Assume that mysql_...send() functions has correct query length.
mysql-test/mysql-test-run.sh:
  Properly remove log files before starting new tests.
mysql-test/r/grant.result:
  Update for new test results
mysql-test/r/innodb.result:
  Update for new test results
mysql-test/r/myisam.result:
  Update for new test results
mysql-test/r/rpl_log.result:
  Update for new test results
mysql-test/r/rpl_rotate_logs.result:
  Update for new test results
mysql-test/r/variables.result:
  Update for new test results
mysql-test/t/grant.test:
  Test that GRANT doesn't delete SSL options
mysql-test/t/myisam.test:
  Test long key usage
mysql-test/t/rpl_log.test:
  Disable 'show new master'
mysql-test/t/rpl_mystery22.test:
  Longer sleep for more safety.
mysql-test/t/rpl_rotate_logs.test:
  More comments
mysys/my_malloc.c:
  Added my_strdup_with_length()
mysys/safemalloc.c:
  Added my_strdup_with_length()
mysys/thr_alarm.c:
  Fix of alarms for windows.
sql/ha_innodb.cc:
  Change innobase_flush_log_at_trx_commit to uint
mysql-test/r/rpl_redirect.result:
  Updated test results
mysql-test/t/rpl_redirect.test:
  Added more tests to improve code coverage.
sql/ha_innodb.h:
  Change innobase_flush_log_at_trx_commit to uint
sql/item_func.cc:
  Return GLOBAL and SESSION as part of column names
sql/log.cc:
  Only write STOP events when server goes down.
sql/log_event.cc:
  Don't rotate logs if we read a rotate log entry from the master.
sql/log_event.h:
  Change ident_len to uint (more efficient)
sql/mysqld.cc:
  Change innobase_flush_log_at_trx_commit to uint
sql/net_serv.cc:
  More debug output
sql/repl_failsafe.cc:
  More DEBUG
  Search until we find next position in binary log (and not only =)
sql/slave.cc:
  More DBUG & comments
  Don't rotate the binary log on master flush logs
sql/slave.h:
  indentation change
sql/sql_acl.cc:
  Test that GRANT doesn't delete SSL options
sql/sql_parse.cc:
  Disable show_new_master.
sql/sql_repl.cc:
  Chamger show_binlog_events() to use my_error()
sql/sql_table.cc:
  Fixed check for too long keys in MyISAM
sql/sql_udf.cc:
  Fix udf handling
2002-09-11 06:40:08 +03:00
unknown
f30b0eaced changelog 2002-09-10 23:47:30 +02:00
unknown
e9456433ed Merge work:/home/bk/mysql-4.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-09-10 23:41:00 +02:00
unknown
80bc840f53 max_key_length MyISAM bugfix
myisam/mi_create.c:
  check for MI_MAX_KEY_LENGTH in mi_create()
sql/sql_table.cc:
  fix obvious typo
2002-09-10 21:40:01 +02:00
unknown
33a30d002a manual.texi British-ise some -ize words
manual.texi	formatting fixups


Docs/manual.texi:
  British-ise some -ize words
2002-09-10 14:33:22 -05:00
unknown
a106f9ea43 bugfix: DISTINCT with const_item in ORDER BY 2002-09-10 19:23:59 +00:00
unknown
6a06c4c534 Fixed changelog 2002-09-10 20:56:38 +03:00
unknown
393315dd59 ha_innobase.cc:
Cleanup after last push


sql/ha_innobase.cc:
  Cleanup after last push
2002-09-10 14:31:46 +03:00
unknown
da74720bb2 mysqld.cc:
update help innobase_flush_log_at_trx_commitcan have vals 0, 1, 2 
ha_innobase.h, ha_innobase.cc:
  make innobase_flush_log_at_trx_commit a long, like other params


sql/ha_innobase.cc:
  make innobase_flush_log_at_trx_commit a long, like other params
sql/ha_innobase.h:
  make innobase_flush_log_at_trx_commit a long, like other params
sql/mysqld.cc:
  update help innobase_flush_log_at_trx_commitcan have vals 0, 1, 2
2002-09-10 14:23:46 +03:00
unknown
040c163012 os0file.c:
Fix a typo: should be buf_page_print


innobase/os/os0file.c:
  Fix a typo: should be buf_page_print
2002-09-10 13:06:14 +03:00
unknown
c58354509a syntactic error.. 2002-09-10 12:36:19 +05:00
unknown
f83da86bd2 ha_innobase.cc, ha_innobase.h:
innodb_flush_log_at_trx_commit can have values 0, 1, 2 starting from 3.23.52


sql/ha_innobase.h:
  innodb_flush_log_at_trx_commit can have values 0, 1, 2 starting from 3.23.52
sql/ha_innobase.cc:
  innodb_flush_log_at_trx_commit can have values 0, 1, 2 starting from 3.23.52
2002-09-10 00:52:26 +03:00
unknown
d9d6d4b0e7 fix bug for slave..
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-09-09 14:40:24 +05:00
unknown
781f508273 trx0undo.c:
Remove an assertion in trx0undo.c which could erroneously fail when we ran out of tablespace


innobase/trx/trx0undo.c:
  Remove an assertion in trx0undo.c which could erroneously fail when we ran out of tablespace
2002-09-09 02:12:57 +03:00
unknown
fb7769dedb sync0arr.c:
Increase max latch wait time to 600 seconds before we assert


innobase/sync/sync0arr.c:
  Increase max latch wait time to 600 seconds before we assert
2002-09-08 03:04:39 +03:00
unknown
fab80610af btr0cur.c:
Remove long latch hold which happened if we scanned long an index without finding any record visible to the current consistent read


innobase/btr/btr0cur.c:
  Remove long latch hold which happened if we scanned long an index without finding any record visible to the current consistent read
2002-09-08 03:01:53 +03:00
unknown
94bbbc7f36 os0sync.c:
Add diagnostics to track why a semaphore creation failed on Windows ME


innobase/os/os0sync.c:
  Add diagnostics to track why a semaphore creation failed on Windows ME
2002-09-08 00:21:13 +03:00
unknown
d857c6943b srv0srv.c:
The option (= default) innodb_fast_shutdown did not always make the shutdown quickly, fix that


innobase/srv/srv0srv.c:
  The option (= default) innodb_fast_shutdown did not always make the shutdown quickly, fix that
2002-09-07 23:37:27 +03:00
unknown
7e173bf3d3 Merge mysql.com:/home/pz/mysql/mysql-4.0-root
into mysql.com:/home/pz/mysql/mysql-4.0
2002-09-06 13:02:38 +04:00
unknown
41d0aee06e - Fixed changelog typo in manual.texi
Docs/manual.texi:
   - Fixed typo in Changelog
2002-09-06 01:10:28 +02:00
unknown
d99cab040c Merge
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
Docs/manual.texi:
  SCCS merged
2002-09-05 17:17:22 +03:00
unknown
60d9eb9072 Merge work:/home/bk/mysql-4.0 into rescue.:/my/bk/mysql-4.0
BitKeeper/etc/logging_ok:
  auto-union
sql/ha_innodb.cc:
  Auto merged
2002-09-05 17:17:21 +03:00
unknown
0523910ac4 Fixed typo in Heikkis last push.
mysql-test/r/innodb.result:
  Fixed Innodb results after Heikki's last push
sql/ha_innodb.cc:
  Fixed type in Heikki's last push
2002-09-05 17:10:18 +03:00
unknown
8f2482d283 Fixed searching after ssl directories.
Fixed that GRANT ... REQUIRE options are not forgot when doing new GRANT
Changed fn_ext to point at first '.' after directory.
FLUSH LOGS removed numerical extension for all future update logs.
Fixed the mysqld --help reports right values for --datadir and --bind-address
--log-binary=a.b.c now properly strips of .b.c
Fix that one can DROP UDF functions that was not loaded at startup
Made AND optional in REQUIRE
Added REQUIRE NONE


BitKeeper/deleted/.del-CodingStyle~1ba7ff62d4cd0ea:
  Delete: vio/docs/CodingStyle
BitKeeper/deleted/.del-COPYING.dbug~ca0c017a4d7e8609:
  Delete: vio/docs/COPYING.dbug
BitKeeper/deleted/.del-COPYING.mysql~471498c82977cd3a:
  Delete: vio/docs/COPYING.mysql
BitKeeper/deleted/.del-README~947354991dc882f8:
  Delete: vio/docs/README
Docs/manual.texi:
  Changelog
acinclude.m4:
  Fixed searching after ssl directories.
client/Makefile.am:
  Moved openssl include to avoid problem with installed readline
include/Makefile.am:
  Install my_global.h
include/violite.h:
  Fixed that GRANT ... REQUIRE options are not forgot when doing new grant
libmysqld/examples/Makefile.am:
  Moved openssl include to avoid problem with installed readline
mysql-test/mysql-test-run.sh:
  Improved 'which' handling to give error if command is not found
mysys/mf_fn_ext.c:
  Changed fn_ext to point at first '.' after directory.
sql/Makefile.am:
  More comments
sql/lex.h:
  Added NONE as keyword
sql/log.cc:
  FLUSH LOGS removed numerical extension for all future update logs.
  Simple code cleanup
sql/mysqld.cc:
  Fixed the --help reports right values for --datadir and --bind-address
  --log-binary=a.b.c now properly strips of .b.c
  Removed option --skip-external-locking (not needed as this is automatic)
sql/repl_failsafe.cc:
  Moved some common THD initalization to store_globals()
sql/slave.cc:
  Moved openssl include to avoid problem with installed readline
sql/sql_acl.cc:
  Moved openssl include to avoid problem with installed readline
sql/sql_acl.h:
  Updated function prototypes
sql/sql_base.cc:
  Added comment
sql/sql_class.cc:
  Moved openssl include to avoid problem with installed readline.
  Changed THD::thd to make things work for main thread.
sql/sql_class.h:
  Fixed wrongly removed line (fixes compiler problem on MacOSX)
sql/sql_insert.cc:
  Moved openssl include to avoid problem with installed readline
sql/sql_lex.cc:
  Moved save_to_cache_query=0 to udf detection function to make sql_yacc.yy simpler
sql/sql_lex.h:
  Indentation cleanup
sql/sql_parse.cc:
  Moved openssl include to avoid problem with installed readline.
  Added THD argument to acl_reload()
sql/sql_repl.h:
  Made opt_bin_logname static
sql/sql_udf.cc:
  Fix that one can DROP UDF functions that was not loaded at startup
sql/sql_yacc.yy:
  made AND optional in REQUIRE
  Added REQUIRE NONE
  Fixed that old SSL options are not forgotten when doing new GRANT.
sql/udf_example.cc:
  Improved comments
2002-09-05 16:17:08 +03:00
unknown
c37aa34aa0 Fixed a bug in my_getopt and mysqld.cc 2002-09-05 14:22:52 +03:00
unknown
e56ad0cf61 ha_innodb.cc:
Fix a typo in last night's push


sql/ha_innodb.cc:
  Fix a typo in last night's push
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-09-05 14:22:51 +03:00
unknown
d43ba827ed Merge work:/home/bk/mysql-4.0 into rescue.:/my/bk/mysql-4.0
BitKeeper/etc/logging_ok:
  auto-union
2002-09-05 14:00:05 +03:00
unknown
54e6652e48 Extend InnoDB key length to 1024
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-09-05 13:47:41 +03:00
unknown
ba1bf648b7 Merge mysql.com:/home/pz/mysql/mysql-4.0-root
into mysql.com:/home/pz/mysql/mysql-4.0
2002-09-05 12:11:12 +04:00
unknown
a7ef648c96 Tweaks by Zak. 2002-09-05 11:45:04 +10:00