Commit graph

10141 commits

Author SHA1 Message Date
unknown
2a98f2943e made more fine error message in scripts/fill_help_tables.sh
scripts/fill_help_tables.sh:
  made more fine error message
2003-10-19 16:57:17 -04:00
unknown
a2611f9ec6 os0file.c:
Check that writes to data files always happen in to addresses divisible by 16 kB, and the chunk size is also divisible by 16 kB; a user reported 2 corrupt pages from Linux-2.4.20 where an index page seemed displaced


innobase/os/os0file.c:
  Check that writes to data files always happen in to addresses divisible by 16 kB, and the chunk size is also divisible by 16 kB; a user reported 2 corrupt pages from Linux-2.4.20 where an index page seemed displaced
2003-10-19 20:31:32 +03:00
unknown
931d4fccc0 os0file.c:
Check that writes to data files always happen in to addresses divisible by 16 kB, and the chunk size is also divisible by 16 kB; a user reported 2 corrupt pages from Linux-2.4.20 where an index page seemed displaced


innobase/os/os0file.c:
  Check that writes to data files always happen in to addresses divisible by 16 kB, and the chunk size is also divisible by 16 kB; a user reported 2 corrupt pages from Linux-2.4.20 where an index page seemed displaced
2003-10-19 20:28:03 +03:00
unknown
be4e254b13 correct table name assigned to temporary table field:
- correct table name shown in EXPLAIN Iindex reference)
 - pointer on freed memmory (reallocation of table name in reusing table entry) can't be used in EXPLAIN
