Commit graph

728 commits

Author SHA1 Message Date
jonas@perch.ndb.mysql.com
327adcf461 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-04-06 16:25:19 +02:00
serg@serg.mylan
cc3c065aa9 Bug#18836 - fulltext parser plugin is called recursively.
Don't use the same param in recursive call.
Also, the fix makes it safe for a plugin to replace param->mysql_add_word
2006-04-06 16:03:04 +02:00
jonas@perch.ndb.mysql.com
1617e5cb25 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
2006-04-06 13:18:13 +02:00
msvensson@shellback.(none)
e1348410d7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-04-06 11:38:50 +02:00
stewart@mysql.com
ef4c0d8042 Merge mysql.com:/home/stewart/Documents/MySQL/5.1/new
into  mysql.com:/home/stewart/Documents/MySQL/5.1/new-bug18831
2006-04-06 17:24:02 +10:00
stewart@mysql.com
c7f3ce1148 BUG#18831 Valgrind: cond jmp on uninit during ndb_dd_dump test
don't know why this didn't generate a warning, but let's fix it too.
2006-04-06 17:13:17 +10:00
stewart@mysql.com
f54a2ff55b BUG#18831 Valgrind: cond jmp on uninit during ndb_dd_dump test 2006-04-06 17:02:56 +10:00
igor@rurik.mysql.com
679dbc7627 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  rurik.mysql.com:/home/igor/mysql-5.1
2006-04-04 04:35:16 -07:00
tomas@poseidon.ndb.mysql.com
7cd8c8428a Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-04 11:48:28 +02:00
msvensson@shellback.(none)
abc72552b5 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into  shellback.(none):/home/msvensson/mysql/bug17368/my51-bug17368
2006-04-04 10:00:27 +02:00
msvensson@shellback.(none)
67bcb953aa Bug#17368 General log and slow query log don't work
- Port ha_tina.cc to run on windows
2006-04-04 09:59:19 +02:00
igor@rurik.mysql.com
d6af1b6e39 Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-04-01 02:57:56 -08:00
kent@mysql.com
ac34c93bc2 Merge 2006-03-30 23:52:54 +02:00
kent@mysql.com
ece5ef1551 Merge 2006-03-30 22:10:48 +02:00
konstantin@mysql.com
5c99b8b83f Merge mysql.com:/opt/local/work/tmp_merge
into  mysql.com:/opt/local/work/mysql-5.1-merge
2006-03-30 18:43:42 +04:00
monty@mysql.com
2b1f521286 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-03-30 06:11:34 +03:00
acurtis@xiphis.org
6cbd57914a Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  xiphis.org:/home/antony/work2/p1-bug18464
2006-03-29 17:31:59 -08:00
monty@mysql.com
0e27cbeadc Merge monty@192.168.0.9:/my/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-03-29 23:01:35 +03:00
monty@mysql.com
8b21a9d46a Safety fix to ensure that long event names always ends with \0
This removes a warning about missing DBUG_ENTER while running tests
2006-03-29 22:58:34 +03:00
monty@mysql.com
c3e7c7aa4b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-03-29 17:28:40 +03:00
monty@mysql.com
cbd420a0c1 Remove compiler warnings
Add missing DBUG_RETURN
Fixed stack overflow in NdbBlob (found by ndb_gis.test)
Fixed access to freed memory in ndb_cluster_real_free_share()
2006-03-29 17:04:00 +03:00
monty@mysql.com
1994ed49ec Fixed compiler and valgrind warnings
Added missing DBUG_xxx_RETURN statements
Fixed some usage of not initialized variables (as found by valgrind)
Ensure that we don't remove locked tables used as name locks from open table cache until unlock_table_names() are called.
This was fixed by having drop_locked_name() returning any table used as a name lock so that we can free it in unlock_table_names()
This will allow Tomas to continue with his work to use namelocks to syncronize things.

