Commit graph

9268 commits

Author SHA1 Message Date
mleich@mysql.com
578406665a Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/matthias/Arbeit/mysql-5.1/src-Bug
2006-04-26 17:00:58 +02:00
aivanov@mysql.com
28e20421b5 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
2006-04-26 19:00:57 +04:00
aivanov@mysql.com
1c98f3e262 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
2006-04-26 12:48:12 +04:00
aivanov@mysql.com
88e7e55bb5 Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
2006-04-26 11:27:15 +04:00
aivanov@mysql.com
b34ec32b5b Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
2006-04-26 11:23:43 +04:00
aivanov@mysql.com
11687d2f84 Make innodb_mysql produce a non-empty output. 2006-04-26 11:15:09 +04:00
tomas@poseidon.ndb.mysql.com
c1d0294983 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-26 08:38:50 +02:00
aivanov@mysql.com
c66893cd54 Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492-work
2006-04-26 09:59:05 +04:00
aivanov@mysql.com
b748835897 Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
2006-04-26 09:56:06 +04:00
aivanov@mysql.com
7b8c526078 Files innodb.[test|result] are to be used by Innobase only.
Use files innodb_mysql.[test|result] instead.
2006-04-26 09:51:57 +04:00
andrey@lmy004.
679f609793 disable before investigation why test case for 19170 is failing on
some platforms.
2006-04-26 07:29:26 +03:00
tomas@poseidon.ndb.mysql.com
0e8ccc1bee Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-26 01:13:16 +02:00
tomas@poseidon.ndb.mysql.com
fc387e73c0 ndb: break out ndb backup compatability test, so that it can be disabled on mac 2006-04-26 01:11:40 +02:00
tomas@poseidon.ndb.mysql.com
f2d4d4cfaf Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-25 22:21:47 +02:00
andrey@lmy004.
e0c68bffb4 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-new-clean
2006-04-25 23:14:49 +03:00
aelkin@mysql.com
3363effa52 Merge mysql.com:/home/elkin/MySQL/BARE/5.0
into  mysql.com:/home/elkin/MySQL/MERGE/5.1-new
2006-04-25 20:05:15 +03:00
mleich@mysql.com
ec163e9d1e Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/matthias/Arbeit/mysql-5.1/src-Bug
2006-04-25 19:05:07 +02:00
mleich@mysql.com
3bddd31b92 Post merge correction for the Changeset
Fixes for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs related to MySQL 4.1
  and Bug#16920 rpl_deadlock_innodb fails in show slave status (reported for MySQL 5.1)
- Reactivation of testcase rpl_deadlock_innodb + updated file with expected results
- Removal of wrong entry within disabled.def
2006-04-25 18:28:29 +02:00
jonas@perch.ndb.mysql.com
49d0bd9beb reenable ndb_cache2 & ndb_cach_multi2 as I've fixed bug-18597 2006-04-25 17:02:50 +02:00
jonas@perch.ndb.mysql.com
e8797b49d2 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-04-25 17:02:49 +02:00
pem@mysql.com
0e2d20b1cb Merge mysql.com:/extern/mysql/5.1/generic/mysql-5.0-merge
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-04-25 16:20:49 +02:00
evgen@moonbone.local
6ea27b1013 Manually merged 2006-04-25 13:04:39 +04:00
mskold@mysql.com
4d771e4fca Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb
2006-04-25 10:36:39 +02:00
knielsen@mysql.com
854cbe88b6 Merge mysql.com:/usr/local/mysql/mysql-4.1
into  mysql.com:/usr/local/mysql/mysql-5.0-mtr-fix
2006-04-24 23:51:47 +02:00
tomas@poseidon.ndb.mysql.com
243965789e Bug #14516 Restart of cluster can cause NDB API replication failure
- this behavior was already changed, adding testcase
2006-04-24 23:29:33 +02:00
cmiller@zippy.(none)
9ae7dd9e35 Merge zippy.(none):/home/cmiller/work/mysql/merge/jimw_merge
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
2006-04-24 16:17:50 -04:00
andrey@lmy004.
7a314abaa9 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-new-clean
2006-04-24 23:04:15 +03:00
cmiller@zippy.(none)
81d3a4fb05 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new

