Commit graph

8195 commits

Author SHA1 Message Date
unknown
68aa31f268 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0


sql/mysql_priv.h:
  Auto merged
2003-05-19 12:02:11 +03:00
unknown
18dd37b8a1 Added option --read-only (Thanks to Markus Benning)
myisam/myisamchk.c:
  Removed warning from fulltext when repairing many tables with fulltext index
sql/init.cc:
  Remove not used variables
sql/mysql_priv.h:
  Remove not used variables
sql/mysqld.cc:
  Removed not used variables
  Added option --read-only
  Change opt_do_pstack and master_ssl to get them to work with my_getopt
sql/set_var.cc:
  Option --read-only
sql/sql_parse.cc:
  Option --read-only
2003-05-19 12:01:38 +03:00
unknown
7c189b0dcf Fix for when compiling with HAVE_ISAM enabled 2003-05-19 11:53:42 +03:00
unknown
2dd3c9298a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1


sql/mysqld.cc:
  Auto merged
2003-05-19 11:09:46 +03:00
unknown
6832b0a9c2 Add empty() function for baselist.
sql/mysqld.cc:
  Simple cleanup
2003-05-19 11:09:24 +03:00
unknown
c2c0e70ffe srv0start.c:
Better instructions for the user if adding of new ibdata files fails


innobase/srv/srv0start.c:
  Better instructions for the user if adding of new ibdata files fails
2003-05-18 21:46:19 +03:00
unknown
bdf002d963 buf0buf.c:
When calculating the buf pool dirty pages ratio, add also free pages to the LRU list length: no need to active flushing if there are lots of free pages in the buffer pool


innobase/buf/buf0buf.c:
  When calculating the buf pool dirty pages ratio, add also free pages to the LRU list length: no need to active flushing if there are lots of free pages in the buffer pool
2003-05-17 16:23:46 +03:00
unknown
da737d143a LOCAL is an alias of NO_WRITE_TO_BINLOG 2003-05-16 15:28:17 +02:00
unknown
e4a95f2914 buf0lru.c, buf0flu.c, buf0buf.c, buf0lru.h:
Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush
trx0trx.c:
  Add forgotten return value (it was not used anywhere, fortunately)
ha_innodb.h, mysql_priv.h:
  Move declaration of srv_buf_pool_max_modified_pct to ha_innodb.h and enclose it to denote it is a C variable, not C++


sql/mysql_priv.h:
  Move declaration of srv_buf_pool_max_modified_pct to ha_innodb.h and enclose it to denote it is a C variable, not C++
sql/ha_innodb.h:
  Move declaration of srv_buf_pool_max_modified_pct to ha_innodb.h and enclose it to denote it is a C variable, not C++
innobase/trx/trx0trx.c:
  Add forgotten return value (it was not used anywhere, fortunately)
innobase/include/buf0lru.h:
  Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush
innobase/buf/buf0buf.c:
  Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush
innobase/buf/buf0flu.c:
  Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush
innobase/buf/buf0lru.c:
  Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush
2003-05-16 16:27:50 +03:00
unknown
d57d45bb10 - re-enabled RAID support for the Max subpackage again 2003-05-16 13:36:13 +02:00
unknown
71df0f640a my_global.h:
- QNX 6.2.1 actually defines HAVE_RINT
  - fixed rint(A) #define as it was causing compile errors on QNX


include/my_global.h:
  - QNX 6.2.1 actually defines HAVE_RINT
  - fixed rint(A) #define as it was causing compile errors on QNX
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-05-16 13:03:47 +02:00
unknown
80c1556a8f changes to mysqladmin : use queries instead of commands (so that they have a chance to go
into the binlog), SLAVE START -> START SLAVE, error test changes.