Note: valgrind still produces a lot of warnings about using not initialized code and shows memory loss errors when running the ndb tests
2006-03-29 14:27:36 +03:00
petr@mysql.com
14346aa9a4 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-repair-csv
2006-03-29 06:34:12 +04:00
petr@mysql.com
39a251f35b Post-review fixes for WL#3154 "Enable REPAIR for CSV tables" 2006-03-29 06:28:57 +04:00
acurtis@xiphis.org
f6febdb95a Bug#18464
"Can't make example storage engine available"
Build was attempting a shared-lib build instead of static
2006-03-28 14:34:28 -08:00
reggie@big_geek.
4a166c2f2f some simple CMAKE updates 2006-03-28 10:05:25 -06:00
knielsen@mysql.com
4c87c8dc54 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmpbuild
2006-03-28 16:35:50 +02:00
tomas@poseidon.ndb.mysql.com
49ef07fb9d ndb test: remove not needed setting causing compile error 2006-03-28 11:51:22 +02:00
knielsen@mysql.com
cc57e4e01b Manual merge. 2006-03-28 10:07:03 +02:00
tomas@poseidon.ndb.mysql.com
6ad5038423 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-27 19:03:22 +02:00
tomas@poseidon.ndb.mysql.com
e8423ff093 Bug #18491 cluster: node restart with pending dropeed events causes failed restart 2006-03-27 18:53:23 +02:00
skozlov@mysql.com
8cf57c5520 ATRT documentation 2006-03-27 14:59:19 +04:00
jonas@perch.ndb.mysql.com
582d3fed7a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-27 10:29:36 +02:00
jonas@perch.ndb.mysql.com
cb6b9ee73e Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-27 10:26:37 +02:00
kent@mysql.com
6dbb56fd28 azio.c, archive_test.c:
Include our base headers before system headers
2006-03-26 13:59:37 +02:00
knielsen@mysql.com
c05590707d Add missing cmakelists.txt for archive. 2006-03-24 23:19:59 +01:00
knielsen@mysql.com
bc6628d27f Some changes to make it possible to build for Windows with CMake from
a normal 'make dist' source .tar.gz.
2006-03-24 22:50:56 +01:00
mskold@mysql.com
1c6f8158f2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-24 13:28:29 +01:00
jonas@perch.ndb.mysql.com
038287aa9d ndb autotest
fix \ in makefile (merge error)
2006-03-24 12:36:39 +01:00
jonas@perch.ndb.mysql.com
b3ee3a81a5 ndb - bug#18295
more work-arounds for gcc4
2006-03-24 11:35:57 +01:00
mskold@mysql.com
a444f0a3ae Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-24 10:48:28 +01:00
jonas@perch.ndb.mysql.com
4a22082b66 ndb -
more compiler warnings...
2006-03-24 10:23:50 +01:00
jonas@perch.ndb.mysql.com
31efa863dd ndb -
still some compiler warnings
2006-03-24 10:19:10 +01:00
jonas@perch.ndb.mysql.com
14ec452bdd Merge perch.ndb.mysql.com:/home/jonas/src/51-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-24 10:17:18 +01:00
jonas@perch.ndb.mysql.com
6c9727bf73 Merge ndbdev@ndbmaster.mysql.com:jonas/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-24 10:12:35 +01:00
tomas@poseidon.ndb.mysql.com
d0a3ce5da4 - corrected bug causing hang in getTable when using blob tables
- make sure cluster/schema table is always created first
2006-03-24 10:12:34 +01:00
jonas@perch.ndb.mysql.com
4164c2a0e0 ndb - bug#18295
rewrite/clean up code a bit to avoid a gcc4 compiler bug
2006-03-24 09:42:10 +01:00
jonas@perch.ndb.mysql.com
6a582297b6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb-new
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2006-03-24 09:36:56 +01:00
jonas@perch.ndb.mysql.com
ae1bb1bd09 ndb - merge fixes 2006-03-24 08:58:40 +01:00
jonas@perch.ndb.mysql.com
34328efe03 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-24 07:43:55 +01:00
tomas@poseidon.ndb.mysql.com
5cc1da5424 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-23 22:50:20 +01:00
tomas@poseidon.ndb.mysql.com
57198f85d6 Bug #18472 race condition between multiple mysqld's when setting up cluster/schema
- check that event is the correct one, and only delete if wrong version
2006-03-23 22:49:02 +01:00
mskold@mysql.com
a945c58ffe Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-23 22:39:30 +01:00
knielsen@mysql.com
a3ad39cf66 Updated CMake stuff to handle the configurations needed for release
builds.
2006-03-23 16:34:52 +01:00
pekka@mysql.com
c54b8647d4 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/export/space/pekka/ndb/version/my51
2006-03-23 11:35:54 +01:00
pekka@mysql.com
a2263a1fbf ndb - bug#17813 schema.query => blob 2006-03-23 04:59:14 +01:00
tomas@poseidon.ndb.mysql.com
8598539ea1 ndb: added debug printout to track down a bug 2006-03-22 18:10:56 +01:00
tomas@poseidon.ndb.mysql.com
53317ff998 ndb: removed TransporterFacade singleton 2006-03-22 17:28:45 +01:00
tomas@poseidon.ndb.mysql.com
886b1b8661 corrected previous patch 2006-03-22 10:54:55 +01:00
tomas@poseidon.ndb.mysql.com
c8131d283a added config parameter InitialNoOfOpenFiles 2006-03-22 10:17:29 +01:00
tomas@poseidon.ndb.mysql.com
2c991eec59 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-20 16:05:09 +01:00
tomas@poseidon.ndb.mysql.com
9da0e8f5b4 ndb: added debug printout 2006-03-20 16:03:35 +01:00
hartmut@mysql.com
3b34159891 Merge mysql.com:/home/hartmut/projects/mysql/bk-clean/5.1
into  mysql.com:/home/hartmut/projects/mysql/dev/5.1/gcc41
2006-03-18 18:21:48 +01:00
hartmut@mysql.com
7f0430e134 gcc 4.1.0 compile fix (Bug #18332) 2006-03-18 18:12:47 +01:00
Reggie@xgeek.
11979eec94 Moved cmake scripts into the proper directories 2006-03-15 10:22:12 -06:00
jonas@eel.(none)
405b3ff6bf Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  eel.(none):/home/jonas/src/51-ndb
2006-03-15 10:27:01 +01:00
jonas@eel.(none)
71e351d59c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb-new
into  eel.(none):/home/jonas/src/51-ndb
2006-03-15 08:21:53 +01:00
petr@mysql.com
307b724bbc WL#3154 "Enable REPAIR for CSV tables".
This is the first commit. Cleanups are
likely to follow after the merge.
2006-03-13 19:36:34 +03:00
knielsen@mysql.com
140523a6f5 Fix compile problem (jump across initialization). 2006-03-13 16:32:45 +01:00
knielsen@mysql.com
7f27d9824f Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-03-13 16:08:20 +01:00
knielsen@mysql.com
4d3ad1564d Misc. portability compile fixes. 2006-03-13 16:07:00 +01:00
jonas@perch.ndb.mysql.com
95468faab3 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-13 14:49:15 +01:00
jonas@perch.ndb.mysql.com
ce81e2b090 Merge perch.ndb.mysql.com:/home/jonas/src/51-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-13 13:49:37 +01:00
jonas@perch.ndb.mysql.com
ee7ffddf01 ndb - bug#18026
incorrect handling of varsize primary key and charsets in tup-scan
2006-03-13 13:37:42 +01:00
jonas@perch.ndb.mysql.com
4561b28df2 ndb - bug#16669
put nrtrace in out file instead (debug compiled..)
2006-03-13 12:29:43 +01:00
jonas@perch.ndb.mysql.com
0d11c2c180 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/51-new
2006-03-13 09:36:39 +01:00
jonas@perch.ndb.mysql.com
4d436c320d ndb - remove incorrect assertion
bug#17854, bug#18000
2006-03-13 09:19:24 +01:00
petr@mysql.com
d91ea9e0cb Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
2006-03-13 10:27:03 +03:00
jonas@perch.ndb.mysql.com
45faa21a19 ndb -
Dont put object file in list of SOURCES...causing really weird make dist problem
2006-03-11 21:34:49 +01:00
jonas@perch.ndb.mysql.com
ec8ac0b3d7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-11 19:39:56 +01:00
kent@mysql.com
b103fa3a21 dict0dict.h, dict0dict.c, ha_innodb.cc:
Make inline dict_table_is_comp() visible to ha_innodb.c as innodb_dict_table_is_comp()
2006-03-11 19:13:31 +01:00
jonas@perch.ndb.mysql.com
9effe54359 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-11 16:11:36 +01:00
tomas@poseidon.ndb.mysql.com
e4b7cd8eab Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-11 07:26:58 +01:00
tomas@poseidon.ndb.mysql.com
6131b282e1 ndb suma: added some VM_TRACE debug printouts for reposrtSubscribers 2006-03-11 07:14:36 +01:00
jonas@perch.ndb.mysql.com
038b361596 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-11 07:02:08 +01:00
tomas@poseidon.ndb.mysql.com
485580e436 wl#3023 ndb to return correct tables for initial table maps
+ removed extra binlog events generated by drop table schema ops to produce predictable test cases
2006-03-11 06:58:48 +01:00
ingo@mysql.com
5fc79af387 Merge mysql.com:/home/mydev/mysql-5.0-bug14980
into  mysql.com:/home/mydev/mysql-5.1-bug14980
2006-03-10 17:52:28 +01:00
aivanov@mysql.com
9c11c63fa6 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/innodb/mysql-5.1-xx269
2006-03-10 19:31:05 +03:00
aivanov@mysql.com
d33b523271 Applied innodb-5.1-ss269 snapshot.
Fixed BUGS:
  #3300: "UPDATE statement with no index column in where condition locks
    all rows"
    Implement semi-consistent read to reduce lock conflicts at the cost
    of breaking serializability.
    ha_innobase::unlock_row(): reset the "did semi consistent read" flag
    ha_innobase::was_semi_consistent_read(),
    ha_innobase::try_semi_consistent_read(): new methods
    row_prebuilt_t, row_create_prebuilt(): add field row_read_type for
    keeping track of semi-consistent reads
    row_vers_build_for_semi_consistent_read(),
    row_sel_build_committed_vers_for_mysql(): new functions
    row_search_for_mysql(): implement semi-consistent reads

  #9802: "Foreign key checks disallow alter table".
    Added test cases.

  #12456: "Cursor shows incorrect data - DML does not affect,
    probably caching"
    This patch implements a high-granularity read view to be used with
    cursors. In this high-granularity consistent read view modifications 
    done by the creating transaction after the cursor is created or 
   future transactions are not visible. But those modifications that 
   transaction did before the cursor was created are visible.

  #12701: "Support >4GB buffer pool and log files on 64-bit Windows"
    Do not call os_file_create_tmpfile() at runtime. Instead, create all
    tempfiles at startup and guard access to them with mutexes.

  #13778: "If FOREIGN_KEY_CHECKS=0, one can create inconsistent FOREIGN KEYs".
    When FOREIGN_KEY_CHECKS=0 we still need to check that datatypes between
    foreign key references are compatible.

  #14189: "VARBINARY and BINARY variables: trailing space ignored with InnoDB"
    innobase_init(): Assert that
    DATA_MYSQL_BINARY_CHARSET_COLL == my_charset_bin.number.
    dtype_get_pad_char(): Do not pad VARBINARY or BINARY columns.
    row_ins_cascade_calc_update_vec(): Refuse ON UPDATE CASCADE when trying
    to change the length of a VARBINARY column that refers to or is referenced
    by a BINARY column. BINARY columns are no longer padded on comparison,
    and thus they cannot be padded on storage either.

  #14747: "Race condition can cause btr_search_drop_page_hash_index() to crash"
    Note that buf_block_t::index should be protected by btr_search_latch
    or an s-latch or x-latch on the index page.
    btr_search_drop_page_hash_index(): Read block->index while holding
    btr_search_latch and use the cached value in the loop.  Remove some
    redundant assertions.

  #15108: "mysqld crashes when innodb_log_file_size is set > 4G"

  #15308: "Problem of Order with Enum Column in Primary Key"

  #15550: "mysqld crashes in printing a FOREIGN KEY error in InnoDB"
    row_ins_foreign_report_add_err(): When printing the parent record,
    use the index in the parent table rather than the index in the child table.

  #15653: "Slow inserts to InnoDB if many thousands of .ibd files"
    Keep track on unflushed modifications to file spaces.  When there are tens
    of thousands of file spaces, flushing all files in fil_flush_file_spaces()
    would be very slow.
    fil_flush_file_spaces(): Only flush unflushed file spaces.
    fil_space_t, fil_system_t: Add a list of unflushed spaces.

  #15991: "innodb-file-per-table + symlink database + rename = cr"
   os_file_handle_error(): Map the error codes EXDEV, ENOTDIR, and EISDIR
   to the new code OS_FILE_PATH_ERROR. Treat this code as OS_FILE_PATH_ERROR.
   This fixes the crash on RENAME TABLE when the .ibd file is a symbolic link
   to a different file system.

  #16157: "InnoDB crashes when main location settings are empty"
    This patch is from Heikki.

  #16298: "InnoDB segfaults in INSERTs in upgrade of 4.0 -> 5.0 tables
    with VARCHAR BINARY"
    dict_load_columns(): Set the charset-collation code
    DATA_MYSQL_BINARY_CHARSET_COLL for those binary string columns
    that lack a charset-collation code, i.e., the tables were created
    with an older version of MySQL/InnoDB than 4.1.2.

  #16229: "MySQL/InnoDB uses full explicit table locks in trigger processing"
    Take a InnoDB table lock only if user has explicitly requested a table
    lock. Added some additional comments to store_lock() and external_lock().

  #16387: "InnoDB crash when dropping a foreign key <table>_ibfk_0"
    Do not mistake TABLENAME_ibfk_0 for auto-generated id.
    dict_table_get_highest_foreign_id(): Ignore foreign constraint
    identifiers starting with the pattern TABLENAME_ibfk_0.

  #16582: "InnoDB: Error in an adaptive hash index pointer to page"
    Account for a race condition when dropping the adaptive hash index
    for a B-tree page.
    btr_search_drop_page_hash_index(): Retry the operation if a hash index
    with different parameters was built meanwhile.  Add diagnostics for the
    case that hash node pointers to the page remain.
    btr_search_info_update_hash(), btr_search_info_update_slow():
    Document the parameter "info" as in/out.

  #16814: "SHOW INNODB STATUS format error in LATEST FOREIGN KEY ERROR
    section"
    Add a missing newline to the LAST FOREIGN KEY ERROR section in SHOW
    INNODB STATUS output.
    dict_foreign_error_report(): Always print a newline after invoking
    dict_print_info_on_foreign_key_in_create_format().

  #16827: "Better InnoDB error message if ibdata files omitted from my.cnf"

  #17126: "CHECK TABLE on InnoDB causes a short hang during check of adaptive
    hash"
    CHECK TABLE blocking other queries, by releasing the btr_search_latch
    periodically during the adaptive hash table validation.

  #17405: "Valgrind: conditional jump or move depends on unititialised values"
    buf_block_init(): Reset magic_n, buf_fix_count and io_fix to avoid
    testing uninitialized variables.
2006-03-10 19:22:21 +03:00
jonas@perch.ndb.mysql.com
864d34b0ab ndb dd -
implement limitation with only on logfile group, since SR is really buggy with several
2006-03-10 14:36:48 +01:00
mskold@mysql.com
7be8fddeb5 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-10 12:14:15 +01:00
mskold@mysql.com
fb3286312f Reverted to previous error codes, since some common tests depend in it 2006-03-10 09:57:00 +01:00
tomas@poseidon.ndb.mysql.com
f241771a3b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-09 20:49:10 +01:00
tomas@poseidon.ndb.mysql.com
b14c7abac2 ndb: store event operations per gci 2006-03-09 20:47:19 +01:00
mskold@mysql.com
5c9500438e Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-09 17:45:51 +01:00
mskold@mysql.com
5ebe4f37c4 Changed error code mapping for unique constraint violation 2006-03-09 17:44:37 +01:00
mskold@mysql.com
adb6c4debb bug#18040 - ndb online index build 2006-03-09 17:42:35 +01:00
pekka@mysql.com
6e07985293 ndb - bug#18067 bug#18075 closes these bugs 2006-03-09 17:16:04 +01:00
pekka@mysql.com
bdd57aeee0 ndb - bug#18067 [possibly partial] fix 2006-03-09 15:51:56 +01:00
pekka@mysql.com
81141285c0 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-03-09 15:51:55 +01:00
tomas@poseidon.ndb.mysql.com
280e2bf440 Bug #18106 Ndb: Online add index together with replication may cause mysqld core 2006-03-09 15:50:26 +01:00
jonas@perch.ndb.mysql.com
942015f43e ndb dd - fix bug with many logfile groups and sync_lsn 2006-03-09 15:42:55 +01:00
pekka@mysql.com
1dca4c8fa8 Merge mysql.com:/space/pekka/ndb/version/my51
into  mysql.com:/space/pekka/ndb/version/my51-dict
2006-03-09 13:31:09 +01:00
pekka@mysql.com
70dc08b992 ndb - fix bug#18075 varsize PK + blobs 2006-03-09 13:27:58 +01:00
jonas@perch.ndb.mysql.com
ecaf439e63 Merge perch.ndb.mysql.com:/home/jonas/src/51-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-09 11:16:09 +01:00
jonas@perch.ndb.mysql.com
7596ef861b bug#18101 - ndb
handle out of string buffer when creating triggers
2006-03-09 11:05:26 +01:00
jonas@perch.ndb.mysql.com
468aa0ca14 bug#18040 - ndb - online build of unique index
Make sure that senderData value in communiation with LQH does not get overwritten by incorrect union
2006-03-09 11:01:19 +01:00
jonas@perch.ndb.mysql.com
48a06bc628 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-09 10:01:59 +01:00
tomas@poseidon.ndb.mysql.com
696c76778a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-08 15:33:15 +01:00
mskold@mysql.com
ced966f215 Post fix review of patch for bug#17891 Partitions: NDB, crash on select .. where col is null or col 2006-03-08 08:35:34 +01:00
mskold@mysql.com
672c50e4f0 Fix for bug#17891 Partitions: NDB, crash on select .. where col is null or col = value 2006-03-07 16:36:36 +01:00
tomas@poseidon.ndb.mysql.com
f6f267ed0c Bug #18016 Some debug output in non-debug build 2006-03-07 14:44:33 +01:00
jonas@perch.ndb.mysql.com
f1529de522 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-07 08:06:50 +01:00
petr@mysql.com
0e853c79b7 Fix Bug#17600: Invalid data logged into mysql.slow_log
Recommit with post-review fixes.
2006-03-06 21:03:17 +03:00
pekka@mysql.com
7ca7705b3b ndb - bug#17761 blob tables patch 3b [closes the bug] 2006-03-06 11:15:23 +01:00
pekka@mysql.com
096ace92a6 ndb - bug#17761 blob tables patch 3a [requires next patch 3b] 2006-03-05 22:49:38 +01:00
jonas@eel.(none)
f805a87063 ndb test
add disk option to various bank tests
2006-03-04 08:26:27 +01:00
jonas@eel.(none)
a40d1af732 ndb dd -
increase max # of files
2006-03-03 19:17:49 +01:00
jonas@eel.(none)
afa2104291 ndb dd - bug#16386
Use shared pool for logfile group/undofiles in lgman
2006-03-03 19:16:24 +01:00
jonas@eel.(none)
ddebf42b80 ndb dd - bug#16913
Use shared pool for tablespaces/datafiles in tsman
2006-03-03 18:29:47 +01:00
jonas@eel.(none)
f867b02ae5 ndb dd - use shared pool for file/filegroup in dict 2006-03-03 18:14:56 +01:00
pekka@mysql.com
dd24ab56d5 ndb - blob tables vs dict cache : patch 2 - bug#17761 (maybe) 2006-03-03 11:16:56 +01:00
jonas@eel.(none)
9613c97726 ndb dd
Make Dbtup::Extent_info use RWPool for dynamic memory
2006-03-02 16:44:15 +01:00
jonas@perch.ndb.mysql.com
46ee3cb804 merge fix 2006-03-01 11:30:32 +01:00
jonas@perch.ndb.mysql.com
9afb736735 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2006-03-01 10:20:40 +01:00
jonas@perch.ndb.mysql.com
36d6b64cb6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-01 10:15:20 +01:00
jonas@eel.(none)
6ef250fdf1 ndb -
update micro benchmark (bench_pool)
2006-03-01 10:09:49 +01:00
kent@mysql.com
5d722a8491 Merge 2006-02-28 23:29:58 +01:00
pekka@mysql.com
06e879123f ndb - blob tables vs dict cache : patch 1 2006-02-28 17:01:47 +01:00
jonas@eel.(none)
b7a5070ba7 ndb dd -
create RWPool
  update bench_pool
2006-02-28 12:56:08 +01:00
dlenev@mysql.com
8dbdf5237e Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525
into  mysql.com:/home/dlenev/src/mysql-5.1-merges2
2006-02-27 20:00:07 +03:00
jonas@eel.(none)
6d4c8a61ca ndb dd -
convert Dbtup::Page_request and pgman::Page_request to WOPool
2006-02-25 22:12:16 +01:00
monty@mysql.com
1e2e9e2856 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2006-02-25 21:54:34 +02:00
pekka@mysql.com
23f544d62f ndb - sockaddr alignment fix, found on sunfire100a, can affect any non-x86 2006-02-25 17:25:22 +01:00
brian@zim.(none)
cb07d52a7e This patch cleans up two tests which were a bit fragile from other failing tests. It also removes some variables associated with removed RAID support. 2006-02-24 13:20:51 -08:00
jonas@eel.(none)
ba875278ea ndb dd
add reporting of shared pool
2006-02-23 20:51:58 +01:00
jonas@eel.(none)
47026d8e48 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb-new
into  eel.(none):/home/jonas/src/mysql-5.1-new
2006-02-23 17:55:44 +01:00
mskold@mysql.com
dc156c193d Added missing DBUG_RETURN 2006-02-23 16:25:52 +01:00
jonas@perch.ndb.mysql.com
aa28a25000 ndb dd -
fix static log waiter pool
2006-02-23 15:09:22 +01:00
jonas@perch.ndb.mysql.com
45608a0178 ndb dd - bug#17536
Fix incorrect assumption that sync(lsn) will be in order
  keep track of max sync(lsn)
2006-02-23 14:20:47 +01:00
kent@mysql.com
379ca816be Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-02-22 21:27:46 +01:00
kent@mysql.com
5d0187f0ae Makefile.am:
Change for 'make distcheck'
libmysqld.vcproj:
  Typo
2006-02-22 20:34:25 +01:00
jonas@eel.(none)
3e5ca03f84 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb-new
into  eel.(none):/home/jonas/src/mysql-5.1-new
2006-02-22 17:31:52 +01:00
jonas@eel.(none)
ae07b0a4d7 ndb dd
some more printouts in unit test of buddy
2006-02-22 17:29:49 +01:00
mskold@mysql.com
865a3c9204 Fixes for push version of discover of on-line altered table 2006-02-22 15:19:22 +01:00
jonas@perch.ndb.mysql.com
4c485eb13b ndb dd - bug#16657 - add new config variable 2006-02-22 14:23:53 +01:00
mskold@mysql.com
f56016ee66 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-02-22 09:10:55 +01:00
vtkachenko@quadxeon.mysql.com
ab301016f2 myisamdef.h, mi_locking.c, mi_dynrec.c:
Fix insert performance with mmap
2006-02-22 08:32:58 +01:00
jonas@perch.ndb.mysql.com
fa2d73a995 ndb
add more printouts to unit test of buddy allocator
2006-02-21 17:29:45 +01:00
mskold@mysql.com
043a16e34a Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb_improved_on-line_discover
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-02-21 13:54:58 +01:00
svoj@april.(none)
b18f91ab7b Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/BUG17116/mysql-5.1-new
2006-02-21 16:20:02 +04:00
jonas@eel.(none)
d8b3acdf50 ndb dd
- add resource limit to buddy allocator
2006-02-21 09:07:48 +01:00
pekka@mysql.com
11a7a3ea63 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-02-21 05:08:18 +01:00
pekka@mysql.com
54074472e5 ndb - fix event created by ndb_restore bug#17045 (not really) 2006-02-21 02:27:23 +01:00
tomas@poseidon.ndb.mysql.com
995d7ed1f9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-20 18:23:30 +01:00
pekka@mysql.com
976be6facc ndb - rbr blobs etc: minor changes bug#17045 bug#17505 2006-02-20 16:36:30 +01:00
pekka@mysql.com
32298c75c0 ndb - rbr blobs etc: set db/schema in injector_ndb before calling NDB 2006-02-20 12:07:12 +01:00
jonas@perch.ndb.mysql.com
0a311d93c9 ndb -
Fix online ordered index build of varsize table
2006-02-20 09:03:52 +01:00
jonas@perch.ndb.mysql.com
09c9d90d94 Merge perch.ndb.mysql.com:/home/jonas/src/51-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-02-20 08:40:24 +01:00
jonas@eel.(none)
af6688dcf9 ndb dd
dont sync create table during sr _or_ nr
2006-02-19 08:23:01 +01:00
pekka@mysql.com
6cfe04630b ndb - rbr blobs: fixes (not final) 2006-02-17 22:33:31 +01:00
jonas@eel.(none)
9c055711de ndb dd -
Init lsn
2006-02-17 18:30:01 +01:00
jonas@eel.(none)
6e9add7dee ndb -
bug fix in ordered index build
2006-02-17 17:06:33 +01:00
jonas@eel.(none)
93a7c5270b ndb dd -
sync create tabe to undo log, so that undo for other table is not run after SR
2006-02-17 17:05:17 +01:00
pekka@mysql.com
5007310de2 ndb - rbr blobs: remove obsolete problem-causing temporary fix 2006-02-17 11:53:39 +01:00
pekka@mysql.com
ad86b3e43a ndb - wl#3023 : pass tables per GCI to injector at epoch start 2006-02-16 14:54:30 +01:00
jonas@perch.ndb.mysql.com
a1ea437e7c Fix for solaris compiler 2006-02-16 13:12:25 +01:00
svoj@april.(none)
95de6b449e BUG#17116: myisam_ftdump doesn't work with fulltext indexes using a parser plugin
Fixed that myisam_ftdump fails (error 138 that is HA_ERR_UNSUPPORTED)
to open table with fulltext index with custom parser.
2006-02-16 15:39:15 +04:00
mskold@mysql.com
ae586462b2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb_improved_on-line_discover
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb_improved_on-line_discover
2006-02-16 10:15:44 +01:00
mskold@mysql.com
e62db4e18c Improvement of on-line discovery in injector thread 2006-02-16 10:07:31 +01:00
jonas@perch.ndb.mysql.com
5283af4efe Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-02-16 09:12:45 +01:00
jonas@perch.ndb.mysql.com
6c809561fe Merge perch.ndb.mysql.com:/home/jonas/src/51-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-02-16 09:07:17 +01:00
stewart@mysql.com
05696de46f Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug17411-thisisaverylongnamethatshouldbewaylongerthanthe128limitthatweprivouslyhadbutireallywantotestitandseethatitdoesreallywork.nowitshouldbeabout160charslongnonow.iwonderifanythingwillchokeornotwiththisoutrageouslylongpathname
into  mysql.com:/home/stewart/Documents/MySQL/5.1/new
2006-02-16 15:51:37 +11:00
ndbdev@ndbmaster.mysql.com
c71c156c19 ndb dd - Fix includes 2006-02-15 13:20:17 +01:00
jonas@perch.ndb.mysql.com
e9d9261d63 ndb dd -
Fix bug in tsman undo
2006-02-15 13:20:15 +01:00
serg@serg.mylan
48b8e842ca Automerge 2006-02-15 00:01:46 +01:00
serg@serg.mylan
63cfd11859 dbug changes:
1. dbug state is now local to a thread
2. new macros: DBUG_EXPLAIN, DBUG_EXPLAIN_INITIAL,
   DBUG_SET, DBUG_SET_INITIAL, DBUG_EVALUATE, DBUG_EVALUATE_IF
3. macros are do{}while(0) wrapped
4. incremental modifications to the dbug state (e.g. "+d,info:-t")
5. dbug code cleanup, style fixes
6. _db_on_ and DEBUGGER_ON/OFF removed
7. rest of MySQL code fixed because of 3 (missing ;) and 6
8. dbug manual updated
9. server variable @@debug (global and local) to control dbug from SQL!
a. -#T to print timestamps in the log
2006-02-14 22:36:11 +01:00
tomas@poseidon.ndb.mysql.com
0262bb9a11 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-14 17:05:35 +01:00
tomas@poseidon.ndb.mysql.com
a185ce2f39 Bug #16445 ndb, schema version error 241 after mysqld restart
- table dictionary status was checked only for Invalid
2006-02-14 17:03:35 +01:00
jonas@perch.ndb.mysql.com
9da4743888 bug#17183
ndb_restore in 5.1.6 with files from < 5.1.3
2006-02-14 11:48:15 +01:00
svoj@april.(none)
7e8b145b94 BUG#17117: header fille "plugin.h" does not have a namespace prefix
plugin.h has been moved into include/mysql/plugin.h
2006-02-14 13:51:25 +04:00
jonas@perch.ndb.mysql.com
a4d419320d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb-new
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2006-02-14 08:09:45 +01:00
jonas@eel.(none)
7ee44703f9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  eel.(none):/home/jonas/src/mysql-5.1-new
2006-02-14 08:01:57 +01:00
jonas@eel.(none)
635ce25bc3 ndb dd -
fix undo of bitmap
2006-02-14 07:57:43 +01:00
tomas@poseidon.ndb.mysql.com
ce10983ead forgot to commit in prev patch 2006-02-13 17:07:13 +01:00
tomas@poseidon.ndb.mysql.com
7db7cd462f Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-13 16:15:41 +01:00
tomas@poseidon.ndb.mysql.com
9a3b27dae9 manual merge 2006-02-13 14:25:31 +01:00
jonas@perch.ndb.mysql.com
bb043db2c9 ndb - Change block constructor for more flexibility
Remove old typedef's ArrayFifoList, ArrayList
2006-02-13 13:12:47 +01:00
mskold@mysql.com
e593c614cb Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-02-13 11:25:18 +01:00
kent@mysql.com
eb9683442d Merge 2006-02-12 20:45:03 +01:00
tomas@poseidon.ndb.mysql.com
f0d95d0af3 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-10 18:04:46 +01:00
joerg@mysql.com
6c464815c9 Several Netware specific fixes.
Originally, done by Jani and pushed to the general 5.1 tree
as ChangeSet 2006/02/02 16:22:31+02:00 jani@ua141d10.elisa.omakaista.fi
now just copied to the 5.1.6 build clone.
2006-02-10 13:50:22 +01:00
joerg@mysql.com
e252af334c storage/innobase/include/univ.i : Get rid of "extern inline" (part of innodb-5.0-149/162 snapshots). 2006-02-10 12:39:31 +01:00
jonas@perch.ndb.mysql.com
978852ed1e Merge perch.ndb.mysql.com:/home/jonas/src/51-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-02-10 09:56:08 +01:00
jonas@perch.ndb.mysql.com
5a9168eddc Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-new
2006-02-10 09:50:34 +01:00
jonas@perch.ndb.mysql.com
27a0d35c13 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-new
2006-02-10 09:20:09 +01:00
aivanov@mysql.com
f8f8af970e Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/innodb/mysql-5.1-merged
2006-02-10 01:15:45 +03:00
aivanov@mysql.com
e22d2f1150 Fixed BUG#9680: Wrong error from cascading update
Applied 9680.patch (by Osku Salerma)
2006-02-09 20:43:10 +03:00
konstantin@mysql.com
2a267fed2f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-09 14:22:34 +03:00
konstantin@mysql.com
e1f807af26 Merge mysql.com:/home/kostja/mysql/mysql-5.0-root
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-09 13:35:59 +03:00