Merge by hand.  This may not be right.
2006-04-24 14:49:05 -04:00
tomas@poseidon.ndb.mysql.com
5241916946 bug#18604 create logfile for MyISAM tables
- changed alter tablespace truct to work with handlerton pointer (to avoid crash in parser on unknown db type"
- pushed warnings when default storage engine is used and/or tablespace stuff is not supported by storage engine
2006-04-24 18:26:30 +02:00
svoj@april.(none)
a83c4b6841 Merge april.(none):/home/svoj/devel/mysql/merge/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-new
2006-04-24 19:53:38 +05:00
tomas@poseidon.ndb.mysql.com
d999da80b0 Bug #18935 restore of apply_status table fails using old ndb backup 2006-04-24 16:05:02 +02:00
bell@sanja.is.com.ua
b2c810e847 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.1
2006-04-24 13:32:07 +03:00
andrey@lmy004.
6b3fe492ed enable logs_tests 2006-04-24 12:30:17 +03:00
andrey@lmy004.
82c8ef7be1 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-new-clean
2006-04-24 12:21:38 +03:00
andrey@lmy004.
bfe997f56f enable events_scheduling 2006-04-24 12:17:28 +03:00
andrey@lmy004.
b7adc19900 test case for bug 19170 2006-04-24 12:12:15 +03:00
ramil@production.mysql.com
f7394c26f5 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  production.mysql.com:/usersnfs/rkalimullin/4.1.b17896
2006-04-24 08:01:10 +02:00
aelkin@mysql.com
a8368fde52 Merge mysql.com:/net/nb/home/elkin/MySQL/FIXES/5.0-bug17263-temp_drop
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-04-23 20:06:30 +03:00
aelkin@mysql.com
b56d36dd30 Bug#17263 temporary tables and replication
The fix refines the algorithm of generating DROPs for binlog. 
Temp tables with common pseudo_thread_id are clustered into one query. 
Consequently one replication event per pseudo_thread_id is generated.
2006-04-23 19:59:43 +03:00
aivanov@mysql.com
e72bab17fd Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/innodb/mysql-5.1
2006-04-23 16:06:46 +04:00
aivanov@mysql.com
448f6e66bd Corrected merge mistake. 2006-04-23 16:05:11 +04:00
aivanov@mysql.com
3431db829e Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/innodb/mysql-5.1
2006-04-23 14:28:47 +04:00
aelkin@mysql.com
28fe756a3d manual merge use local 2006-04-23 12:32:41 +03:00
aelkin@mysql.com
b2b725dba0 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-04-23 12:32:40 +03:00
aelkin@mysql.com
c5219d0d67 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-04-23 12:32:39 +03:00
konstantin@mysql.com
8301e6f625 Merge mysql.com:/opt/local/work/mysql-5.0-root
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge
2006-04-23 13:32:38 +04:00
aivanov@mysql.com
4fba67933d Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/innodb/mysql-5.0
2006-04-23 13:32:37 +04:00
aelkin@mysql.com
a4ff312037 Bug#17263 temporary tables and replication
Backporting a changeset made for 5.0. Comments from there:

  The fix refines the algorithm of generating DROPs for binlog.
  Temp tables with common pseudo_thread_id are clustered into one query.
  Consequently one replication event per pseudo_thread_id is generated.
2006-04-23 12:18:57 +03:00
aivanov@mysql.com
780f80be16 Applied innodb-5.1-ss475 snapshot.
* Fix BUG#15650: "DELETE with LEFT JOIN crashes server with innodb_locks_unsafe_for binlog"
* Fix BUG#17134: "Partitions: uncommitted changes are visible"
* Fix BUG#17992: "Partitions: InnoDB, somehow rotten table after UPDATE"
  row0ins.c: MySQL's partitioned table code does not set preduilt->sql_stat_start right
  if it does an insert in the same statement after doing a search first in the same
  partition table. We now write trx id always to the buffer, not just when flag
  sql_stat_start is on. This will waste CPU time very sightly.
* Fix BUG#18077: "InnoDB uses full explicit table locks in stored FUNCTION"
* Fix BUG#18238: "When locks exhaust the buffer pool, InnoDB does not roll back the trx"
* Fix BUG#18252" "Disk space leak in updates of InnoDB BLOB rows in 5.0 and 5.1"
* Fix BUG#18283: "When InnoDB returns error 'lock table full', MySQL can write to binlog too much"
* Fix BUG#18350: "Use consistent read in CREATE ... SELECT ... if innodb_locks_unsafe_for_binlog"
* Fix BUG#18384: "InnoDB memory leak on duplicate key errors in 5.0 if row has many columns"
* Fix BUG#18934: "InnoDB crashes when table uses column names like DB_ROW_ID"
  Refuse tables that use reserved column names.
* InnoDB's SQL parser:
  - Add support for UNSIGNED types, EXIT keyword, quoted identifiers, user-function callbacks
    for processing results of FETCH statements, bound literals, DATA_VARCHAR for bound literals.
  - Allow bound literals of type non-INTEGER to be of length 0.
  - Add make_flex.sh and update lexer/parser generation documentation.
  - Add comment clarifying the difference between 'alias' and 'indirection' fields in sym_node_t.
  - Remove never reached duplicate code in pars_set_dfield_type().
  - Rewrite pars_info datatypes and APIs, add a few helper functions.
  - Since the functions definitions in pars_info_t are accessed after pars_sql() returns
    in the query graph execution stage, we can't free pars_info_t in pars_sql(). Instead,
    make pars_sql() transfer ownership of pars_info_t to the created query graph, and
    make que_graph_free() free it if needed.
  - Allow access to system columns like DB_ROW_ID.
* Use bound literals in row_truncate_table_for_mysql, row_drop_table_for_mysql,
  row_discard_tablespace_for_mysql, and row_rename_table_for_mysql.
* Setting an isolation level of the transaction to read committed weakens the locks for
  this session similarly like the option innodb_locks_unsafe_for binlog. This patch removes
  alnost all gap locking (used in next-key locking) and makes MySQL to release the row locks
  on the rows which does not belong to result set. Additionally, nonlocking selects on
  INSERT INTO SELECT, UPDATE ... (SELECT ...), and CREATE ... SELECT ... use a nonlocking
  consistent read. If a binlog is used, then binlog format should be set to row based
  binloging to make the execution of the complex SQL statements.
* Disable the statistic variables btr_search_n_hash_fail and n_hash_succ, n_hash_fail,
  n_patt_succ, and n_searches of btr_search_t in builds without #ifdef UNIV_SEARCH_PERF_STAT.
* Make innodb.test faster. Group all consistent read test cases to a one test case and
  wait their lock timeout after all have been send to the server. Decrease amount of rows
  inserted in a certain test - this has no effect on the effectiveness of the test and
  reduces the running time by ~10 sec. Remove temporary work-arounds from innodb.result
  now that ALTER TABLE DROP FOREIGN KEY works once again.
* Make innodb_unsafe_binlog.test faster. Grout all consistent read test cases to a one
  test case amd wait their lock timeout after all have been sent to the server. Remove
  unnecessary option --loose_innodb_lock_wait_timeout.
* Print dictionary memory size in SHOW INNODB STATUS.
* Fix memory leaks in row_create_table_for_mysql() in rare corner cases.
* Remove code related to clustered tables. They were never implemented, and the
  implementation would be challenging with ROW_FORMAT=COMPACT. Remove the table types
  DICT_TABLE_CLUSTER_MEMBER and DICT_TABLE_CLUSTER and all related tests and functions.
  dict_table_t: Remove mix_id, mix_len, mix_id_len, mix_id_buf, and cluster_name.
  plan_t: Remove mixed_index.
  dict_create_sys_tables_tuple(): Set MIX_ID=0, MIX_LEN=0, CLUSTER_NAME=NULL when
  inserting into SYS_TABLES.
  dict_tree_check_search_tuple(): Enclose in #ifdef UNIV_DEBUG.
* Move calling of thr_local_free() from trx_free_for_mysql() to
  innobase_close_connection().
2006-04-23 12:48:31 +04:00
konstantin@mysql.com
ba845055f9 Merge mysql.com:/opt/local/work/tmp_merge
into  mysql.com:/opt/local/work/mysql-5.1-merge
2006-04-23 04:04:36 +04:00