client/mysqladmin.c:
  Now that FLUSH TABLES and some other FLUSH go into the binlog, the same commands
  issued from mysqladmin should also go into the binlog. How could I explain to
  a user that "mysql -e 'flush tables'" is not exactly the same as "mysqladmin
  flush-tables" ?? So I replace mysql_refresh() by mysql_query().
  Also SLAVE START -> START SLAVE to make this work with 4.1 (it won't work with
  3.23 anymore).
  Also the code tested for mysql_refresh() < 0 for errors, but this cannot happen :
  - mysql_refresh() calls simple_command()
  - in 4.1 the return type of simple_command() is my_bool, and I have checked the 4.1 libmysql
  code and it returns 0 or 1, not negative values.
  - note that in 4.0 libmysql, simple_command() returns int which can be < 0, but we don't
  care here as we link the 4.1 mysqladmin with the 4.1 libmysql.
  Btw, some other parts of the code already checked
  for mysql_refresh() != 0, not < 0. So now it's homogenous : we always test for != 0
  instead of < 0.
2003-05-15 23:00:58 +02:00
unknown
ddabd51c57 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-05-15 18:36:29 +02:00
unknown
ec72bda592 Scrum task 845. Thi is a behaviour change :
now by default, FLUSH, OPTIMIZE, ANALYZE, REPAIR commands are written to the
binlog, unless the new NO_WRITE_TO_BINLOG keyword was used :
OPTIMIZE NO_WRITE_TO_BINLOG table t;