(BUG#1584)


mysql-test/r/derived.result:
  test moved to derived table tests
  added test of BUG#1584
mysql-test/r/subselect.result:
  test moved to derived table tests
mysql-test/t/derived.test:
  test moved to derived table tests
  added test of BUG#1584
mysql-test/t/subselect.test:
  test moved to derived table tests
sql/item.cc:
  layout fix
sql/sql_select.cc:
  correct table name assigned to temporary table field
2003-10-19 14:25:33 +03:00
unknown
b7aac7df29 index name shown (SCRUM) (WL#1274)
mysql-test/r/subselect.result:
  index name shown
sql/item_subselect.cc:
  index name shown
2003-10-19 14:22:17 +03:00
unknown
54b9f2d8ff Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-3.23
into mysql.com:/home/mysql_src/mysql-3.23
2003-10-18 16:28:40 +02:00
unknown
14affe7e2f thr0loc.c, srv0start.c, srv0srv.c, srv0srv.h, os0thread.h, ha_innodb.cc:
Backport from 4.1: reduce InnoDB memory consumption if buf pool < 8 MB


sql/ha_innodb.cc:
  Backport from 4.1: reduce InnoDB memory consumption if buf pool < 8 MB
innobase/include/os0thread.h:
  Backport from 4.1: reduce InnoDB memory consumption if buf pool < 8 MB
innobase/include/srv0srv.h:
  Backport from 4.1: reduce InnoDB memory consumption if buf pool < 8 MB
innobase/srv/srv0srv.c:
  Backport from 4.1: reduce InnoDB memory consumption if buf pool < 8 MB
innobase/srv/srv0start.c:
  Backport from 4.1: reduce InnoDB memory consumption if buf pool < 8 MB
innobase/thr/thr0loc.c:
  Backport from 4.1: reduce InnoDB memory consumption if buf pool < 8 MB
2003-10-17 23:44:34 +03:00
unknown
6713bb090d thr0loc.c, srv0start.c, srv0srv.c, srv0srv.h, os0thread.h:
Reduce InnoDB memory allocation if buffer pool < 8 MB


innobase/include/os0thread.h:
  Reduce InnoDB memory allocation if buffer pool < 8 MB
innobase/include/srv0srv.h:
  Reduce InnoDB memory allocation if buffer pool < 8 MB
innobase/srv/srv0srv.c:
  Reduce InnoDB memory allocation if buffer pool < 8 MB
innobase/srv/srv0start.c:
  Reduce InnoDB memory allocation if buffer pool < 8 MB
innobase/thr/thr0loc.c:
  Reduce InnoDB memory allocation if buffer pool < 8 MB
2003-10-17 20:31:17 +03:00
unknown
629ced9d81 Merge oak.local:/home/kostja/mysql/mysql-4.0-root
into oak.local:/home/kostja/mysql/mysql-4.0-1274
2003-10-17 18:44:13 +04:00
unknown
6795b2642b fixed deleting derived table tree after using (BUG#1536)
mysql-test/r/subselect.result:
  fixed drop table statement
  test for BUG#1536
mysql-test/t/subselect.test:
  fixed drop table statement
  test for BUG#1536
sql/sql_derived.cc:
  all tree of derived table should be deleted
sql/sql_lex.cc:
  delete subtree method
sql/sql_lex.h:
  delete subtree method
2003-10-17 15:18:57 +03:00
unknown
4a253d2af0 uninitialized variable on Windows fixed 2003-10-17 13:17:15 +02:00
unknown
35e7a5400d cancelling a previous change I made in rpl_trunc_binlog.test (which I did not push),
to enable SHOW SLAVE STATUS again.


mysql-test/r/rpl_trunc_binlog.result:
  enabling SHOW SLAVE STATUS again.
mysql-test/t/rpl_trunc_binlog.test:
  enabling SHOW SLAVE STATUS again
2003-10-17 09:26:38 +02:00
unknown
a2128b247f test update: what we want to detect in this test is if the slave stopped.
mysql-test/r/rpl_trunc_binlog.result:
  result update
mysql-test/t/rpl_trunc_binlog.test:
  what we want to detect in this test is if the slave stopped.
2003-10-17 09:15:30 +02:00
unknown
246d37076e - Updated rpl_trunc_binlog test result after last change 2003-10-17 02:32:09 +02:00
unknown
0b8743c1b2 A fix for a random test failure rpl_trunc_binlog: don't RESET MASTER
while the slave is connected.


mysql-test/t/rpl_trunc_binlog.test:
  don't RESET MASTER while the slave is connected; this could confuse the master or slave.
  (In replication you don't RESET MASTER while a slave is connected!)
sql/slave.cc:
  typo
2003-10-17 00:00:25 +02:00
unknown
e4b7aaac47 fixed support of used_tables() and const_item() in subqueries
(BUG#1444)


mysql-test/r/subselect.result:
  BUG#1444 test
mysql-test/t/subselect.test:
  BUG#1444 test
sql/item.cc:
  storing used tables in Item_subselect
sql/item_subselect.cc:
  fixed support of used_tables() and const_item() in subqueries
sql/item_subselect.h:
  fixed support of used_tables() and const_item() in subqueries
2003-10-17 00:36:01 +03:00
unknown
1b6cffff79 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-10-16 22:18:04 +02:00
unknown
d894f23372 - portability fix: fix compile bug on HP-UX (thanks to acurtis for the
patch)
  (BUG#1440: Redundant class name confusing hpux compiler)
2003-10-16 22:15:46 +02:00
unknown
0d28ff8473 fixed sqlstate for ER_WRONG_INDEX_NAME
removed unnesessary code from create.test


include/sql_state.h:
  added sqlstate for ER_WRONG_INDEX_NAME
mysql-test/r/create.result:
  changed sqlstate for ER_WRONG_INDEX_NAME
  remove unnesesary warning
mysql-test/t/create.test:
  remove unnesessary drop table
2003-10-16 16:15:45 -04:00
unknown
de01431b18 - fixed small typo to resolve "test: argument expected" error on Solaris
and Tru64 when running "mysql_install_db"
2003-10-16 22:15:36 +02:00
unknown
125c41bd52 fixes for new key_map code 2003-10-16 21:21:48 +02:00
unknown
f1fc5c54eb Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc_crash-4.0
2003-10-16 21:17:45 +03:00
unknown
4f936a69a7 Safety fix to detect multiple calls to my_thread_end()
Portability fix (For Mac OS X)


configure.in:
  Added detection of malloc / sys/malloc
include/my_pthread.h:
  Safety fix to detect multiple calls to my_thread_end()
libmysqld/lib_sql.cc:
  Remove duplicate call to my_thread_end()
mysys/charset.c:
  Cleanup indentation
  Remove some short variable names
mysys/my_thr_init.c:
  Safety fix to detect multiple calls to my_thread_end()
sql/sql_test.cc:
  Portability fix (For Mac OS X)
2003-10-16 20:55:15 +03:00
unknown
ff50211da5 added checking for empty index name (fixed bug #1419)
include/mysqld_error.h:
  added error "Incorrect index name"
mysql-test/r/create.result:
  added test for empty index name
mysql-test/t/create.test:
  added test for empty index name
sql/share/czech/errmsg.txt:
  added error "Incorrect index name"
sql/share/danish/errmsg.txt:
  added error "Incorrect index name"
sql/share/dutch/errmsg.txt:
  added error "Incorrect index name"
sql/share/english/errmsg.txt:
  added error "Incorrect index name"
sql/share/estonian/errmsg.txt:
  added error "Incorrect index name"
sql/share/french/errmsg.txt:
  added error "Incorrect index name"
sql/share/german/errmsg.txt:
  added error "Incorrect index name"
sql/share/greek/errmsg.txt:
  added error "Incorrect index name"
sql/share/hungarian/errmsg.txt:
  added error "Incorrect index name"
sql/share/italian/errmsg.txt:
  added error "Incorrect index name"
sql/share/japanese/errmsg.txt:
  added error "Incorrect index name"
sql/share/korean/errmsg.txt:
  added error "Incorrect index name"
sql/share/norwegian-ny/errmsg.txt:
  added error "Incorrect index name"
sql/share/norwegian/errmsg.txt:
  added error "Incorrect index name"
sql/share/polish/errmsg.txt:
  added error "Incorrect index name"
sql/share/portuguese/errmsg.txt:
  added error "Incorrect index name"
sql/share/romanian/errmsg.txt:
  added error "Incorrect index name"
sql/share/russian/errmsg.txt:
  added error "Incorrect index name"
sql/share/serbian/errmsg.txt:
  added error "Incorrect index name"
sql/share/slovak/errmsg.txt:
  added error "Incorrect index name"
sql/share/spanish/errmsg.txt:
  added error "Incorrect index name"
sql/share/swedish/errmsg.txt:
  added error "Incorrect index name"
sql/share/ukrainian/errmsg.txt:
  added error "Incorrect index name"
sql/sql_table.cc:
  added checking for wrong index name
2003-10-16 11:33:44 -04:00
unknown
ca5383cfe5 fix for one of the bugs spotted by #1274
sql/sql_select.cc:
  back to the bug #1274:
  the following query
  EXPLAIN SELECT SQL_CALC_FOUND_ROWS race_name 
  FROM races WHERE race_name LIKE '%Madison%' ORDER BY race_date DESC LIMIT 0,100
  
  +-------+------+---------------+------+---------+------+--------+-----------------------------+
  | table | type | possible_keys | key  | key_len | ref  | rows   | Extra                       |
  +-------+------+---------------+------+---------+------+--------+-----------------------------+
  | races | ALL  | NULL          | NULL |    NULL | NULL | 505821 | Using where; Using filesort |
  +-------+------+---------------+------+---------+------+--------+-----------------------------+
  
  The query returns no rows.
  
  There are two problems with it: 
  - wrong access plan is chosed  (sequential index scan in reverse order,
  which is VERY SLOW in case of MyISAM table + packed keys)
  It's wrong, because it doesn't take into account that SQL_CALC_FOUND_ROWS 
  is present, in other words, is based on assumtion that LIMIT
  clause decrease number of rows to access significantly, which is
  not true as all rows are accessed.
  - the access plan is not shown in the EXPLAIN (bug #1560). I'm not
  fixing it here
2003-10-16 17:00:09 +04:00
unknown
724a6c3c6d subqueries made printable
new EXPLAIN parameter to show real query as it was interpreted
(SCRUM) (WL#1274)


mysql-test/r/subselect.result:
  new explains
mysql-test/r/union.result:
  new explains
mysql-test/t/subselect.test:
  new explains
mysql-test/t/union.test:
  new explains
sql/item.cc:
  fixed printability of Items in SELECT list
sql/item.h:
  fixed printability of Items in SELECT list
sql/item_cmpfunc.cc:
  fixed print()
sql/item_cmpfunc.h:
  fixed print()
sql/item_subselect.cc:
  subqueries made printable
sql/item_subselect.h:
  subqueries made printable
sql/mysql_priv.h:
  union option made looks like options
sql/sql_derived.cc:
  now this link is used
sql/sql_lex.cc:
  subqueries made printable
sql/sql_lex.h:
  subqueries made printable
  new EXPLAIN parameter support
sql/sql_parse.cc:
  new EXPLAIN parameter
sql/sql_select.cc:
  debug output
  new EXPLAIN parameter support
sql/sql_select.h:
  new EXPLAIN parameter support
sql/sql_yacc.yy:
  new EXPLAIN parameter support
  SELECT printability support
2003-10-16 15:54:47 +03:00
unknown
e83a7c2cf7 Fix test after merge
mysql-test/r/create.result:
  update test results
2003-10-16 08:34:17 +03:00
unknown
8ddb4b7c55 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-10-16 08:23:43 +03:00
unknown
9c9ff4cce5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2003-10-16 08:22:31 +03:00
unknown
a474f8c319 Update results after merge 2003-10-16 08:16:39 +03:00
unknown
48d49976fd Merge
sql/set_var.cc:
  SCCS merged
2003-10-16 08:11:01 +03:00
unknown
0b45b5c632 Changing max_insert_delayed_threads now also changes the size of thread alarm buffer. 2003-10-16 07:44:18 +03:00
unknown
aff45e1b07 merge with 4.0
BitKeeper/deleted/.del-MYSQL.ICO~d93519b5f0d6ee1:
  Auto merged
client/client_priv.h:
  Auto merged
extra/resolveip.c:
  Auto merged
include/mysql.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
myisam/myisamchk.c:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
2003-10-16 03:08:40 +03:00
unknown
a49ef9a555 Created small scripts to manage in-tree diffs for
NetWare platform, so changes are visible in the tree 
but cannot affect other platforms.
2003-10-15 19:50:47 -04:00
unknown
efd76a94de Created small scripts to manage in-tree diffs for NetWare platform, so changes are visible in the tree but cannot affect other platforms 2003-10-15 19:46:53 -04:00
unknown
893797be02 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1


sql/item_strfunc.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2003-10-15 22:52:31 +03:00
unknown
ddbc842854 Portability fixes for windows
After merge fixes


include/my_base.h:
  Fix comment syntax
libmysql/client_settings.h:
  Portability fixes for windows
libmysql/libmysql.c:
  Portability fixes for windows
libmysql/libmysql.def:
  Portability fixes for windows
mysql-test/r/variables.result:
  Fix result after merge
sql-common/client.c:
  Portability fixes for windows
sql/ha_berkeley.cc:
  Use defines instead of constants
sql/item_strfunc.cc:
  Portability fixes for windows
sql/mysql_priv.h:
  Use defines instead of defines
sql/mysqld.cc:
  After merge fix
sql/opt_range.h:
  After merge fix
sql/set_var.h:
  Portability fixes for windows
sql/sql_class.cc:
  Defines instead of constants
sql/sql_help.cc:
  after merge fixes
  More OOM error checking
sql/sql_prepare.cc:
  After merge fixes
sql/sql_table.cc:
  Portability fixes for windows
2003-10-15 22:40:36 +03:00
unknown
0fc97bc9e5 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-10-15 21:50:36 +03:00
unknown
b06eb4d81a Better fix for CREATE TABLE IF NOT EXISTS ... SELECT
Fixed chsize() problem on windows
Extend default timeout on windows clients to 1 year (to avoid timeout problems)


include/mysql.h:
  Added client timeouts (for TCP/IP)
libmysql/libmysql.c:
  Added client timeouts (for TCP/IP)
mysql-test/r/create.result:
  More tests for CREATE TABLE IF NOT EXISTS ... SELECT
mysql-test/t/create.test:
  More tests for CREATE TABLE IF NOT EXISTS ... SELECT
mysys/my_chsize.c:
  Fix for windows
sql/handler.h:
  Remove not used field 'if_not_exists'
  Ordered fields to be more optimized for new CPU's
  Added field 'table_existed'
sql/slave.cc:
  Cleanup temporary tables when slave ends
sql/sql_class.h:
  Remove not used 'do_not_drop' field
sql/sql_insert.cc:
  Better fix for CREATE TABLE IF NOT EXISTS ... SELECT
sql/sql_table.cc:
  Better fix for CREATE TABLE IF NOT EXISTS ... SELECT
2003-10-15 21:41:13 +03:00
unknown
249798d846 get rid of default_charset_info for index fulltext searches 2003-10-15 19:01:47 +02:00
unknown
b1124529ed cleanup
myisam/ft_update.c:
  unused parameter removed
myisam/ftdefs.h:
  unused parameter removed
myisam/mi_check.c:
  unused parameter removed
mysys/Makefile.am:
  unused file removed from Makefile
2003-10-15 18:05:04 +02:00
unknown
e115c1f46d dummy resize_thr_alarm for Netware 2003-10-15 17:10:47 +02:00
unknown
48446c0f73 Updated comments
mysys/queues.c:
  Comments for new functions (no code change)
mysys/thr_alarm.c:
  Updated comment
2003-10-15 16:55:24 +03:00
unknown
60fb31ddec Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2003-10-15 16:23:01 +03:00
unknown
14573a7191 ctype-simple.c, ctype-mb.c:
Win compilation problem fix
ctype-bin.c:
  Win compilation problem fix
  ,
  ,
m_ctype.h:
  Win compilation problem fix
  ,


include/m_ctype.h:
  Win compilation problem fix
  ,
strings/ctype-bin.c:
  Win compilation problem fix
  ,
  ,
strings/ctype-mb.c:
  Win compilation problem fix
strings/ctype-simple.c:
  Win compilation problem fix
2003-10-15 17:34:28 +05:00
unknown
4f5887b22d Add more information about memory usage to debug log
sql/sql_test.cc:
  Add more information about memory usage
2003-10-15 15:21:50 +03:00
unknown
845e9f559c stricter checks on FULLTEXT index creating 2003-10-15 13:40:20 +02:00
unknown
b192ab5edc merged
BitKeeper/etc/ignore:
  auto-union
myisam/myisamdef.h:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/table.cc:
  Auto merged
2003-10-15 12:25:44 +02:00
unknown
f6fd834132 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.max


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-10-15 14:51:56 +05:00
unknown
547b056d6d WL#1106: Switch = --maxdb rather than --sapdb 2003-10-15 14:50:36 +05:00