Previously these commands were never written to the binlog, but there are
2 reasons to change this :
- the RENAME TABLE in MERGE table bug (#175) on slave
- the possible "differently optimised queries may lead to different
updates on the master and slave" bug, until we have automatic ORDER BY.

FLUSH LOGS/SLAVE/MASTER/TABLES WITH READ LOCK are never written to the binlog.
New test for the new logging behaviour.
Other small change : reload_acl_and_cache() and reset_slave() don't send their errors themselves,
this is more usual.


mysql-test/mysql-test-run.sh:
  rpl_flush_tables.test generates 'table xx is open on rename'.
  This is normal and done on purpose, so don't report it.
sql/lex.h:
  New keyword NO_WRITE_TO_BINLOG
sql/mysql_priv.h:
  reload_acl_and_cache() now decides if we want to write the FLUSH command
  to the binlog or not (FLUSH MASTER, FLUSH SLAVE, FLUSH TABLES
  WITH READ LOCK, FLUSH LOGS cannot go into the binlog).
sql/mysqld.cc:
  updated for new prototype of reload_acl_and_cache().
sql/sql_lex.h:
  New boolean no_write_to_binlog in the lex structure.
sql/sql_parse.cc:
  reload_acl_and_cache() now does not send its errors itself;
  it saves the error and the caller sends it.
  FLUSH, OPTIMIZE, ANALYZE, REPAIR commands don't write to the binlog
  if the NO_WRITE_TO_BINLOG keyword was used.
sql/sql_repl.cc:
  reset_slave() does not send its errors himself.
sql/sql_yacc.yy:
  New optional keyword NO_WRITE_TO_BINLOG for OPTIMIZE/ANALYZE/REPAIR/FLUSH :
  OPTIMIZE NO_WRITE_TO_BINLOG TABLE t;
  ANALYZE NO_WRITE_TO_BINLOG TABLE t;
  REPAIR NO_WRITE_TO_BINLOG TABLE t;
  FLUSH NO_WRITE_TO_BINLOG TABLE t;
2003-05-15 18:35:39 +02:00
unknown
8178016cae Fix to get thread_test to compile
BitKeeper/etc/ignore:
  added insert_test
tests/thread_test.c:
  Remove compiler warnings
2003-05-15 17:50:57 +03:00
unknown
df9068e35a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-05-15 15:52:00 +03:00
unknown
5dc31217ac Remove warning from automake 2003-05-15 15:51:42 +03:00
unknown
e6ea512dd7 configure.in:
./configure --with-charset=big5  didn't work


configure.in:
  ./configure --with-charset=big5  didn't work
2003-05-15 16:57:34 +05:00
unknown
b5741508e4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-05-15 00:31:32 +03:00
unknown
57edc61b06 Fixed new bug in ORDER BY
mysql-test/r/create.result:
  Update for new error messages
mysql-test/r/type_blob.result:
  Update for new error messages
strings/my_strtoll10-x86.s:
  Faster str->longlong
strings/my_strtoll10.c:
  Updated comments
2003-05-15 00:31:12 +03:00
unknown
43d3714095 Portability fix for 64 bit machines 2003-05-14 23:06:06 +03:00
unknown
6ea284dc3f Merge with 3.23 (No releavant code changes)
acinclude.m4:
  Auto merged
configure.in:
  Merge with 3.23
innobase/os/os0sync.c:
  No change
sql/sql_show.cc:
  No change
2003-05-14 22:28:54 +03:00
unknown
4efbc40a13 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-05-14 22:13:20 +03:00
unknown
ac316cfdb3 Fixed bug in CREATE ... DECIMAL(-1,1). Bug #432
mysql-test/mysql-test-run.sh:
  Ensure that tests are sorted
mysql-test/r/type_decimal.result:
  Test for bug with decimal()
mysql-test/t/type_decimal.test:
  Test for bug with decimal()
sql/sql_parse.cc:
  Fixed bug in CREATE ... DECIMAL(-1,1)
2003-05-14 22:12:55 +03:00
unknown
3e52a3f1fc Portability fixes OpenUnix 8 & UnixWare 7.1.x 2003-05-14 22:08:30 +03:00
unknown
babb7ce9e1 Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into narttu.mysql.fi:/my/mysql-3.23
2003-05-14 22:06:11 +03:00
unknown
dbc5d0e109 os0sync.c:
Check return value of pthread_cond_...


innobase/os/os0sync.c:
  Check return value of pthread_cond_...
2003-05-14 20:22:55 +03:00
unknown
fb0d4064a7 os0sync.c:
Check that pthread_mutex_init and pthread_mutex_destroy return 0


innobase/os/os0sync.c:
  Check that pthread_mutex_init and pthread_mutex_destroy return 0
2003-05-14 20:17:01 +03:00
unknown
58d4f56928 os0sync.c:
Backport from 4.0: We had forgotten to call pthread_mutex_destroy when we free an OS mutex in Unix


innobase/os/os0sync.c:
  Backport from 4.0: We had forgotten to call pthread_mutex_destroy when we free an OS mutex in Unix
2003-05-14 19:09:05 +03:00
unknown
23d7a317ee os0sync.c:
We had forgotten to call pthread_mutex_destroy when we free an OS mutex in Unix


innobase/os/os0sync.c:
  We had forgotten to call pthread_mutex_destroy when we free an OS mutex in Unix
2003-05-14 19:00:17 +03:00
unknown
f527bc7fee SHOW TABLE STATUS displayed wrong Row_format for myisampack'ed tables. (Bug #427)
sql/sql_show.cc:
  SHOW TABLE STATUS displayed wrong Row_format for myisampack'ed tables.
2003-05-14 09:37:04 +03:00
unknown
7297502a7b Fix for checking global_access rights 2003-05-14 01:55:23 +03:00
unknown
bf75db781d Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0


sql/sql_parse.cc:
  Auto merged
2003-05-14 01:28:59 +03:00
unknown
13a23a879f Fix for MacOSX and symlinks
Fix for USE_FRM and crashed index file


configure.in:
  Fix for MacOSX and symlinks
myisam/mi_open.c:
  Give better error message in case of of crashed index file
mysql-test/r/repair.result:
  new test case
mysql-test/r/update.result:
  new test case
mysql-test/t/repair.test:
  Added test with crashed MyISAM index header
mysql-test/t/update.test:
  Added test case from bugs system
sql/handler.cc:
  Indentation changes
sql/sql_table.cc:
  Fix for USE_FRM and crashed index file
2003-05-14 01:27:26 +03:00
unknown
8946eb3d50 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-05-13 23:03:33 +02:00
unknown
d079990894 Fix for bug 343 : we require only REPLICATION CLIENT for
SHOW SLAVE STATUS and SHOW MASTER STATUS, because this is what
the manual states. We still accept SUPER.
2003-05-13 23:03:00 +02:00
unknown
40e4b8d0cb Proper replication of CONNECTION_ID() and 4.1 PASSWORD() (bugs 177 and 344),
new test for this.


sql/item_create.cc:
  Proper replication of CONNECTION_ID() (bug 177).
  This is just for replication; mysqlbinlog|mysql still does not work
  with CONNECTION_ID(), it will wait for row-level binlogging.
sql/item_strfunc.cc:
  Proper replication of the new 4.1 PASSWORD() (bug 344)
2003-05-13 22:50:28 +02:00
unknown
6c60313bc7 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0


include/my_global.h:
  Auto merged
2003-05-13 22:35:41 +03:00
unknown
1e99e9fe96 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into hynda.(none):/home/my/bk/mysql-4.0
2003-05-13 22:34:04 +03:00
unknown
32450d159b Fixed a bug in DROP DATABASE when database had a RAID type table.
Bug ID 381.
2003-05-13 22:28:34 +03:00
unknown
21b5aecff1 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-05-13 22:09:03 +03:00
unknown
517bbaceee Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/pem/work/mysql-4.0
2003-05-13 20:05:23 +02:00
unknown
7a96b137ef - disabled all "EXPLAIN SELECT" tests from the InnoDB test because of
nodeterministic results on some platforms
2003-05-13 19:30:07 +02:00
unknown
a147307f42 Forgot to correct comment in key.test (after fixing bug 390).
mysql-test/t/key.test:
  Forgot to correct comment (after fixing bug 390).
2003-05-13 19:19:57 +02:00
unknown
563c32ccd1 Fix of bug 390: primary key now implies (silently) NOT NULL for key fields. 2003-05-13 19:16:30 +02:00
unknown
d4ae4f0ec0 Fixed 'Unknown error' when using 'UPDATE ... LIMIT'. Bug 373
mysql-test/r/update.result:
  new test
mysql-test/t/update.test:
  Test of UPDATE ... LIMIT
sql/sql_update.cc:
  Fixed 'Unknown error' when using 'UPDATE ... LIMIT'
2003-05-13 20:07:43 +03:00
unknown
46d868829e - added mysql_fix_privilege_tables(1) man page to distribution
(thanks to Christian Hammers from the Debian project for providing it)
 - Updated version number in man pages (3.23 -> 4.0)


man/Makefile.am:
   - added mysql_fix_privilege_tables(1) man page to man_MANS
man/isamchk.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/isamlog.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysql.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysql_zap.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysqlaccess.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysqladmin.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysqld.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysqld_multi.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysqld_safe.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysqldump.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysqlshow.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/perror.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/replace.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
2003-05-13 18:54:20 +02:00
unknown
496357a180 - Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339 and 342
- Fix for QNX: UNIX sockets available since 6.2.1


include/my_global.h:
  Fix for QNX: UNIX sockets available since 6.2.1
mysql-test/r/variables.result:
  Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
mysql-test/t/variables.test:
  Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
sql/mysqld.cc:
  Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
sql/set_var.cc:
  Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
sql/set_var.h:
  Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
2003-05-13 19:34:51 +03:00
unknown
d05cd28c10 Fixed problem with ansi mode and GROUP BY with constants. (Bug #387)
sql/sql_select.cc:
  Fixed problem with ansi mode and GROUP BY with constants
2003-05-13 19:26:07 +03:00
unknown
dc1e55f819 Fix for UNION and LEFT JOIN (Bug #386)
Fixed wrong logging of Access denied error (Bug #398)


include/my_global.h:
  Fix for QNX
mysql-test/r/union.result:
  new test case
mysql-test/t/union.test:
  Test of bug in union and left join
mysys/my_seek.c:
  Safety fix to find out when pos gets a wrong value
sql/field.h:
  Fix for UNION and LEFT JOIN
sql/mysql_priv.h:
  Fix for UNION and LEFT JOIN
sql/sql_base.cc:
  Fix for UNION and LEFT JOIN
sql/sql_insert.cc:
  Fix for UNION and LEFT JOIN
sql/sql_parse.cc:
  Fixed wrong logging of Access denied error
sql/sql_union.cc:
  Fix for UNION and LEFT JOIN
sql/sql_update.cc:
  Fix for UNION and LEFT JOIN
2003-05-13 18:58:26 +03:00