diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-20 18:51:43 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-20 18:51:43 +0200 |
| commit | 58bb0769bdf13a9747e900aa2f0955137738ce9d (patch) | |
| tree | 1b46ea0f72dce27532f0c87c60ba8a1baa453fa0 /storage | |
| parent | 7e497abcfb3e761ba5a368316192ae930fb58f6b (diff) | |
| parent | de3c4428b8c759e85631d8d70b5845c872de5400 (diff) | |
| download | mariadb-git-58bb0769bdf13a9747e900aa2f0955137738ce9d.tar.gz | |
Merge with MySQL 5.1.55
- Fixed some issues with partitions and connection_string, which also fixed lp:716890 "Pre- and post-recovery crash in Aria"
- Fixed wrong assert in Aria
Now need to merge with latest xtradb before pushing
sql/ha_partition.cc:
Ensure that m_ordered_rec_buffer is not freed before close.
sql/mysqld.cc:
Changed to use opt_stack_trace instead of opt_pstack.
Removed references to pstack
sql/partition_element.h:
Ensure that connect_string is initialized
storage/maria/ma_key_recover.c:
Fixed wrong assert
Diffstat (limited to 'storage')
156 files changed, 2189 insertions, 3506 deletions
diff --git a/storage/heap/hp_delete.c b/storage/heap/hp_delete.c index 9e9e28da335..ceba0fcf12e 100644 --- a/storage/heap/hp_delete.c +++ b/storage/heap/hp_delete.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2002, 2004-200 MySQL AB +/* Copyright (C) 2000-2002, 2004-2007 MySQL AB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/storage/innobase/btr/btr0btr.c b/storage/innobase/btr/btr0btr.c index b1b59227883..9438277050d 100644 --- a/storage/innobase/btr/btr0btr.c +++ b/storage/innobase/btr/btr0btr.c @@ -610,7 +610,7 @@ btr_page_get_father_for_rec( "InnoDB: corruption. If the crash happens at " "the database startup, see\n" "InnoDB: http://dev.mysql.com/doc/refman/5.1/en/" - "forcing-recovery.html about\n" + "forcing-innodb-recovery.html about\n" "InnoDB: forcing recovery. " "Then dump + drop + reimport.\n", stderr); } diff --git a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c index 500088c3901..08e033e7a63 100644 --- a/storage/innobase/buf/buf0buf.c +++ b/storage/innobase/buf/buf0buf.c @@ -334,7 +334,7 @@ buf_page_is_corrupted( "InnoDB: tablespace but not the InnoDB " "log files. See\n" "InnoDB: http://dev.mysql.com/doc/refman/" - "5.1/en/forcing-recovery.html\n" + "5.1/en/forcing-innodb-recovery.html\n" "InnoDB: for more information.\n", (ulong) mach_read_from_4(read_buf + FIL_PAGE_OFFSET), @@ -2067,7 +2067,7 @@ buf_page_io_complete( " table for corruption.\n" "InnoDB: See also" " http://dev.mysql.com/doc/refman/5.1/en/" - "forcing-recovery.html\n" + "forcing-innodb-recovery.html\n" "InnoDB: about forcing recovery.\n", stderr); if (srv_force_recovery < SRV_FORCE_IGNORE_CORRUPT) { diff --git a/storage/innobase/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c index b52a94c3348..fda6555e082 100644 --- a/storage/innobase/dict/dict0dict.c +++ b/storage/innobase/dict/dict0dict.c @@ -2217,7 +2217,7 @@ dict_scan_to( quote = '\0'; } else if (quote) { /* Within quotes: do nothing. */ - } else if (*ptr == '`' || *ptr == '"') { + } else if (*ptr == '`' || *ptr == '"' || *ptr == '\'') { /* Starting quote: remember the quote character. */ quote = *ptr; } else { diff --git a/storage/innobase/dict/dict0mem.c b/storage/innobase/dict/dict0mem.c index 168771ca307..9573ea18fde 100644 --- a/storage/innobase/dict/dict0mem.c +++ b/storage/innobase/dict/dict0mem.c @@ -87,6 +87,8 @@ dict_mem_table_create( table->big_rows = 0; + table->fk_max_recusive_level = 0; + mutex_create(&table->autoinc_mutex, SYNC_DICT_AUTOINC_MUTEX); table->autoinc = 0; diff --git a/storage/innobase/fsp/fsp0fsp.c b/storage/innobase/fsp/fsp0fsp.c index 1f033c4b140..d228e683957 100644 --- a/storage/innobase/fsp/fsp0fsp.c +++ b/storage/innobase/fsp/fsp0fsp.c @@ -3046,7 +3046,7 @@ fseg_free_page_low( crash: fputs("InnoDB: Please refer to\n" "InnoDB: http://dev.mysql.com/doc/refman/5.1/en/" - "forcing-recovery.html\n" + "forcing-innodb-recovery.html\n" "InnoDB: about forcing recovery.\n", stderr); ut_error; } diff --git a/storage/innobase/include/buf0buf.ic b/storage/innobase/include/buf0buf.ic index b077ff0c181..58c5fd9ef3d 100644 --- a/storage/innobase/include/buf0buf.ic +++ b/storage/innobase/include/buf0buf.ic @@ -218,7 +218,7 @@ buf_block_align( "InnoDB: corruption. If this happens in an" " InnoDB database recovery, see\n" "InnoDB: http://dev.mysql.com/doc/refman/5.1/en/" - "forcing-recovery.html\n" + "forcing-innodb-recovery.html\n" "InnoDB: how to force recovery.\n", ptr, frame_zero, buf_pool->high_end); @@ -257,7 +257,7 @@ buf_frame_align( "InnoDB: corruption. If this happens in an" " InnoDB database recovery, see\n" "InnoDB: http://dev.mysql.com/doc/refman/5.1/en/" - "forcing-recovery.html\n" + "forcing-innodb-recovery.html\n" "InnoDB: how to force recovery.\n", ptr, buf_pool->frame_zero, buf_pool->high_end); diff --git a/storage/innobase/log/log0recv.c b/storage/innobase/log/log0recv.c index 6e1ca58cb15..9683486238c 100644 --- a/storage/innobase/log/log0recv.c +++ b/storage/innobase/log/log0recv.c @@ -1826,7 +1826,7 @@ recv_report_corrupt_log( "InnoDB: on your InnoDB tables to check that they are ok!\n" "InnoDB: If mysqld crashes after this recovery, look at\n" "InnoDB: http://dev.mysql.com/doc/refman/5.1/en/" - "forcing-recovery.html\n" + "forcing-innodb-recovery.html\n" "InnoDB: about forcing recovery.\n", stderr); fflush(stderr); diff --git a/storage/innobase/row/row0mysql.c b/storage/innobase/row/row0mysql.c index 4fdd92c7cba..cee97871470 100644 --- a/storage/innobase/row/row0mysql.c +++ b/storage/innobase/row/row0mysql.c @@ -552,7 +552,7 @@ handle_new_error: " after the startup or when\n" "InnoDB: you dump the tables, look at\n" "InnoDB: http://dev.mysql.com/doc/refman/5.1/en/" - "forcing-recovery.html" + "forcing-innodb-recovery.html" " for help.\n", stderr); } else if (err == DB_FOREIGN_EXCEED_MAX_CASCADE) { diff --git a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c index 9d057110d11..4c4360f819e 100644 --- a/storage/innobase/srv/srv0start.c +++ b/storage/innobase/srv/srv0start.c @@ -1247,6 +1247,23 @@ innobase_start_or_create_for_mysql(void) fil_init(srv_max_n_open_files); + /* Print time to initialize the buffer pool */ + ut_print_timestamp(stderr); + fprintf(stderr, + " InnoDB: Initializing buffer pool, size ="); + + if (srv_pool_size * UNIV_PAGE_SIZE >= 1024 * 1024 * 1024) { + fprintf(stderr, + " %.1fG\n", + ((double) (srv_pool_size * UNIV_PAGE_SIZE)) + / (1024 * 1024 * 1024)); + } else { + fprintf(stderr, + " %.1fM\n", + ((double) (srv_pool_size * UNIV_PAGE_SIZE)) + / (1024 * 1024)); + } + if (srv_use_awe) { fprintf(stderr, "InnoDB: Using AWE: Memory window is %lu MB" @@ -1267,6 +1284,8 @@ innobase_start_or_create_for_mysql(void) srv_pool_size); } + ut_print_timestamp(stderr); + if (ret == NULL) { fprintf(stderr, "InnoDB: Fatal error: cannot allocate the memory" @@ -1275,6 +1294,9 @@ innobase_start_or_create_for_mysql(void) return(DB_ERROR); } + fprintf(stderr, + " InnoDB: Completed initialization of buffer pool\n"); + fsp_init(); log_init(); diff --git a/storage/innobase/sync/sync0rw.c b/storage/innobase/sync/sync0rw.c index 367f019ce55..0b05fb826ac 100644 --- a/storage/innobase/sync/sync0rw.c +++ b/storage/innobase/sync/sync0rw.c @@ -888,7 +888,7 @@ rw_lock_debug_print( rwt = info->lock_type; - fprintf(stderr, "Locked: thread %ld file %s line %ld ", + fprintf(stderr, "Locked: thread %lu file %s line %lu ", (ulong) os_thread_pf(info->thread_id), info->file_name, (ulong) info->line); if (rwt == RW_LOCK_SHARED) { diff --git a/storage/innobase/ut/ut0dbg.c b/storage/innobase/ut/ut0dbg.c index 8c4be190d77..88be1b34d9b 100644 --- a/storage/innobase/ut/ut0dbg.c +++ b/storage/innobase/ut/ut0dbg.c @@ -58,7 +58,7 @@ ut_dbg_assertion_failed( "InnoDB: immediately after the mysqld startup, there may be\n" "InnoDB: corruption in the InnoDB tablespace. Please refer to\n" "InnoDB: http://dev.mysql.com/doc/refman/5.1/en/" - "forcing-recovery.html\n" + "forcing-innodb-recovery.html\n" "InnoDB: about forcing recovery.\n", stderr); #if defined(UNIV_SYNC_DEBUG) || !defined(UT_DBG_USE_ABORT) ut_dbg_stop_threads = TRUE; diff --git a/storage/innodb_plugin/ChangeLog b/storage/innodb_plugin/ChangeLog index 0cd8ac8a7e6..bf003b810d2 100644 --- a/storage/innodb_plugin/ChangeLog +++ b/storage/innodb_plugin/ChangeLog @@ -1,13 +1,96 @@ +2011-01-06 The InnoDB Team + * row/row0merge.c: + Fix Bug#59312 Examine MAX_FULL_NAME_LEN in InnoDB to address + possible insufficient name buffer + +2011-01-06 The InnoDB Team + * dict/dict0dict.c, handler/ha_innodb.cc, handler/i_s.cc, + include/univ.i: + Fix Bug#58643 InnoDB: too long table name + +2011-01-06 The InnoDB Team + * handler/i_s.cc, include/trx0i_s.h, trx/trx0i_s.c: + Fix Bug#55397 cannot select from innodb_trx when trx_query contains + blobs that aren't strings + +2011-01-04 The InnoDB Team + * dict/dict0dict.c: + Fix Bug#59197 double quote in field comment prevents foreign + key constraint creation + +2010-12-21 The InnoDB Team + * include/btr0cur.h, include/row0upd.h, btr/btr0cur.c, + row/row0umod.c, row/row0upd.c: + Fix Bug#55284 Double free of off-page columns due to lock wait + while updating PRIMARY KEY + +2010-12-21 The InnoDB Team + + * include/data0data.h, include/data0data.ic, include/row0upd.h, + btr/btr0cur.c, row/row0purge.c, row/row0umod.c, row/row0upd.c, + innodb.result, innodb.test: + Fix Bug#58912 InnoDB unnecessarily avoids update-in-place + on column prefix indexes + +2010-12-09 The InnoDB Team + + * buf/buf0lru.c: + Fix Bug#57600 output of I/O sum[%lu] can go negative + +2010-11-11 The InnoDB Team + + * thr/thr0loc.c, trx/trx0i_s.c: + Fix Bug#57802 Empty ASSERTION parameter passed to the HASH_SEARCH macro + +2010-11-10 The InnoDB Team + + * dict/dict0dict.c, handler/handler0alter.cc, include/dict0dict.h + row/row0merge.c: + Fix Bug#55084 InnoDB crash and corruption after ALTER TABLE + +2010-11-10 The InnoDB Team + + * srv/srv0start.c: + Fix Bug#48026 Log start and end of InnoDB buffer pool + initialization to the error log + +2010-11-03 The InnoDB Team + + * include/btr0btr.h, include/btr0btr.ic, dict/dict0crea.c: + Fix Bug#57947 InnoDB diagnostics shows btr_block_get calls + instead of real callers + +2010-11-03 The InnoDB Team + + * fil/fil0fil.c, fsp/fsp0fsp.c, handler/ha_innodb.cc, + include/fil0fil.h, include/univ.i: + Fix Bug #54538 - use of exclusive innodb dictionary lock limits + performance. + +2010-11-02 The InnoDB Team + + * btr/btr0cur.c, dict/dict0dict.c, dict/dict0load.c, + handler/ha_innodb.cc, include/dict0dict.h, row/row0mysql.c, + innodb_bug53046.result, innodb_bug53046.test: + Fix Bug#53046 dict_update_statistics_low can still be run + concurrently on same table + +2010-11-02 The InnoDB Team + + * row/row0sel.c: + Fix Bug#57799 READ UNCOMMITTED access failure of off-page + DYNAMIC or COMPRESSED columns again + 2010-10-24 The InnoDB Team * row/row0mysql.c - Fix Bug #57700 Latching order violation in + Fix Bug#57700 Latching order violation in row_truncate_table_for_mysql() 2010-10-20 The InnoDB Team * dict/dict0load.c - Fix Bug #57616 Sig 11 in dict_load_table() when failed to load + Fix Bug#57616 Sig 11 in dict_load_table() when failed to load index or foreign key 2010-10-19 The InnoDB Team @@ -17,7 +100,7 @@ include/ibuf0ibuf.h, include/row0mysql.h, row/row0mysql.c, row/row0sel.c, innodb_bug56680.test, innodb_bug56680.result: - Fix Bug #56680 InnoDB may return wrong results from a + Fix Bug#56680 InnoDB may return wrong results from a case-insensitive covering index 2010-10-18 The InnoDB Team @@ -72,7 +155,7 @@ 2010-08-03 The InnoDB Team * include/dict0dict.h, include/dict0dict.ic, row/row0mysql.c: - Fix bug #54678, InnoDB, TRUNCATE, ALTER, I_S SELECT, crash or deadlock + Fix Bug#54678 InnoDB, TRUNCATE, ALTER, I_S SELECT, crash or deadlock 2010-08-03 The InnoDB Team @@ -146,7 +229,7 @@ * dict/dict0load.c, fil/fil0fil.c: Fix Bug#54658: InnoDB: Warning: allocated tablespace %lu, - old maximum was 0 (introduced in Bug #53578 fix) + old maximum was 0 (introduced in Bug#53578 fix) 2010-06-16 The InnoDB Team diff --git a/storage/innodb_plugin/btr/btr0btr.c b/storage/innodb_plugin/btr/btr0btr.c index 29cd470e650..32e2caecdb8 100644 --- a/storage/innodb_plugin/btr/btr0btr.c +++ b/storage/innodb_plugin/btr/btr0btr.c @@ -663,7 +663,7 @@ btr_page_get_father_node_ptr_func( " to fix the\n" "InnoDB: corruption. If the crash happens at " "the database startup, see\n" - "InnoDB: " REFMAN "forcing-recovery.html about\n" + "InnoDB: " REFMAN "forcing-innodb-recovery.html about\n" "InnoDB: forcing recovery. " "Then dump + drop + reimport.\n", stderr); diff --git a/storage/innodb_plugin/btr/btr0cur.c b/storage/innodb_plugin/btr/btr0cur.c index 79fe328a631..c57255a25ae 100644 --- a/storage/innodb_plugin/btr/btr0cur.c +++ b/storage/innodb_plugin/btr/btr0cur.c @@ -953,7 +953,7 @@ btr_cur_ins_lock_and_undo( not zero, the parameters index and thr should be specified */ btr_cur_t* cursor, /*!< in: cursor on page after which to insert */ - const dtuple_t* entry, /*!< in: entry to insert */ + dtuple_t* entry, /*!< in/out: entry to insert */ que_thr_t* thr, /*!< in: query thread or NULL */ mtr_t* mtr, /*!< in/out: mini-transaction */ ibool* inherit)/*!< out: TRUE if the inserted new record maybe @@ -1756,7 +1756,8 @@ btr_cur_update_in_place( NOT call it if index is secondary */ if (!dict_index_is_clust(index) - || row_upd_changes_ord_field_binary(NULL, index, update)) { + || row_upd_changes_ord_field_binary(NULL, NULL, + index, update)) { /* Remove possible hash index pointer to this record */ btr_search_update_hash_on_delete(cursor); @@ -2508,27 +2509,24 @@ ulint btr_cur_del_mark_set_clust_rec( /*===========================*/ ulint flags, /*!< in: undo logging and locking flags */ - btr_cur_t* cursor, /*!< in: cursor */ + buf_block_t* block, /*!< in/out: buffer block of the record */ + rec_t* rec, /*!< in/out: record */ + dict_index_t* index, /*!< in: clustered index of the record */ + const ulint* offsets,/*!< in: rec_get_offsets(rec) */ ibool val, /*!< in: value to set */ que_thr_t* thr, /*!< in: query thread */ mtr_t* mtr) /*!< in: mtr */ { - dict_index_t* index; - buf_block_t* block; roll_ptr_t roll_ptr; ulint err; - rec_t* rec; page_zip_des_t* page_zip; trx_t* trx; - mem_heap_t* heap = NULL; - ulint offsets_[REC_OFFS_NORMAL_SIZE]; - ulint* offsets = offsets_; - rec_offs_init(offsets_); - rec = btr_cur_get_rec(cursor); - index = cursor->index; + ut_ad(dict_index_is_clust(index)); + ut_ad(rec_offs_validate(rec, index, offsets)); ut_ad(!!page_rec_is_comp(rec) == dict_table_is_comp(index->table)); - offsets = rec_get_offsets(rec, index, offsets, ULINT_UNDEFINED, &heap); + ut_ad(buf_block_get_frame(block) == page_align(rec)); + ut_ad(page_is_leaf(page_align(rec))); #ifdef UNIV_DEBUG if (btr_cur_print_record_ops && thr) { @@ -2540,13 +2538,12 @@ btr_cur_del_mark_set_clust_rec( ut_ad(dict_index_is_clust(index)); ut_ad(!rec_get_deleted_flag(rec, rec_offs_comp(offsets))); - err = lock_clust_rec_modify_check_and_lock(flags, - btr_cur_get_block(cursor), + err = lock_clust_rec_modify_check_and_lock(flags, block, rec, index, offsets, thr); if (err != DB_SUCCESS) { - goto func_exit; + return(err); } err = trx_undo_report_row_operation(flags, TRX_UNDO_MODIFY_OP, thr, @@ -2554,11 +2551,9 @@ btr_cur_del_mark_set_clust_rec( &roll_ptr); if (err != DB_SUCCESS) { - goto func_exit; + return(err); } - block = btr_cur_get_block(cursor); - if (block->is_hashed) { rw_lock_x_lock(&btr_search_latch); } @@ -2581,10 +2576,6 @@ btr_cur_del_mark_set_clust_rec( btr_cur_del_mark_set_clust_rec_log(flags, rec, index, val, trx, roll_ptr, mtr); -func_exit: - if (UNIV_LIKELY_NULL(heap)) { - mem_heap_free(heap); - } return(err); } @@ -3355,8 +3346,6 @@ btr_estimate_number_of_different_key_vals( also the pages used for external storage of fields (those pages are included in index->stat_n_leaf_pages) */ - dict_index_stat_mutex_enter(index); - for (j = 0; j <= n_cols; j++) { index->stat_n_diff_key_vals[j] = ((n_diff[j] @@ -3386,8 +3375,6 @@ btr_estimate_number_of_different_key_vals( index->stat_n_diff_key_vals[j] += add_on; } - dict_index_stat_mutex_exit(index); - mem_free(n_diff); if (UNIV_LIKELY_NULL(heap)) { mem_heap_free(heap); @@ -3480,108 +3467,36 @@ btr_cur_set_ownership_of_extern_field( } /*******************************************************************//** -Marks not updated extern fields as not-owned by this record. The ownership -is transferred to the updated record which is inserted elsewhere in the +Marks non-updated off-page fields as disowned by this record. The ownership +must be transferred to the updated record which is inserted elsewhere in the index tree. In purge only the owner of externally stored field is allowed -to free the field. -@return TRUE if BLOB ownership was transferred */ +to free the field. */ UNIV_INTERN -ibool -btr_cur_mark_extern_inherited_fields( -/*=================================*/ +void +btr_cur_disown_inherited_fields( +/*============================*/ page_zip_des_t* page_zip,/*!< in/out: compressed page whose uncompressed part will be updated, or NULL */ rec_t* rec, /*!< in/out: record in a clustered index */ dict_index_t* index, /*!< in: index of the page */ const ulint* offsets,/*!< in: array returned by rec_get_offsets() */ const upd_t* update, /*!< in: update vector */ - mtr_t* mtr) /*!< in: mtr, or NULL if not logged */ + mtr_t* mtr) /*!< in/out: mini-transaction */ { - ulint n; - ulint j; ulint i; - ibool change_ownership = FALSE; - ut_ad(rec_offs_validate(rec, NULL, offsets)); + ut_ad(rec_offs_validate(rec, index, offsets)); ut_ad(!rec_offs_comp(offsets) || !rec_get_node_ptr_flag(rec)); + ut_ad(rec_offs_any_extern(offsets)); + ut_ad(mtr); - if (!rec_offs_any_extern(offsets)) { - - return(FALSE); - } - - n = rec_offs_n_fields(offsets); - - for (i = 0; i < n; i++) { - if (rec_offs_nth_extern(offsets, i)) { - - /* Check it is not in updated fields */ - - if (update) { - for (j = 0; j < upd_get_n_fields(update); - j++) { - if (upd_get_nth_field(update, j) - ->field_no == i) { - - goto updated; - } - } - } - + for (i = 0; i < rec_offs_n_fields(offsets); i++) { + if (rec_offs_nth_extern(offsets, i) + && !upd_get_field_by_field_no(update, i)) { btr_cur_set_ownership_of_extern_field( page_zip, rec, index, offsets, i, FALSE, mtr); - - change_ownership = TRUE; -updated: - ; } } - - return(change_ownership); -} - -/*******************************************************************//** -The complement of the previous function: in an update entry may inherit -some externally stored fields from a record. We must mark them as inherited -in entry, so that they are not freed in a rollback. */ -UNIV_INTERN -void -btr_cur_mark_dtuple_inherited_extern( -/*=================================*/ - dtuple_t* entry, /*!< in/out: updated entry to be - inserted to clustered index */ - const upd_t* update) /*!< in: update vector */ -{ - ulint i; - - for (i = 0; i < dtuple_get_n_fields(entry); i++) { - - dfield_t* dfield = dtuple_get_nth_field(entry, i); - byte* data; - ulint len; - ulint j; - - if (!dfield_is_ext(dfield)) { - continue; - } - - /* Check if it is in updated fields */ - - for (j = 0; j < upd_get_n_fields(update); j++) { - if (upd_get_nth_field(update, j)->field_no == i) { - - goto is_updated; - } - } - - data = dfield_get_data(dfield); - len = dfield_get_len(dfield); - data[len - BTR_EXTERN_FIELD_REF_SIZE + BTR_EXTERN_LEN] - |= BTR_EXTERN_INHERITED_FLAG; - -is_updated: - ; - } } /*******************************************************************//** @@ -3620,29 +3535,6 @@ btr_cur_unmark_extern_fields( } /*******************************************************************//** -Marks all extern fields in a dtuple as owned by the record. */ -UNIV_INTERN -void -btr_cur_unmark_dtuple_extern_fields( -/*================================*/ - dtuple_t* entry) /*!< in/out: clustered index entry */ -{ - ulint i; - - for (i = 0; i < dtuple_get_n_fields(entry); i++) { - dfield_t* dfield = dtuple_get_nth_field(entry, i); - - if (dfield_is_ext(dfield)) { - byte* data = dfield_get_data(dfield); - ulint len = dfield_get_len(dfield); - - data[len - BTR_EXTERN_FIELD_REF_SIZE + BTR_EXTERN_LEN] - &= ~BTR_EXTERN_OWNER_FLAG; - } - } -} - -/*******************************************************************//** Flags the data tuple fields that are marked as extern storage in the update vector. We use this function to remember which fields we must mark as extern storage in a record inserted for an update. @@ -3794,7 +3686,7 @@ Stores the fields in big_rec_vec to the tablespace and puts pointers to them in rec. The extern flags in rec will have to be set beforehand. The fields are stored on pages allocated from leaf node file segment of the index tree. -@return DB_SUCCESS or error */ +@return DB_SUCCESS or DB_OUT_OF_FILE_SPACE */ UNIV_INTERN ulint btr_store_big_rec_extern_fields( diff --git a/storage/innodb_plugin/buf/buf0buf.c b/storage/innodb_plugin/buf/buf0buf.c index 65d4311b840..dac416f9472 100644 --- a/storage/innodb_plugin/buf/buf0buf.c +++ b/storage/innodb_plugin/buf/buf0buf.c @@ -375,7 +375,7 @@ buf_page_is_corrupted( "you may have copied the InnoDB\n" "InnoDB: tablespace but not the InnoDB " "log files. See\n" - "InnoDB: " REFMAN "forcing-recovery.html\n" + "InnoDB: " REFMAN "forcing-innodb-recovery.html\n" "InnoDB: for more information.\n", (ulong) mach_read_from_4(read_buf + FIL_PAGE_OFFSET), @@ -3240,7 +3240,7 @@ corrupt: "InnoDB: TABLE to scan your" " table for corruption.\n" "InnoDB: See also " - REFMAN "forcing-recovery.html\n" + REFMAN "forcing-innodb-recovery.html\n" "InnoDB: about forcing recovery.\n", stderr); if (srv_force_recovery < SRV_FORCE_IGNORE_CORRUPT) { diff --git a/storage/innodb_plugin/buf/buf0flu.c b/storage/innodb_plugin/buf/buf0flu.c index 2123f8a060d..3a9975ce4b7 100644 --- a/storage/innodb_plugin/buf/buf0flu.c +++ b/storage/innodb_plugin/buf/buf0flu.c @@ -1710,9 +1710,9 @@ buf_flush_validate_low(void) ut_a(om > 0); if (UNIV_LIKELY_NULL(buf_pool->flush_rbt)) { + buf_page_t* rpage; ut_a(rnode); - buf_page_t* rpage = *rbt_value(buf_page_t*, - rnode); + rpage = *rbt_value(buf_page_t*, rnode); ut_a(rpage); ut_a(rpage == bpage); rnode = rbt_next(buf_pool->flush_rbt, rnode); diff --git a/storage/innodb_plugin/buf/buf0lru.c b/storage/innodb_plugin/buf/buf0lru.c index 78d8d348e2a..e4cf218bf2e 100644 --- a/storage/innodb_plugin/buf/buf0lru.c +++ b/storage/innodb_plugin/buf/buf0lru.c @@ -1942,6 +1942,7 @@ buf_LRU_stat_update(void) /*=====================*/ { buf_LRU_stat_t* item; + buf_LRU_stat_t cur_stat; /* If we haven't started eviction yet then don't update stats. */ if (buf_pool->freed_page_clock == 0) { @@ -1955,12 +1956,19 @@ buf_LRU_stat_update(void) buf_LRU_stat_arr_ind++; buf_LRU_stat_arr_ind %= BUF_LRU_STAT_N_INTERVAL; - /* Add the current value and subtract the obsolete entry. */ - buf_LRU_stat_sum.io += buf_LRU_stat_cur.io - item->io; - buf_LRU_stat_sum.unzip += buf_LRU_stat_cur.unzip - item->unzip; + /* Add the current value and subtract the obsolete entry. + Since buf_LRU_stat_cur is not protected by any mutex, + it can be changing between adding to buf_LRU_stat_sum + and copying to item. Assign it to local variables to make + sure the same value assign to the buf_LRU_stat_sum + and item */ + cur_stat = buf_LRU_stat_cur; + + buf_LRU_stat_sum.io += cur_stat.io - item->io; + buf_LRU_stat_sum.unzip += cur_stat.unzip - item->unzip; /* Put current entry in the array. */ - memcpy(item, &buf_LRU_stat_cur, sizeof *item); + memcpy(item, &cur_stat, sizeof *item); buf_pool_mutex_exit(); diff --git a/storage/innodb_plugin/dict/dict0crea.c b/storage/innodb_plugin/dict/dict0crea.c index e63f8bc3e6a..7d6cbc8c1c8 100644 --- a/storage/innodb_plugin/dict/dict0crea.c +++ b/storage/innodb_plugin/dict/dict0crea.c @@ -828,7 +828,7 @@ dict_truncate_index_tree( appropriate field in the SYS_INDEXES record: this mini-transaction marks the B-tree totally truncated */ - btr_page_get(space, zip_size, root_page_no, RW_X_LATCH, mtr); + btr_block_get(space, zip_size, root_page_no, RW_X_LATCH, mtr); btr_free_root(space, zip_size, root_page_no, mtr); create: diff --git a/storage/innodb_plugin/dict/dict0dict.c b/storage/innodb_plugin/dict/dict0dict.c index a3575c283cd..9474ab3582a 100644 --- a/storage/innodb_plugin/dict/dict0dict.c +++ b/storage/innodb_plugin/dict/dict0dict.c @@ -80,9 +80,18 @@ UNIV_INTERN rw_lock_t dict_operation_lock; /** Identifies generated InnoDB foreign key names */ static char dict_ibfk[] = "_ibfk_"; -/** array of mutexes protecting dict_index_t::stat_n_diff_key_vals[] */ -#define DICT_INDEX_STAT_MUTEX_SIZE 32 -static mutex_t dict_index_stat_mutex[DICT_INDEX_STAT_MUTEX_SIZE]; +/** array of rw locks protecting +dict_table_t::stat_initialized +dict_table_t::stat_n_rows (*) +dict_table_t::stat_clustered_index_size +dict_table_t::stat_sum_of_other_index_sizes +dict_table_t::stat_modified_counter (*) +dict_table_t::indexes*::stat_n_diff_key_vals[] +dict_table_t::indexes*::stat_index_size +dict_table_t::indexes*::stat_n_leaf_pages +(*) those are not always protected for performance reasons */ +#define DICT_TABLE_STATS_LATCHES_SIZE 64 +static rw_lock_t dict_table_stats_latches[DICT_TABLE_STATS_LATCHES_SIZE]; /*******************************************************************//** Tries to find column names for the index and sets the col field of the @@ -243,43 +252,65 @@ dict_mutex_exit_for_mysql(void) mutex_exit(&(dict_sys->mutex)); } -/** Get the mutex that protects index->stat_n_diff_key_vals[] */ -#define GET_INDEX_STAT_MUTEX(index) \ - (&dict_index_stat_mutex[ut_fold_dulint(index->id) \ - % DICT_INDEX_STAT_MUTEX_SIZE]) +/** Get the latch that protects the stats of a given table */ +#define GET_TABLE_STATS_LATCH(table) \ + (&dict_table_stats_latches[ut_fold_dulint(table->id) \ + % DICT_TABLE_STATS_LATCHES_SIZE]) /**********************************************************************//** -Lock the appropriate mutex to protect index->stat_n_diff_key_vals[]. -index->id is used to pick the right mutex and it should not change -before dict_index_stat_mutex_exit() is called on this index. */ +Lock the appropriate latch to protect a given table's statistics. +table->id is used to pick the corresponding latch from a global array of +latches. */ UNIV_INTERN void -dict_index_stat_mutex_enter( -/*========================*/ - const dict_index_t* index) /*!< in: index */ +dict_table_stats_lock( +/*==================*/ + const dict_table_t* table, /*!< in: table */ + ulint latch_mode) /*!< in: RW_S_LATCH or + RW_X_LATCH */ { - ut_ad(index != NULL); - ut_ad(index->magic_n == DICT_INDEX_MAGIC_N); - ut_ad(index->cached); - ut_ad(!index->to_be_dropped); + ut_ad(table != NULL); + ut_ad(table->magic_n == DICT_TABLE_MAGIC_N); - mutex_enter(GET_INDEX_STAT_MUTEX(index)); + switch (latch_mode) { + case RW_S_LATCH: + rw_lock_s_lock(GET_TABLE_STATS_LATCH(table)); + break; + case RW_X_LATCH: + rw_lock_x_lock(GET_TABLE_STATS_LATCH(table)); + break; + case RW_NO_LATCH: + /* fall through */ + default: + ut_error; + } } /**********************************************************************//** -Unlock the appropriate mutex that protects index->stat_n_diff_key_vals[]. */ +Unlock the latch that has been locked by dict_table_stats_lock() */ UNIV_INTERN void -dict_index_stat_mutex_exit( -/*=======================*/ - const dict_index_t* index) /*!< in: index */ +dict_table_stats_unlock( +/*====================*/ + const dict_table_t* table, /*!< in: table */ + ulint latch_mode) /*!< in: RW_S_LATCH or + RW_X_LATCH */ { - ut_ad(index != NULL); - ut_ad(index->magic_n == DICT_INDEX_MAGIC_N); - ut_ad(index->cached); - ut_ad(!index->to_be_dropped); + ut_ad(table != NULL); + ut_ad(table->magic_n == DICT_TABLE_MAGIC_N); - mutex_exit(GET_INDEX_STAT_MUTEX(index)); + switch (latch_mode) { + case RW_S_LATCH: + rw_lock_s_unlock(GET_TABLE_STATS_LATCH(table)); + break; + case RW_X_LATCH: + rw_lock_x_unlock(GET_TABLE_STATS_LATCH(table)); + break; + case RW_NO_LATCH: + /* fall through */ + default: + ut_error; + } } /********************************************************************//** @@ -668,8 +699,8 @@ dict_init(void) mutex_create(&dict_foreign_err_mutex, SYNC_ANY_LATCH); - for (i = 0; i < DICT_INDEX_STAT_MUTEX_SIZE; i++) { - mutex_create(&dict_index_stat_mutex[i], SYNC_INDEX_TREE); + for (i = 0; i < DICT_TABLE_STATS_LATCHES_SIZE; i++) { + rw_lock_create(&dict_table_stats_latches[i], SYNC_INDEX_TREE); } } @@ -700,12 +731,11 @@ dict_table_get( mutex_exit(&(dict_sys->mutex)); if (table != NULL) { - if (!table->stat_initialized) { - /* If table->ibd_file_missing == TRUE, this will - print an error message and return without doing - anything. */ - dict_update_statistics(table); - } + /* If table->ibd_file_missing == TRUE, this will + print an error message and return without doing + anything. */ + dict_update_statistics(table, TRUE /* only update stats + if they have not been initialized */); } return(table); @@ -902,7 +932,7 @@ dict_table_rename_in_cache( dict_foreign_t* foreign; dict_index_t* index; ulint fold; - char old_name[MAX_TABLE_NAME_LEN + 1]; + char old_name[MAX_FULL_NAME_LEN + 1]; ut_ad(table); ut_ad(mutex_own(&(dict_sys->mutex))); @@ -914,7 +944,7 @@ dict_table_rename_in_cache( ut_print_timestamp(stderr); fprintf(stderr, "InnoDB: too long table name: '%s', " "max length is %d\n", table->name, - MAX_TABLE_NAME_LEN); + MAX_FULL_NAME_LEN); ut_error; } @@ -964,11 +994,11 @@ dict_table_rename_in_cache( ut_fold_string(old_name), table); if (strlen(new_name) > strlen(table->name)) { - /* We allocate MAX_TABLE_NAME_LEN+1 bytes here to avoid + /* We allocate MAX_FULL_NAME_LEN + 1 bytes here to avoid memory fragmentation, we assume a repeated calls of ut_realloc() with the same size do not cause fragmentation */ - ut_a(strlen(new_name) <= MAX_TABLE_NAME_LEN); - table->name = ut_realloc(table->name, MAX_TABLE_NAME_LEN + 1); + ut_a(strlen(new_name) <= MAX_FULL_NAME_LEN); + table->name = ut_realloc(table->name, MAX_FULL_NAME_LEN + 1); } memcpy(table->name, new_name, strlen(new_name) + 1); @@ -2658,7 +2688,7 @@ dict_scan_to( quote = '\0'; } else if (quote) { /* Within quotes: do nothing. */ - } else if (*ptr == '`' || *ptr == '"') { + } else if (*ptr == '`' || *ptr == '"' || *ptr == '\'') { /* Starting quote: remember the quote character. */ quote = *ptr; } else { @@ -4183,12 +4213,13 @@ Calculates new estimates for table and index statistics. The statistics are used in query optimization. */ UNIV_INTERN void -dict_update_statistics_low( -/*=======================*/ +dict_update_statistics( +/*===================*/ dict_table_t* table, /*!< in/out: table */ - ibool has_dict_mutex __attribute__((unused))) - /*!< in: TRUE if the caller has the - dictionary mutex */ + ibool only_calc_if_missing_stats)/*!< in: only + update/recalc the stats if they have + not been initialized yet, otherwise + do nothing */ { dict_index_t* index; ulint sum_of_index_sizes = 0; @@ -4216,6 +4247,12 @@ dict_update_statistics_low( return; } + dict_table_stats_lock(table, RW_X_LATCH); + + if (only_calc_if_missing_stats && table->stat_initialized) { + dict_table_stats_unlock(table, RW_X_LATCH); + return; + } do { if (UNIV_LIKELY @@ -4261,13 +4298,9 @@ dict_update_statistics_low( index = dict_table_get_first_index(table); - dict_index_stat_mutex_enter(index); - table->stat_n_rows = index->stat_n_diff_key_vals[ dict_index_get_n_unique(index)]; - dict_index_stat_mutex_exit(index); - table->stat_clustered_index_size = index->stat_index_size; table->stat_sum_of_other_index_sizes = sum_of_index_sizes @@ -4276,18 +4309,8 @@ dict_update_statistics_low( table->stat_initialized = TRUE; table->stat_modified_counter = 0; -} -/*********************************************************************//** -Calculates new estimates for table and index statistics. The statistics -are used in query optimization. */ -UNIV_INTERN -void -dict_update_statistics( -/*===================*/ - dict_table_t* table) /*!< in/out: table */ -{ - dict_update_statistics_low(table, FALSE); + dict_table_stats_unlock(table, RW_X_LATCH); } /**********************************************************************//** @@ -4367,7 +4390,9 @@ dict_table_print_low( ut_ad(mutex_own(&(dict_sys->mutex))); - dict_update_statistics_low(table, TRUE); + dict_update_statistics(table, FALSE /* update even if initialized */); + + dict_table_stats_lock(table, RW_S_LATCH); fprintf(stderr, "--------------------------------------\n" @@ -4396,6 +4421,8 @@ dict_table_print_low( index = UT_LIST_GET_NEXT(indexes, index); } + dict_table_stats_unlock(table, RW_S_LATCH); + foreign = UT_LIST_GET_FIRST(table->foreign_list); while (foreign != NULL) { @@ -4444,8 +4471,6 @@ dict_index_print_low( ut_ad(mutex_own(&(dict_sys->mutex))); - dict_index_stat_mutex_enter(index); - if (index->n_user_defined_cols > 0) { n_vals = index->stat_n_diff_key_vals[ index->n_user_defined_cols]; @@ -4453,8 +4478,6 @@ dict_index_print_low( n_vals = index->stat_n_diff_key_vals[1]; } - dict_index_stat_mutex_exit(index); - fprintf(stderr, " INDEX: name %s, id %lu %lu, fields %lu/%lu," " uniq %lu, type %lu\n" @@ -4798,7 +4821,8 @@ void dict_table_replace_index_in_foreign_list( /*=====================================*/ dict_table_t* table, /*!< in/out: table */ - dict_index_t* index) /*!< in: index to be replaced */ + dict_index_t* index, /*!< in: index to be replaced */ + const trx_t* trx) /*!< in: transaction handle */ { dict_foreign_t* foreign; @@ -4809,7 +4833,13 @@ dict_table_replace_index_in_foreign_list( if (foreign->foreign_index == index) { dict_index_t* new_index = dict_foreign_find_equiv_index(foreign); - ut_a(new_index); + + /* There must exist an alternative index if + check_foreigns (FOREIGN_KEY_CHECKS) is on, + since ha_innobase::prepare_drop_index had done + the check before we reach here. */ + + ut_a(new_index || !trx->check_foreigns); foreign->foreign_index = new_index; } @@ -4943,8 +4973,8 @@ dict_close(void) mem_free(dict_sys); dict_sys = NULL; - for (i = 0; i < DICT_INDEX_STAT_MUTEX_SIZE; i++) { - mutex_free(&dict_index_stat_mutex[i]); + for (i = 0; i < DICT_TABLE_STATS_LATCHES_SIZE; i++) { + rw_lock_free(&dict_table_stats_latches[i]); } } #endif /* !UNIV_HOTBACKUP */ diff --git a/storage/innodb_plugin/dict/dict0load.c b/storage/innodb_plugin/dict/dict0load.c index 3dcee46b92c..c3825902536 100644 --- a/storage/innodb_plugin/dict/dict0load.c +++ b/storage/innodb_plugin/dict/dict0load.c @@ -222,7 +222,8 @@ loop: is no index */ if (dict_table_get_first_index(table)) { - dict_update_statistics_low(table, TRUE); + dict_update_statistics(table, FALSE /* update + even if initialized */); } dict_table_print_low(table); diff --git a/storage/innodb_plugin/fil/fil0fil.c b/storage/innodb_plugin/fil/fil0fil.c index 796fe921a7e..0f774dcaaa1 100644 --- a/storage/innodb_plugin/fil/fil0fil.c +++ b/storage/innodb_plugin/fil/fil0fil.c @@ -329,14 +329,15 @@ fil_get_space_id_for_table( /*******************************************************************//** Frees a space object from the tablespace memory cache. Closes the files in the chain but does not delete them. There must not be any pending i/o's or -flushes on the files. */ +flushes on the files. +@return TRUE on success */ static ibool fil_space_free( /*===========*/ - /* out: TRUE if success */ - ulint id, /* in: space id */ - ibool own_mutex);/* in: TRUE if own system->mutex */ + ulint id, /* in: space id */ + ibool x_latched); /* in: TRUE if caller has space->latch + in X mode */ /********************************************************************//** Reads data from a space to a buffer. Remember that the possible incomplete blocks at the end of file are ignored: they are not taken into account when @@ -1123,6 +1124,7 @@ try_again: space = fil_space_get_by_name(name); if (UNIV_LIKELY_NULL(space)) { + ibool success; ulint namesake_id; ut_print_timestamp(stderr); @@ -1161,9 +1163,10 @@ try_again: namesake_id = space->id; - mutex_exit(&fil_system->mutex); + success = fil_space_free(namesake_id, FALSE); + ut_a(success); - fil_space_free(namesake_id, FALSE); + mutex_exit(&fil_system->mutex); goto try_again; } @@ -1314,15 +1317,14 @@ fil_space_free( /*===========*/ /* out: TRUE if success */ ulint id, /* in: space id */ - ibool own_mutex) /* in: TRUE if own system->mutex */ + ibool x_latched) /* in: TRUE if caller has space->latch + in X mode */ { fil_space_t* space; fil_space_t* namespace; fil_node_t* fil_node; - if (!own_mutex) { - mutex_enter(&fil_system->mutex); - } + ut_ad(mutex_own(&fil_system->mutex)); space = fil_space_get_by_id(id); @@ -1333,8 +1335,6 @@ fil_space_free( " from the cache but\n" "InnoDB: it is not there.\n", (ulong) id); - mutex_exit(&fil_system->mutex); - return(FALSE); } @@ -1369,8 +1369,8 @@ fil_space_free( ut_a(0 == UT_LIST_GET_LEN(space->chain)); - if (!own_mutex) { - mutex_exit(&fil_system->mutex); + if (x_latched) { + rw_lock_x_unlock(&space->latch); } rw_lock_free(&(space->latch)); @@ -1615,25 +1615,27 @@ fil_close_all_files(void) /*=====================*/ { fil_space_t* space; - fil_node_t* node; mutex_enter(&fil_system->mutex); space = UT_LIST_GET_FIRST(fil_system->space_list); while (space != NULL) { + fil_node_t* node; fil_space_t* prev_space = space; - node = UT_LIST_GET_FIRST(space->chain); + for (node = UT_LIST_GET_FIRST(space->chain); + node != NULL; + node = UT_LIST_GET_NEXT(chain, node)) { - while (node != NULL) { if (node->open) { fil_node_close_file(node, fil_system); } - node = UT_LIST_GET_NEXT(chain, node); } + space = UT_LIST_GET_NEXT(space_list, space); - fil_space_free(prev_space->id, TRUE); + + fil_space_free(prev_space->id, FALSE); } mutex_exit(&fil_system->mutex); @@ -2253,6 +2255,19 @@ try_again: path = mem_strdup(space->name); mutex_exit(&fil_system->mutex); + + /* Important: We rely on the data dictionary mutex to ensure + that a race is not possible here. It should serialize the tablespace + drop/free. We acquire an X latch only to avoid a race condition + when accessing the tablespace instance via: + + fsp_get_available_space_in_free_extents(). + + There our main motivation is to reduce the contention on the + dictionary mutex. */ + + rw_lock_x_lock(&space->latch); + #ifndef UNIV_HOTBACKUP /* Invalidate in the buffer pool all pages belonging to the tablespace. Since we have set space->is_being_deleted = TRUE, readahead @@ -2265,7 +2280,11 @@ try_again: #endif /* printf("Deleting tablespace %s id %lu\n", space->name, id); */ - success = fil_space_free(id, FALSE); + mutex_enter(&fil_system->mutex); + + success = fil_space_free(id, TRUE); + + mutex_exit(&fil_system->mutex); if (success) { success = os_file_delete(path); @@ -2273,6 +2292,8 @@ try_again: if (!success) { success = os_file_delete_if_exists(path); } + } else { + rw_lock_x_unlock(&space->latch); } if (success) { @@ -2300,6 +2321,31 @@ try_again: return(FALSE); } +/*******************************************************************//** +Returns TRUE if a single-table tablespace is being deleted. +@return TRUE if being deleted */ +UNIV_INTERN +ibool +fil_tablespace_is_being_deleted( +/*============================*/ + ulint id) /*!< in: space id */ +{ + fil_space_t* space; + ibool is_being_deleted; + + mutex_enter(&fil_system->mutex); + + space = fil_space_get_by_id(id); + + ut_a(space != NULL); + + is_being_deleted = space->is_being_deleted; + + mutex_exit(&fil_system->mutex); + + return(is_being_deleted); +} + #ifndef UNIV_HOTBACKUP /*******************************************************************//** Discards a single-table tablespace. The tablespace must be cached in the @@ -4763,7 +4809,7 @@ fil_page_get_type( return(mach_read_from_2(page + FIL_PAGE_TYPE)); } -/******************************************************************** +/****************************************************************//** Initializes the tablespace memory cache. */ UNIV_INTERN void diff --git a/storage/innodb_plugin/fsp/fsp0fsp.c b/storage/innodb_plugin/fsp/fsp0fsp.c index 2bae8481d20..e9d24b8fdf6 100644 --- a/storage/innodb_plugin/fsp/fsp0fsp.c +++ b/storage/innodb_plugin/fsp/fsp0fsp.c @@ -3102,13 +3102,63 @@ fsp_get_available_space_in_free_extents( ut_ad(!mutex_own(&kernel_mutex)); + /* The convoluted mutex acquire is to overcome latching order + issues: The problem is that the fil_mutex is at a lower level + than the tablespace latch and the buffer pool mutex. We have to + first prevent any operations on the file system by acquiring the + dictionary mutex. Then acquire the tablespace latch to obey the + latching order and then release the dictionary mutex. That way we + ensure that the tablespace instance can't be freed while we are + examining its contents (see fil_space_free()). + + However, there is one further complication, we release the fil_mutex + when we need to invalidate the the pages in the buffer pool and we + reacquire the fil_mutex when deleting and freeing the tablespace + instance in fil0fil.c. Here we need to account for that situation + too. */ + + mutex_enter(&dict_sys->mutex); + + /* At this stage there is no guarantee that the tablespace even + exists in the cache. */ + + if (fil_tablespace_deleted_or_being_deleted_in_mem(space, -1)) { + + mutex_exit(&dict_sys->mutex); + + return(ULLINT_UNDEFINED); + } + mtr_start(&mtr); latch = fil_space_get_latch(space, &flags); + + /* This should ensure that the tablespace instance can't be freed + by another thread. However, the tablespace pages can still be freed + from the buffer pool. We need to check for that again. */ + zip_size = dict_table_flags_to_zip_size(flags); mtr_x_lock(latch, &mtr); + mutex_exit(&dict_sys->mutex); + + /* At this point it is possible for the tablespace to be deleted and + its pages removed from the buffer pool. We need to check for that + situation. However, the tablespace instance can't be deleted because + our latching above should ensure that. */ + + if (fil_tablespace_is_being_deleted(space)) { + + mtr_commit(&mtr); + + return(ULLINT_UNDEFINED); + } + + /* From here on even if the user has dropped the tablespace, the + pages _must_ still exist in the buffer pool and the tablespace + instance _must_ be in the file system hash table. */ + space_header = fsp_get_space_header(space, zip_size, &mtr); size = mtr_read_ulint(space_header + FSP_SIZE, MLOG_4BYTES, &mtr); @@ -3276,7 +3326,7 @@ fseg_free_page_low( "InnoDB: database!\n", (ulong) page); crash: fputs("InnoDB: Please refer to\n" - "InnoDB: " REFMAN "forcing-recovery.html\n" + "InnoDB: " REFMAN "forcing-innodb-recovery.html\n" "InnoDB: about forcing recovery.\n", stderr); ut_error; } diff --git a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc index 2342fac2694..18a25fd8c4e 100644 --- a/storage/innodb_plugin/handler/ha_innodb.cc +++ b/storage/innodb_plugin/handler/ha_innodb.cc @@ -6010,6 +6010,16 @@ create_table_def( DBUG_RETURN(HA_ERR_GENERIC); } + /* MySQL does the name length check. But we do additional check + on the name length here */ + if (strlen(table_name) > MAX_FULL_NAME_LEN) { + push_warning_printf( + (THD*) trx->mysql_thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_TABLE_NAME, + "InnoDB: Table Name or Database Name is too long"); + DBUG_RETURN(ER_TABLE_NAME); + } + n_cols = form->s->fields; /* We pass 0 as the space id, and determine at a lower level the space @@ -6292,6 +6302,60 @@ create_clustered_index_when_no_primary( } /*****************************************************************//** +Return a display name for the row format +@return row format name */ +UNIV_INTERN +const char* +get_row_format_name( +/*================*/ + enum row_type row_format) /*!< in: Row Format */ +{ + switch (row_format) { + case ROW_TYPE_COMPACT: + return("COMPACT"); + case ROW_TYPE_COMPRESSED: + return("COMPRESSED"); + case ROW_TYPE_DYNAMIC: + return("DYNAMIC"); + case ROW_TYPE_REDUNDANT: + return("REDUNDANT"); + case ROW_TYPE_DEFAULT: + return("DEFAULT"); + case ROW_TYPE_FIXED: + return("FIXED"); + case ROW_TYPE_PAGE: + case ROW_TYPE_NOT_USED: + break; + } + return("NOT USED"); +} + +/** If file-per-table is missing, issue warning and set ret false */ +#define CHECK_ERROR_ROW_TYPE_NEEDS_FILE_PER_TABLE \ + if (!srv_file_per_table) { \ + push_warning_printf( \ + thd, MYSQL_ERROR::WARN_LEVEL_WARN, \ + ER_ILLEGAL_HA_CREATE_OPTION, \ + "InnoDB: ROW_FORMAT=%s requires" \ + " innodb_file_per_table.", \ + get_row_format_name(row_format)); \ + ret = FALSE; \ + } + +/** If file-format is Antelope, issue warning and set ret false */ +#define CHECK_ERROR_ROW_TYPE_NEEDS_GT_ANTELOPE \ + if (srv_file_format < DICT_TF_FORMAT_ZIP) { \ + push_warning_printf( \ + thd, MYSQL_ERROR::WARN_LEVEL_WARN, \ + ER_ILLEGAL_HA_CREATE_OPTION, \ + "InnoDB: ROW_FORMAT=%s requires" \ + " innodb_file_format > Antelope.", \ + get_row_format_name(row_format)); \ + ret = FALSE; \ + } + + +/*****************************************************************//** Validates the create options. We may build on this function in future. For now, it checks two specifiers: KEY_BLOCK_SIZE and ROW_FORMAT @@ -6306,9 +6370,9 @@ create_options_are_valid( columns and indexes */ HA_CREATE_INFO* create_info) /*!< in: create info. */ { - ibool kbs_specified = FALSE; + ibool kbs_specified = FALSE; ibool ret = TRUE; - + enum row_type row_format = form->s->row_type; ut_ad(thd != NULL); @@ -6320,10 +6384,8 @@ create_options_are_valid( ut_ad(form != NULL); ut_ad(create_info != NULL); - /* First check if KEY_BLOCK_SIZE was specified. */ - if (create_info->key_block_size - || (create_info->used_fields & HA_CREATE_USED_KEY_BLOCK_SIZE)) { - + /* First check if a non-zero KEY_BLOCK_SIZE was specified. */ + if (create_info->key_block_size) { kbs_specified = TRUE; switch (create_info->key_block_size) { case 1: @@ -6331,127 +6393,71 @@ create_options_are_valid( case 4: case 8: case 16: - /* Valid value. */ - break; - default: - push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, - ER_ILLEGAL_HA_CREATE_OPTION, - "InnoDB: invalid" - " KEY_BLOCK_SIZE = %lu." - " Valid values are" - " [1, 2, 4, 8, 16]", - create_info->key_block_size); - ret = FALSE; - } - } - - /* If KEY_BLOCK_SIZE was specified, check for its - dependencies. */ - if (kbs_specified && !srv_file_per_table) { - push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, - ER_ILLEGAL_HA_CREATE_OPTION, - "InnoDB: KEY_BLOCK_SIZE" - " requires innodb_file_per_table."); - ret = FALSE; - } - - if (kbs_specified && srv_file_format < DICT_TF_FORMAT_ZIP) { - push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, - ER_ILLEGAL_HA_CREATE_OPTION, - "InnoDB: KEY_BLOCK_SIZE" - " requires innodb_file_format >" - " Antelope."); - ret = FALSE; - } - - /* Now check for ROW_FORMAT specifier. */ - if (create_info->used_fields & HA_CREATE_USED_ROW_FORMAT) { - switch (form->s->row_type) { - const char* row_format_name; - case ROW_TYPE_COMPRESSED: - case ROW_TYPE_DYNAMIC: - row_format_name - = form->s->row_type == ROW_TYPE_COMPRESSED - ? "COMPRESSED" - : "DYNAMIC"; - - /* These two ROW_FORMATs require srv_file_per_table - and srv_file_format > Antelope */ + /* Valid KEY_BLOCK_SIZE, check its dependencies. */ if (!srv_file_per_table) { - push_warning_printf( - thd, - MYSQL_ERROR::WARN_LEVEL_WARN, + push_warning( + thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_ILLEGAL_HA_CREATE_OPTION, - "InnoDB: ROW_FORMAT=%s" - " requires innodb_file_per_table.", - row_format_name); - ret = FALSE; + "InnoDB: KEY_BLOCK_SIZE requires" + " innodb_file_per_table."); + ret = FALSE; } - if (srv_file_format < DICT_TF_FORMAT_ZIP) { - push_warning_printf( - thd, - MYSQL_ERROR::WARN_LEVEL_WARN, + push_warning( + thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_ILLEGAL_HA_CREATE_OPTION, - "InnoDB: ROW_FORMAT=%s" - " requires innodb_file_format >" - " Antelope.", - row_format_name); + "InnoDB: KEY_BLOCK_SIZE requires" + " innodb_file_format > Antelope."); ret = FALSE; } - - /* Cannot specify KEY_BLOCK_SIZE with - ROW_FORMAT = DYNAMIC. - However, we do allow COMPRESSED to be - specified with KEY_BLOCK_SIZE. */ - if (kbs_specified - && form->s->row_type == ROW_TYPE_DYNAMIC) { - push_warning_printf( - thd, - MYSQL_ERROR::WARN_LEVEL_WARN, - ER_ILLEGAL_HA_CREATE_OPTION, - "InnoDB: cannot specify" - " ROW_FORMAT = DYNAMIC with" - " KEY_BLOCK_SIZE."); - ret = FALSE; - } - break; - - case ROW_TYPE_REDUNDANT: - case ROW_TYPE_COMPACT: - case ROW_TYPE_DEFAULT: - /* Default is COMPACT. */ - row_format_name - = form->s->row_type == ROW_TYPE_REDUNDANT - ? "REDUNDANT" - : "COMPACT"; - - /* Cannot specify KEY_BLOCK_SIZE with these - format specifiers. */ - if (kbs_specified) { - push_warning_printf( - thd, - MYSQL_ERROR::WARN_LEVEL_WARN, - ER_ILLEGAL_HA_CREATE_OPTION, - "InnoDB: cannot specify" - " ROW_FORMAT = %s with" - " KEY_BLOCK_SIZE.", - row_format_name); - ret = FALSE; - } - - break; - default: - push_warning(thd, - MYSQL_ERROR::WARN_LEVEL_WARN, - ER_ILLEGAL_HA_CREATE_OPTION, - "InnoDB: invalid ROW_FORMAT specifier."); + push_warning_printf( + thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_ILLEGAL_HA_CREATE_OPTION, + "InnoDB: invalid KEY_BLOCK_SIZE = %lu." + " Valid values are [1, 2, 4, 8, 16]", + create_info->key_block_size); ret = FALSE; - + break; } } + + /* Check for a valid Innodb ROW_FORMAT specifier and + other incompatibilities. */ + switch (row_format) { + case ROW_TYPE_COMPRESSED: + CHECK_ERROR_ROW_TYPE_NEEDS_FILE_PER_TABLE; + CHECK_ERROR_ROW_TYPE_NEEDS_GT_ANTELOPE; + break; + case ROW_TYPE_DYNAMIC: + CHECK_ERROR_ROW_TYPE_NEEDS_FILE_PER_TABLE; + CHECK_ERROR_ROW_TYPE_NEEDS_GT_ANTELOPE; + /* fall through since dynamic also shuns KBS */ + case ROW_TYPE_COMPACT: + case ROW_TYPE_REDUNDANT: + if (kbs_specified) { + push_warning_printf( + thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_ILLEGAL_HA_CREATE_OPTION, + "InnoDB: cannot specify ROW_FORMAT = %s" + " with KEY_BLOCK_SIZE.", + get_row_format_name(row_format)); + ret = FALSE; + } + break; + case ROW_TYPE_DEFAULT: + break; + case ROW_TYPE_FIXED: + case ROW_TYPE_PAGE: + case ROW_TYPE_NOT_USED: + push_warning( + thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_ILLEGAL_HA_CREATE_OPTION, \ + "InnoDB: invalid ROW_FORMAT specifier."); + ret = FALSE; + break; + } return(ret); } @@ -6500,7 +6506,7 @@ ha_innobase::create( const ulint file_format = srv_file_format; const char* stmt; size_t stmt_len; - enum row_type row_type; + enum row_type row_format; DBUG_ENTER("ha_innobase::create"); @@ -6576,8 +6582,7 @@ ha_innobase::create( goto cleanup; } - if (create_info->key_block_size - || (create_info->used_fields & HA_CREATE_USED_KEY_BLOCK_SIZE)) { + if (create_info->key_block_size) { /* Determine the page_zip.ssize corresponding to the requested page size (key_block_size) in kilobytes. */ @@ -6598,40 +6603,40 @@ ha_innobase::create( } if (!srv_file_per_table) { - push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, - ER_ILLEGAL_HA_CREATE_OPTION, - "InnoDB: KEY_BLOCK_SIZE" - " requires innodb_file_per_table."); + push_warning( + thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_ILLEGAL_HA_CREATE_OPTION, + "InnoDB: KEY_BLOCK_SIZE requires" + " innodb_file_per_table."); flags = 0; } if (file_format < DICT_TF_FORMAT_ZIP) { - push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, - ER_ILLEGAL_HA_CREATE_OPTION, - "InnoDB: KEY_BLOCK_SIZE" - " requires innodb_file_format >" - " Antelope."); + push_warning( + thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_ILLEGAL_HA_CREATE_OPTION, + "InnoDB: KEY_BLOCK_SIZE requires" + " innodb_file_format > Antelope."); flags = 0; } if (!flags) { - push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, - ER_ILLEGAL_HA_CREATE_OPTION, - "InnoDB: ignoring" - " KEY_BLOCK_SIZE=%lu.", - create_info->key_block_size); + push_warning_printf( + thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_ILLEGAL_HA_CREATE_OPTION, + "InnoDB: ignoring KEY_BLOCK_SIZE=%lu.", + create_info->key_block_size); } } - row_type = form->s->row_type; + row_format = form->s->row_type; if (flags) { - /* if KEY_BLOCK_SIZE was specified on this statement and - ROW_FORMAT was not, automatically change ROW_FORMAT to COMPRESSED.*/ - if ( (create_info->used_fields & HA_CREATE_USED_KEY_BLOCK_SIZE) - && !(create_info->used_fields & HA_CREATE_USED_ROW_FORMAT)) { - row_type = ROW_TYPE_COMPRESSED; - } else if (row_type != ROW_TYPE_COMPRESSED) { + /* if ROW_FORMAT is set to default, + automatically change it to COMPRESSED.*/ + if (row_format == ROW_TYPE_DEFAULT) { + row_format = ROW_TYPE_COMPRESSED; + } else if (row_format != ROW_TYPE_COMPRESSED) { /* ROW_FORMAT other than COMPRESSED ignores KEY_BLOCK_SIZE. It does not make sense to reject conflicting @@ -6639,8 +6644,7 @@ ha_innobase::create( such combinations can be obtained with ALTER TABLE anyway. */ push_warning_printf( - thd, - MYSQL_ERROR::WARN_LEVEL_WARN, + thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_ILLEGAL_HA_CREATE_OPTION, "InnoDB: ignoring KEY_BLOCK_SIZE=%lu" " unless ROW_FORMAT=COMPRESSED.", @@ -6649,7 +6653,7 @@ ha_innobase::create( } } else { /* flags == 0 means no KEY_BLOCK_SIZE.*/ - if (row_type == ROW_TYPE_COMPRESSED) { + if (row_format == ROW_TYPE_COMPRESSED) { /* ROW_FORMAT=COMPRESSED without KEY_BLOCK_SIZE implies half the maximum KEY_BLOCK_SIZE. */ @@ -6664,49 +6668,40 @@ ha_innobase::create( } } - switch (row_type) { - const char* row_format_name; + switch (row_format) { case ROW_TYPE_REDUNDANT: break; case ROW_TYPE_COMPRESSED: case ROW_TYPE_DYNAMIC: - row_format_name - = row_type == ROW_TYPE_COMPRESSED - ? "COMPRESSED" - : "DYNAMIC"; - if (!srv_file_per_table) { push_warning_printf( - thd, - MYSQL_ERROR::WARN_LEVEL_WARN, + thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_ILLEGAL_HA_CREATE_OPTION, - "InnoDB: ROW_FORMAT=%s" - " requires innodb_file_per_table.", - row_format_name); + "InnoDB: ROW_FORMAT=%s requires" + " innodb_file_per_table.", + get_row_format_name(row_format)); } else if (file_format < DICT_TF_FORMAT_ZIP) { push_warning_printf( - thd, - MYSQL_ERROR::WARN_LEVEL_WARN, + thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_ILLEGAL_HA_CREATE_OPTION, - "InnoDB: ROW_FORMAT=%s" - " requires innodb_file_format >" - " Antelope.", - row_format_name); + "InnoDB: ROW_FORMAT=%s requires" + " innodb_file_format > Antelope.", + get_row_format_name(row_format)); } else { flags |= DICT_TF_COMPACT - | (DICT_TF_FORMAT_ZIP - << DICT_TF_FORMAT_SHIFT); + | (DICT_TF_FORMAT_ZIP + << DICT_TF_FORMAT_SHIFT); break; } /* fall through */ case ROW_TYPE_NOT_USED: case ROW_TYPE_FIXED: - default: - push_warning(thd, - MYSQL_ERROR::WARN_LEVEL_WARN, - ER_ILLEGAL_HA_CREATE_OPTION, - "InnoDB: assuming ROW_FORMAT=COMPACT."); + case ROW_TYPE_PAGE: + push_warning( + thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_ILLEGAL_HA_CREATE_OPTION, + "InnoDB: assuming ROW_FORMAT=COMPACT."); case ROW_TYPE_DEFAULT: case ROW_TYPE_COMPACT: flags = DICT_TF_COMPACT; @@ -6820,23 +6815,25 @@ ha_innobase::create( setup at this stage and so we use thd. */ /* We need to copy the AUTOINC value from the old table if - this is an ALTER TABLE or CREATE INDEX because CREATE INDEX - does a table copy too. */ + this is an ALTER|OPTIMIZE TABLE or CREATE INDEX because CREATE INDEX + does a table copy too. If query was one of : + + CREATE TABLE ...AUTO_INCREMENT = x; or + ALTER TABLE...AUTO_INCREMENT = x; or + OPTIMIZE TABLE t; or + CREATE INDEX x on t(...); + + Find out a table definition from the dictionary and get + the current value of the auto increment field. Set a new + value to the auto increment field if the value is greater + than the maximum value in the column. */ if (((create_info->used_fields & HA_CREATE_USED_AUTO) || thd_sql_command(thd) == SQLCOM_ALTER_TABLE + || thd_sql_command(thd) == SQLCOM_OPTIMIZE || thd_sql_command(thd) == SQLCOM_CREATE_INDEX) && create_info->auto_increment_value > 0) { - /* Query was one of : - CREATE TABLE ...AUTO_INCREMENT = x; or - ALTER TABLE...AUTO_INCREMENT = x; or - CREATE INDEX x on t(...); - Find out a table definition from the dictionary and get - the current value of the auto increment field. Set a new - value to the auto increment field if the value is greater - than the maximum value in the column. */ - auto_inc_value = create_info->auto_increment_value; dict_table_autoinc_lock(innobase_table); @@ -7344,6 +7341,7 @@ ha_innobase::estimate_rows_upper_bound(void) dict_index_t* index; ulonglong estimate; ulonglong local_data_file_length; + ulint stat_n_leaf_pages; DBUG_ENTER("estimate_rows_upper_bound"); @@ -7363,10 +7361,12 @@ ha_innobase::estimate_rows_upper_bound(void) index = dict_table_get_first_index(prebuilt->table); - ut_a(index->stat_n_leaf_pages > 0); + stat_n_leaf_pages = index->stat_n_leaf_pages; + + ut_a(stat_n_leaf_pages > 0); local_data_file_length = - ((ulonglong) index->stat_n_leaf_pages) * UNIV_PAGE_SIZE; + ((ulonglong) stat_n_leaf_pages) * UNIV_PAGE_SIZE; /* Calculate a minimum length for a clustered index record and from @@ -7565,7 +7565,9 @@ ha_innobase::info_low( prebuilt->trx->op_info = "updating table statistics"; - dict_update_statistics(ib_table); + dict_update_statistics(ib_table, + FALSE /* update even if stats + are initialized */); prebuilt->trx->op_info = "returning various info to MySQL"; } @@ -7584,6 +7586,9 @@ ha_innobase::info_low( } if (flag & HA_STATUS_VARIABLE) { + + dict_table_stats_lock(ib_table, RW_S_LATCH); + n_rows = ib_table->stat_n_rows; /* Because we do not protect stat_n_rows by any mutex in a @@ -7633,6 +7638,8 @@ ha_innobase::info_low( ib_table->stat_sum_of_other_index_sizes) * UNIV_PAGE_SIZE; + dict_table_stats_unlock(ib_table, RW_S_LATCH); + /* Since fsp_get_available_space_in_free_extents() is acquiring latches inside InnoDB, we do not call it if we are asked by MySQL to avoid locking. Another reason to @@ -7649,19 +7656,12 @@ ha_innobase::info_low( innodb_crash_recovery is set to a high value. */ stats.delete_length = 0; } else { - /* lock the data dictionary to avoid races with - ibd_file_missing and tablespace_discarded */ - row_mysql_lock_data_dictionary(prebuilt->trx); + ullint avail_space; - /* ib_table->space must be an existent tablespace */ - if (!ib_table->ibd_file_missing - && !ib_table->tablespace_discarded) { - - stats.delete_length = - fsp_get_available_space_in_free_extents( - ib_table->space) * 1024; - } else { + avail_space = fsp_get_available_space_in_free_extents( + ib_table->space); + if (avail_space == ULLINT_UNDEFINED) { THD* thd; thd = ha_thd(); @@ -7678,9 +7678,9 @@ ha_innobase::info_low( ib_table->name); stats.delete_length = 0; + } else { + stats.delete_length = avail_space * 1024; } - - row_mysql_unlock_data_dictionary(prebuilt->trx); } stats.check_time = 0; @@ -7709,6 +7709,8 @@ ha_innobase::info_low( table->s->keys); } + dict_table_stats_lock(ib_table, RW_S_LATCH); + for (i = 0; i < table->s->keys; i++) { ulong j; /* We could get index quickly through internal @@ -7746,8 +7748,6 @@ ha_innobase::info_low( break; } - dict_index_stat_mutex_enter(index); - if (index->stat_n_diff_key_vals[j + 1] == 0) { rec_per_key = stats.records; @@ -7756,8 +7756,6 @@ ha_innobase::info_low( index->stat_n_diff_key_vals[j + 1]); } - dict_index_stat_mutex_exit(index); - /* Since MySQL seems to favor table scans too much over index searches, we pretend index selectivity is 2 times better than @@ -7774,6 +7772,8 @@ ha_innobase::info_low( (ulong) rec_per_key; } } + + dict_table_stats_unlock(ib_table, RW_S_LATCH); } if (srv_force_recovery >= SRV_FORCE_NO_IBUF_MERGE) { diff --git a/storage/innodb_plugin/handler/handler0alter.cc b/storage/innodb_plugin/handler/handler0alter.cc index e936bfafa0e..517445f7e69 100644 --- a/storage/innodb_plugin/handler/handler0alter.cc +++ b/storage/innodb_plugin/handler/handler0alter.cc @@ -1012,12 +1012,13 @@ ha_innobase::prepare_drop_index( index->to_be_dropped = TRUE; } - /* If FOREIGN_KEY_CHECK = 1 you may not drop an index defined + /* If FOREIGN_KEY_CHECKS = 1 you may not drop an index defined for a foreign key constraint because InnoDB requires that both - tables contain indexes for the constraint. Note that CREATE - INDEX id ON table does a CREATE INDEX and DROP INDEX, and we - can ignore here foreign keys because a new index for the - foreign key has already been created. + tables contain indexes for the constraint. Such index can + be dropped only if FOREIGN_KEY_CHECKS is set to 0. + Note that CREATE INDEX id ON table does a CREATE INDEX and + DROP INDEX, and we can ignore here foreign keys because a + new index for the foreign key has already been created. We check for the foreign key constraints after marking the candidate indexes for deletion, because when we check for an diff --git a/storage/innodb_plugin/handler/i_s.cc b/storage/innodb_plugin/handler/i_s.cc index 9ad2d656365..b0149967e9b 100644 --- a/storage/innodb_plugin/handler/i_s.cc +++ b/storage/innodb_plugin/handler/i_s.cc @@ -371,8 +371,16 @@ fill_innodb_trx_from_cache( row->trx_mysql_thread_id)); /* trx_query */ - OK(field_store_string(fields[IDX_TRX_QUERY], - row->trx_query)); + if (row->trx_query) { + /* store will do appropriate character set + conversion check */ + fields[IDX_TRX_QUERY]->store( + row->trx_query, strlen(row->trx_query), + row->trx_query_cs); + fields[IDX_TRX_QUERY]->set_notnull(); + } else { + fields[IDX_TRX_QUERY]->set_null(); + } OK(schema_table_store_record(thd, table)); } @@ -579,16 +587,7 @@ fill_innodb_locks_from_cache( for (i = 0; i < rows_num; i++) { i_s_locks_row_t* row; - - /* note that the decoded database or table name is - never expected to be longer than NAME_LEN; - NAME_LEN for database name - 2 for surrounding quotes around database name - NAME_LEN for table name - 2 for surrounding quotes around table name - 1 for the separating dot (.) - 9 for the #mysql50# prefix */ - char buf[2 * NAME_LEN + 14]; + char buf[MAX_FULL_NAME_LEN + 1]; const char* bufend; char lock_trx_id[TRX_ID_MAX_LEN + 1]; diff --git a/storage/innodb_plugin/include/btr0btr.h b/storage/innodb_plugin/include/btr0btr.h index 5e6a76c7d21..dde3a0bab69 100644 --- a/storage/innodb_plugin/include/btr0btr.h +++ b/storage/innodb_plugin/include/btr0btr.h @@ -94,26 +94,35 @@ btr_root_get( Gets a buffer page and declares its latching order level. */ UNIV_INLINE buf_block_t* -btr_block_get( -/*==========*/ - ulint space, /*!< in: space id */ - ulint zip_size, /*!< in: compressed page size in bytes - or 0 for uncompressed pages */ - ulint page_no, /*!< in: page number */ - ulint mode, /*!< in: latch mode */ - mtr_t* mtr); /*!< in: mtr */ -/**************************************************************//** -Gets a buffer page and declares its latching order level. */ -UNIV_INLINE -page_t* -btr_page_get( -/*=========*/ - ulint space, /*!< in: space id */ - ulint zip_size, /*!< in: compressed page size in bytes - or 0 for uncompressed pages */ - ulint page_no, /*!< in: page number */ - ulint mode, /*!< in: latch mode */ - mtr_t* mtr); /*!< in: mtr */ +btr_block_get_func( +/*===============*/ + ulint space, /*!< in: space id */ + ulint zip_size, /*!< in: compressed page size in bytes + or 0 for uncompressed pages */ + ulint page_no, /*!< in: page number */ + ulint mode, /*!< in: latch mode */ + const char* file, /*!< in: file name */ + ulint line, /*!< in: line where called */ + mtr_t* mtr) /*!< in/out: mtr */ + __attribute__((nonnull)); +/** Gets a buffer page and declares its latching order level. +@param space tablespace identifier +@param zip_size compressed page size in bytes or 0 for uncompressed pages +@param page_no page number +@param mode latch mode +@param mtr mini-transaction handle +@return the block descriptor */ +# define btr_block_get(space,zip_size,page_no,mode,mtr) \ + btr_block_get_func(space,zip_size,page_no,mode,__FILE__,__LINE__,mtr) +/** Gets a buffer page and declares its latching order level. +@param space tablespace identifier +@param zip_size compressed page size in bytes or 0 for uncompressed pages +@param page_no page number +@param mode latch mode +@param mtr mini-transaction handle +@return the uncompressed page frame */ +# define btr_page_get(space,zip_size,page_no,mode,mtr) \ + buf_block_get_frame(btr_block_get(space,zip_size,page_no,mode,mtr)) #endif /* !UNIV_HOTBACKUP */ /**************************************************************//** Gets the index id field of a page. diff --git a/storage/innodb_plugin/include/btr0btr.ic b/storage/innodb_plugin/include/btr0btr.ic index 97944cc2e26..83eb3627abb 100644 --- a/storage/innodb_plugin/include/btr0btr.ic +++ b/storage/innodb_plugin/include/btr0btr.ic @@ -39,18 +39,21 @@ Created 6/2/1994 Heikki Tuuri Gets a buffer page and declares its latching order level. */ UNIV_INLINE buf_block_t* -btr_block_get( -/*==========*/ - ulint space, /*!< in: space id */ - ulint zip_size, /*!< in: compressed page size in bytes - or 0 for uncompressed pages */ - ulint page_no, /*!< in: page number */ - ulint mode, /*!< in: latch mode */ - mtr_t* mtr) /*!< in: mtr */ +btr_block_get_func( +/*===============*/ + ulint space, /*!< in: space id */ + ulint zip_size, /*!< in: compressed page size in bytes + or 0 for uncompressed pages */ + ulint page_no, /*!< in: page number */ + ulint mode, /*!< in: latch mode */ + const char* file, /*!< in: file name */ + ulint line, /*!< in: line where called */ + mtr_t* mtr) /*!< in/out: mtr */ { buf_block_t* block; - block = buf_page_get(space, zip_size, page_no, mode, mtr); + block = buf_page_get_gen(space, zip_size, page_no, mode, + NULL, BUF_GET, file, line, mtr); if (mode != RW_NO_LATCH) { @@ -61,23 +64,6 @@ btr_block_get( } /**************************************************************//** -Gets a buffer page and declares its latching order level. */ -UNIV_INLINE -page_t* -btr_page_get( -/*=========*/ - ulint space, /*!< in: space id */ - ulint zip_size, /*!< in: compressed page size in bytes - or 0 for uncompressed pages */ - ulint page_no, /*!< in: page number */ - ulint mode, /*!< in: latch mode */ - mtr_t* mtr) /*!< in: mtr */ -{ - return(buf_block_get_frame(btr_block_get(space, zip_size, page_no, - mode, mtr))); -} - -/**************************************************************//** Sets the index id field of a page. */ UNIV_INLINE void diff --git a/storage/innodb_plugin/include/btr0cur.h b/storage/innodb_plugin/include/btr0cur.h index 7f6bff11f84..b477ad0320a 100644 --- a/storage/innodb_plugin/include/btr0cur.h +++ b/storage/innodb_plugin/include/btr0cur.h @@ -332,10 +332,14 @@ ulint btr_cur_del_mark_set_clust_rec( /*===========================*/ ulint flags, /*!< in: undo logging and locking flags */ - btr_cur_t* cursor, /*!< in: cursor */ + buf_block_t* block, /*!< in/out: buffer block of the record */ + rec_t* rec, /*!< in/out: record */ + dict_index_t* index, /*!< in: clustered index of the record */ + const ulint* offsets,/*!< in: rec_get_offsets(rec) */ ibool val, /*!< in: value to set */ que_thr_t* thr, /*!< in: query thread */ - mtr_t* mtr); /*!< in: mtr */ + mtr_t* mtr) /*!< in: mtr */ + __attribute__((nonnull)); /***********************************************************//** Sets a secondary index record delete mark to TRUE or FALSE. @return DB_SUCCESS, DB_LOCK_WAIT, or error number */ @@ -481,46 +485,28 @@ btr_estimate_number_of_different_key_vals( /*======================================*/ dict_index_t* index); /*!< in: index */ /*******************************************************************//** -Marks not updated extern fields as not-owned by this record. The ownership -is transferred to the updated record which is inserted elsewhere in the +Marks non-updated off-page fields as disowned by this record. The ownership +must be transferred to the updated record which is inserted elsewhere in the index tree. In purge only the owner of externally stored field is allowed -to free the field. -@return TRUE if BLOB ownership was transferred */ +to free the field. */ UNIV_INTERN -ibool -btr_cur_mark_extern_inherited_fields( -/*=================================*/ +void +btr_cur_disown_inherited_fields( +/*============================*/ page_zip_des_t* page_zip,/*!< in/out: compressed page whose uncompressed part will be updated, or NULL */ rec_t* rec, /*!< in/out: record in a clustered index */ dict_index_t* index, /*!< in: index of the page */ const ulint* offsets,/*!< in: array returned by rec_get_offsets() */ const upd_t* update, /*!< in: update vector */ - mtr_t* mtr); /*!< in: mtr, or NULL if not logged */ -/*******************************************************************//** -The complement of the previous function: in an update entry may inherit -some externally stored fields from a record. We must mark them as inherited -in entry, so that they are not freed in a rollback. */ -UNIV_INTERN -void -btr_cur_mark_dtuple_inherited_extern( -/*=================================*/ - dtuple_t* entry, /*!< in/out: updated entry to be - inserted to clustered index */ - const upd_t* update); /*!< in: update vector */ -/*******************************************************************//** -Marks all extern fields in a dtuple as owned by the record. */ -UNIV_INTERN -void -btr_cur_unmark_dtuple_extern_fields( -/*================================*/ - dtuple_t* entry); /*!< in/out: clustered index entry */ + mtr_t* mtr) /*!< in/out: mini-transaction */ + __attribute__((nonnull(2,3,4,5,6))); /*******************************************************************//** Stores the fields in big_rec_vec to the tablespace and puts pointers to them in rec. The extern flags in rec will have to be set beforehand. The fields are stored on pages allocated from leaf node file segment of the index tree. -@return DB_SUCCESS or error */ +@return DB_SUCCESS or DB_OUT_OF_FILE_SPACE */ UNIV_INTERN ulint btr_store_big_rec_extern_fields( diff --git a/storage/innodb_plugin/include/data0data.h b/storage/innodb_plugin/include/data0data.h index f9fce3f3657..cab8d790ac1 100644 --- a/storage/innodb_plugin/include/data0data.h +++ b/storage/innodb_plugin/include/data0data.h @@ -154,14 +154,19 @@ dfield_dup( dfield_t* field, /*!< in/out: data field */ mem_heap_t* heap); /*!< in: memory heap where allocated */ /*********************************************************************//** -Tests if data length and content is equal for two dfields. -@return TRUE if equal */ +Tests if two data fields are equal. +If len==0, tests the data length and content for equality. +If len>0, tests the first len bytes of the content for equality. +@return TRUE if both fields are NULL or if they are equal */ UNIV_INLINE ibool dfield_datas_are_binary_equal( /*==========================*/ const dfield_t* field1, /*!< in: field */ - const dfield_t* field2);/*!< in: field */ + const dfield_t* field2, /*!< in: field */ + ulint len) /*!< in: maximum prefix to compare, + or 0 to compare the whole field length */ + __attribute__((nonnull, warn_unused_result)); /*********************************************************************//** Tests if dfield data length and content is equal to the given. @return TRUE if equal */ diff --git a/storage/innodb_plugin/include/data0data.ic b/storage/innodb_plugin/include/data0data.ic index da79aa33702..74e0f7d09a0 100644 --- a/storage/innodb_plugin/include/data0data.ic +++ b/storage/innodb_plugin/include/data0data.ic @@ -229,20 +229,30 @@ dfield_dup( } /*********************************************************************//** -Tests if data length and content is equal for two dfields. -@return TRUE if equal */ +Tests if two data fields are equal. +If len==0, tests the data length and content for equality. +If len>0, tests the first len bytes of the content for equality. +@return TRUE if both fields are NULL or if they are equal */ UNIV_INLINE ibool dfield_datas_are_binary_equal( /*==========================*/ const dfield_t* field1, /*!< in: field */ - const dfield_t* field2) /*!< in: field */ + const dfield_t* field2, /*!< in: field */ + ulint len) /*!< in: maximum prefix to compare, + or 0 to compare the whole field length */ { - ulint len; + ulint len2 = len; - len = field1->len; + if (field1->len == UNIV_SQL_NULL || len == 0 || field1->len < len) { + len = field1->len; + } + + if (field2->len == UNIV_SQL_NULL || len2 == 0 || field2->len < len2) { + len2 = field2->len; + } - return(len == field2->len + return(len == len2 && (len == UNIV_SQL_NULL || !memcmp(field1->data, field2->data, len))); } diff --git a/storage/innodb_plugin/include/dict0dict.h b/storage/innodb_plugin/include/dict0dict.h index 5ffa59538c8..fdb3bd5d50c 100644 --- a/storage/innodb_plugin/include/dict0dict.h +++ b/storage/innodb_plugin/include/dict0dict.h @@ -318,7 +318,8 @@ void dict_table_replace_index_in_foreign_list( /*=====================================*/ dict_table_t* table, /*!< in/out: table */ - dict_index_t* index); /*!< in: index to be replaced */ + dict_index_t* index, /*!< in: index to be replaced */ + const trx_t* trx); /*!< in: transaction handle */ /*********************************************************************//** Checks if a index is defined for a foreign key constraint. Index is a part of a foreign key constraint if the index is referenced by foreign key @@ -1053,19 +1054,13 @@ Calculates new estimates for table and index statistics. The statistics are used in query optimization. */ UNIV_INTERN void -dict_update_statistics_low( -/*=======================*/ - dict_table_t* table, /*!< in/out: table */ - ibool has_dict_mutex);/*!< in: TRUE if the caller has the - dictionary mutex */ -/*********************************************************************//** -Calculates new estimates for table and index statistics. The statistics -are used in query optimization. */ -UNIV_INTERN -void dict_update_statistics( /*===================*/ - dict_table_t* table); /*!< in/out: table */ + dict_table_t* table, /*!< in/out: table */ + ibool only_calc_if_missing_stats);/*!< in: only + update/recalc the stats if they have + not been initialized yet, otherwise + do nothing */ /********************************************************************//** Reserves the dictionary system mutex for MySQL. */ UNIV_INTERN @@ -1079,21 +1074,25 @@ void dict_mutex_exit_for_mysql(void); /*===========================*/ /**********************************************************************//** -Lock the appropriate mutex to protect index->stat_n_diff_key_vals[]. -index->id is used to pick the right mutex and it should not change -before dict_index_stat_mutex_exit() is called on this index. */ +Lock the appropriate latch to protect a given table's statistics. +table->id is used to pick the corresponding latch from a global array of +latches. */ UNIV_INTERN void -dict_index_stat_mutex_enter( -/*========================*/ - const dict_index_t* index); /*!< in: index */ +dict_table_stats_lock( +/*==================*/ + const dict_table_t* table, /*!< in: table */ + ulint latch_mode); /*!< in: RW_S_LATCH or + RW_X_LATCH */ /**********************************************************************//** -Unlock the appropriate mutex that protects index->stat_n_diff_key_vals[]. */ +Unlock the latch that has been locked by dict_table_stats_lock() */ UNIV_INTERN void -dict_index_stat_mutex_exit( -/*=======================*/ - const dict_index_t* index); /*!< in: index */ +dict_table_stats_unlock( +/*====================*/ + const dict_table_t* table, /*!< in: table */ + ulint latch_mode); /*!< in: RW_S_LATCH or + RW_X_LATCH */ /********************************************************************//** Checks if the database name in two table names is the same. @return TRUE if same db name */ diff --git a/storage/innodb_plugin/include/fil0fil.h b/storage/innodb_plugin/include/fil0fil.h index c894875b352..f6a19646292 100644 --- a/storage/innodb_plugin/include/fil0fil.h +++ b/storage/innodb_plugin/include/fil0fil.h @@ -716,6 +716,14 @@ fil_page_get_type( /*==============*/ const byte* page); /*!< in: file page */ +/*******************************************************************//** +Returns TRUE if a single-table tablespace is being deleted. +@return TRUE if being deleted */ +UNIV_INTERN +ibool +fil_tablespace_is_being_deleted( +/*============================*/ + ulint id); /*!< in: space id */ typedef struct fil_space_struct fil_space_t; diff --git a/storage/innodb_plugin/include/row0ins.h b/storage/innodb_plugin/include/row0ins.h index 9f93565ddb7..810973e61a7 100644 --- a/storage/innodb_plugin/include/row0ins.h +++ b/storage/innodb_plugin/include/row0ins.h @@ -84,9 +84,10 @@ ulint row_ins_index_entry( /*================*/ dict_index_t* index, /*!< in: index */ - dtuple_t* entry, /*!< in: index entry to insert */ + dtuple_t* entry, /*!< in/out: index entry to insert */ ulint n_ext, /*!< in: number of externally stored columns */ - ibool foreign,/*!< in: TRUE=check foreign key constraints */ + ibool foreign,/*!< in: TRUE=check foreign key constraints + (foreign=FALSE only during CREATE INDEX) */ que_thr_t* thr); /*!< in: query thread */ /***********************************************************//** Inserts a row to a table. This is a high-level function used in diff --git a/storage/innodb_plugin/include/row0upd.h b/storage/innodb_plugin/include/row0upd.h index 4e2de9bd2ec..b61e6b6dca1 100644 --- a/storage/innodb_plugin/include/row0upd.h +++ b/storage/innodb_plugin/include/row0upd.h @@ -126,8 +126,8 @@ UNIV_INTERN void row_upd_index_entry_sys_field( /*==========================*/ - const dtuple_t* entry, /*!< in: index entry, where the memory buffers - for sys fields are already allocated: + dtuple_t* entry, /*!< in/out: index entry, where the memory + buffers for sys fields are already allocated: the function just copies the new values to them */ dict_index_t* index, /*!< in: clustered index */ @@ -286,10 +286,13 @@ row_upd_changes_ord_field_binary( row and the data values in update are not known when this function is called, e.g., at compile time */ + const row_ext_t*ext, /*!< NULL, or prefixes of the externally + stored columns in the old row */ dict_index_t* index, /*!< in: index of the record */ - const upd_t* update);/*!< in: update vector for the row; NOTE: the + const upd_t* update) /*!< in: update vector for the row; NOTE: the field numbers in this MUST be clustered index positions! */ + __attribute__((nonnull(3,4), warn_unused_result)); /***********************************************************//** Checks if an update vector changes an ordering field of an index record. This function is fast if the update vector is short or the number of ordering @@ -462,11 +465,16 @@ struct upd_node_struct{ #define UPD_NODE_INSERT_CLUSTERED 3 /* clustered index record should be inserted, old record is already delete marked */ -#define UPD_NODE_UPDATE_ALL_SEC 4 /* an ordering field of the clustered +#define UPD_NODE_INSERT_BLOB 4 /* clustered index record should be + inserted, old record is already + delete-marked; non-updated BLOBs + should be inherited by the new record + and disowned by the old record */ +#define UPD_NODE_UPDATE_ALL_SEC 5 /* an ordering field of the clustered index record was changed, or this is a delete operation: should update all the secondary index records */ -#define UPD_NODE_UPDATE_SOME_SEC 5 /* secondary index entries should be +#define UPD_NODE_UPDATE_SOME_SEC 6 /* secondary index entries should be looked at and updated if an ordering field changed */ diff --git a/storage/innodb_plugin/include/trx0i_s.h b/storage/innodb_plugin/include/trx0i_s.h index 7bd4e1b88c8..48d41038ea4 100644 --- a/storage/innodb_plugin/include/trx0i_s.h +++ b/storage/innodb_plugin/include/trx0i_s.h @@ -110,6 +110,8 @@ struct i_s_trx_row_struct { /*!< thd_get_thread_id() */ const char* trx_query; /*!< MySQL statement being executed in the transaction */ + struct charset_info_st* trx_query_cs; /*!< charset encode the MySQL + statement */ }; /** This structure represents INFORMATION_SCHEMA.innodb_lock_waits row */ diff --git a/storage/innodb_plugin/include/univ.i b/storage/innodb_plugin/include/univ.i index 0bb4b744d05..b721e0406a8 100644 --- a/storage/innodb_plugin/include/univ.i +++ b/storage/innodb_plugin/include/univ.i @@ -46,7 +46,7 @@ Created 1/20/1994 Heikki Tuuri #define INNODB_VERSION_MAJOR 1 #define INNODB_VERSION_MINOR 0 -#define INNODB_VERSION_BUGFIX 13 +#define INNODB_VERSION_BUGFIX 15 /* The following is the InnoDB version as shown in SELECT plugin_version FROM information_schema.plugins; @@ -296,6 +296,18 @@ number does not include a terminating '\0'. InnoDB probably can handle longer names internally */ #define MAX_TABLE_NAME_LEN 192 +/* The maximum length of a database name. Like MAX_TABLE_NAME_LEN this is +the MySQL's NAME_LEN, see check_and_convert_db_name(). */ +#define MAX_DATABASE_NAME_LEN MAX_TABLE_NAME_LEN + +/* MAX_FULL_NAME_LEN defines the full name path including the +database name and table name. In addition, 14 bytes is added for: + 2 for surrounding quotes around table name + 1 for the separating dot (.) + 9 for the #mysql50# prefix */ +#define MAX_FULL_NAME_LEN \ + (MAX_TABLE_NAME_LEN + MAX_DATABASE_NAME_LEN + 14) + /* UNIVERSAL TYPE DEFINITIONS ========================== @@ -360,6 +372,9 @@ typedef unsigned long long int ullint; /* Maximum value for ib_uint64_t */ #define IB_ULONGLONG_MAX ((ib_uint64_t) (~0ULL)) +/* THe 'undefined' value for ullint */ +#define ULLINT_UNDEFINED ((ullint)(-1)) + /* This 'ibool' type is used within Innobase. Remember that different included headers may define 'bool' differently. Do not assume that 'bool' is a ulint! */ #define ibool ulint diff --git a/storage/innodb_plugin/include/ut0vec.h b/storage/innodb_plugin/include/ut0vec.h index a770f671cfc..0f8b955b098 100644 --- a/storage/innodb_plugin/include/ut0vec.h +++ b/storage/innodb_plugin/include/ut0vec.h @@ -94,6 +94,25 @@ ib_vector_get( ulint n); /*!< in: element index to get */ /****************************************************************//** +Get last element. The vector must not be empty. +@return last element */ +UNIV_INLINE +void* +ib_vector_get_last( +/*===============*/ + ib_vector_t* vec); /*!< in: vector */ + +/****************************************************************//** +Set the n'th element. */ +UNIV_INLINE +void +ib_vector_set( +/*==========*/ + ib_vector_t* vec, /*!< in/out: vector */ + ulint n, /*!< in: element index to set */ + void* elem); /*!< in: data element */ + +/****************************************************************//** Remove the last element from the vector. */ UNIV_INLINE void* diff --git a/storage/innodb_plugin/include/ut0vec.ic b/storage/innodb_plugin/include/ut0vec.ic index 02e881f9bca..34c858868ce 100644 --- a/storage/innodb_plugin/include/ut0vec.ic +++ b/storage/innodb_plugin/include/ut0vec.ic @@ -51,6 +51,35 @@ ib_vector_get( } /****************************************************************//** +Get last element. The vector must not be empty. +@return last element */ +UNIV_INLINE +void* +ib_vector_get_last( +/*===============*/ + ib_vector_t* vec) /*!< in: vector */ +{ + ut_a(vec->used > 0); + + return(vec->data[vec->used - 1]); +} + +/****************************************************************//** +Set the n'th element. */ +UNIV_INLINE +void +ib_vector_set( +/*==========*/ + ib_vector_t* vec, /*!< in/out: vector */ + ulint n, /*!< in: element index to set */ + void* elem) /*!< in: data element */ +{ + ut_a(n < vec->used); + + vec->data[n] = elem; +} + +/****************************************************************//** Remove the last element from the vector. @return last vector element */ UNIV_INLINE diff --git a/storage/innodb_plugin/lock/lock0lock.c b/storage/innodb_plugin/lock/lock0lock.c index 77d69d11a2d..c8bbc5c02bd 100644 --- a/storage/innodb_plugin/lock/lock0lock.c +++ b/storage/innodb_plugin/lock/lock0lock.c @@ -3625,6 +3625,80 @@ lock_table_create( } /*************************************************************//** +Pops autoinc lock requests from the transaction's autoinc_locks. We +handle the case where there are gaps in the array and they need to +be popped off the stack. */ +UNIV_INLINE +void +lock_table_pop_autoinc_locks( +/*=========================*/ + trx_t* trx) /*!< in/out: transaction that owns the AUTOINC locks */ +{ + ut_ad(mutex_own(&kernel_mutex)); + ut_ad(!ib_vector_is_empty(trx->autoinc_locks)); + + /* Skip any gaps, gaps are NULL lock entries in the + trx->autoinc_locks vector. */ + + do { + ib_vector_pop(trx->autoinc_locks); + + if (ib_vector_is_empty(trx->autoinc_locks)) { + return; + } + + } while (ib_vector_get_last(trx->autoinc_locks) == NULL); +} + +/*************************************************************//** +Removes an autoinc lock request from the transaction's autoinc_locks. */ +UNIV_INLINE +void +lock_table_remove_autoinc_lock( +/*===========================*/ + lock_t* lock, /*!< in: table lock */ + trx_t* trx) /*!< in/out: transaction that owns the lock */ +{ + lock_t* autoinc_lock; + lint i = ib_vector_size(trx->autoinc_locks) - 1; + + ut_ad(mutex_own(&kernel_mutex)); + ut_ad(lock_get_mode(lock) == LOCK_AUTO_INC); + ut_ad(lock_get_type_low(lock) & LOCK_TABLE); + ut_ad(!ib_vector_is_empty(trx->autoinc_locks)); + + /* With stored functions and procedures the user may drop + a table within the same "statement". This special case has + to be handled by deleting only those AUTOINC locks that were + held by the table being dropped. */ + + autoinc_lock = ib_vector_get(trx->autoinc_locks, i); + + /* This is the default fast case. */ + + if (autoinc_lock == lock) { + lock_table_pop_autoinc_locks(trx); + } else { + /* The last element should never be NULL */ + ut_a(autoinc_lock != NULL); + + /* Handle freeing the locks from within the stack. */ + + while (--i >= 0) { + autoinc_lock = ib_vector_get(trx->autoinc_locks, i); + + if (UNIV_LIKELY(autoinc_lock == lock)) { + ib_vector_set(trx->autoinc_locks, i, NULL); + return; + } + } + + /* Must find the autoinc lock. */ + ut_error; + } +} + +/*************************************************************//** Removes a table lock request from the queue and the trx list of locks; this is a low-level function which does NOT check if waiting requests can now be granted. */ @@ -3663,10 +3737,8 @@ lock_table_remove_low( if (!lock_get_wait(lock) && !ib_vector_is_empty(trx->autoinc_locks)) { - lock_t* autoinc_lock; - autoinc_lock = ib_vector_pop(trx->autoinc_locks); - ut_a(autoinc_lock == lock); + lock_table_remove_autoinc_lock(lock, trx); } ut_a(table->n_waiting_or_granted_auto_inc_locks > 0); diff --git a/storage/innodb_plugin/log/log0recv.c b/storage/innodb_plugin/log/log0recv.c index c1d12dad413..1591bb02ec2 100644 --- a/storage/innodb_plugin/log/log0recv.c +++ b/storage/innodb_plugin/log/log0recv.c @@ -2188,7 +2188,7 @@ recv_report_corrupt_log( "InnoDB: far enough in recovery! Please run CHECK TABLE\n" "InnoDB: on your InnoDB tables to check that they are ok!\n" "InnoDB: If mysqld crashes after this recovery, look at\n" - "InnoDB: " REFMAN "forcing-recovery.html\n" + "InnoDB: " REFMAN "forcing-innodb-recovery.html\n" "InnoDB: about forcing recovery.\n", stderr); fflush(stderr); diff --git a/storage/innodb_plugin/plug.in b/storage/innodb_plugin/plug.in index c99703415f9..ebaa3f574a0 100644 --- a/storage/innodb_plugin/plug.in +++ b/storage/innodb_plugin/plug.in @@ -17,6 +17,9 @@ MYSQL_STORAGE_ENGINE(innodb_plugin,, [InnoDB Storage Engine], [Transactional Tables using InnoDB], []) MYSQL_PLUGIN_DIRECTORY(innodb_plugin, [storage/innodb_plugin]) +# Enable if you know what you are doing (trying to link both InnoDB and +# InnoDB Plugin statically into MySQL does not work). +#MYSQL_PLUGIN_STATIC(innodb_plugin, [libinnobase.a]) MYSQL_PLUGIN_DYNAMIC(innodb_plugin, [ha_innodb_plugin.la]) MYSQL_PLUGIN_ACTIONS(innodb_plugin, [ AC_CHECK_HEADERS(sched.h) @@ -136,17 +139,24 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin, [ ) AC_MSG_CHECKING(whether Solaris libc atomic functions are available) - # either define HAVE_IB_SOLARIS_ATOMICS or not - AC_CHECK_FUNCS(atomic_cas_ulong \ + # Define HAVE_IB_SOLARIS_ATOMICS if _all_ of the following + # functions are present. + AC_CHECK_FUNCS(atomic_add_long_nv \ atomic_cas_32 \ atomic_cas_64 \ - atomic_add_long_nv \ - atomic_swap_uchar, - - AC_DEFINE([HAVE_IB_SOLARIS_ATOMICS], [1], - [Define to 1 if Solaris libc atomic functions \ - are available]) - ) + atomic_cas_ulong \ + atomic_swap_uchar) + + if test "${ac_cv_func_atomic_add_long_nv}" = "yes" -a \ + "${ac_cv_func_atomic_cas_32}" = "yes" -a \ + "${ac_cv_func_atomic_cas_64}" = "yes" -a \ + "${ac_cv_func_atomic_cas_ulong}" = "yes" -a \ + "${ac_cv_func_atomic_swap_uchar}" = "yes" ; then + + AC_DEFINE([HAVE_IB_SOLARIS_ATOMICS], [1], + [Define to 1 if Solaris libc atomic functions are available] + ) + fi AC_MSG_CHECKING(whether pthread_t can be used by Solaris libc atomic functions) # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not diff --git a/storage/innodb_plugin/row/row0ins.c b/storage/innodb_plugin/row/row0ins.c index a193bf21f7c..298c601c7e3 100644 --- a/storage/innodb_plugin/row/row0ins.c +++ b/storage/innodb_plugin/row/row0ins.c @@ -1781,7 +1781,7 @@ ulint row_ins_duplicate_error_in_clust( /*=============================*/ btr_cur_t* cursor, /*!< in: B-tree cursor */ - dtuple_t* entry, /*!< in: entry to insert */ + const dtuple_t* entry, /*!< in: entry to insert */ que_thr_t* thr, /*!< in: query thread */ mtr_t* mtr) /*!< in: mtr */ { @@ -1977,7 +1977,7 @@ row_ins_index_entry_low( depending on whether we wish optimistic or pessimistic descent down the index tree */ dict_index_t* index, /*!< in: index */ - dtuple_t* entry, /*!< in: index entry to insert */ + dtuple_t* entry, /*!< in/out: index entry to insert */ ulint n_ext, /*!< in: number of externally stored columns */ que_thr_t* thr) /*!< in: query thread */ { @@ -2158,9 +2158,10 @@ ulint row_ins_index_entry( /*================*/ dict_index_t* index, /*!< in: index */ - dtuple_t* entry, /*!< in: index entry to insert */ + dtuple_t* entry, /*!< in/out: index entry to insert */ ulint n_ext, /*!< in: number of externally stored columns */ - ibool foreign,/*!< in: TRUE=check foreign key constraints */ + ibool foreign,/*!< in: TRUE=check foreign key constraints + (foreign=FALSE only during CREATE INDEX) */ que_thr_t* thr) /*!< in: query thread */ { ulint err; diff --git a/storage/innodb_plugin/row/row0merge.c b/storage/innodb_plugin/row/row0merge.c index 05d77ad7f19..647d0031635 100644 --- a/storage/innodb_plugin/row/row0merge.c +++ b/storage/innodb_plugin/row/row0merge.c @@ -2043,7 +2043,7 @@ row_merge_drop_index( /* Replace this index with another equivalent index for all foreign key constraints on this table where this index is used */ - dict_table_replace_index_in_foreign_list(table, index); + dict_table_replace_index_in_foreign_list(table, index, trx); dict_index_remove_from_cache(table, index); trx->op_info = ""; @@ -2341,7 +2341,7 @@ row_merge_rename_tables( { ulint err = DB_ERROR; pars_info_t* info; - char old_name[MAX_TABLE_NAME_LEN + 1]; + char old_name[MAX_FULL_NAME_LEN + 1]; ut_ad(trx->mysql_thread_id == os_thread_get_curr_id()); ut_ad(old_table != new_table); @@ -2356,7 +2356,7 @@ row_merge_rename_tables( ut_print_timestamp(stderr); fprintf(stderr, "InnoDB: too long table name: '%s', " "max length is %d\n", old_table->name, - MAX_TABLE_NAME_LEN); + MAX_FULL_NAME_LEN); ut_error; } diff --git a/storage/innodb_plugin/row/row0mysql.c b/storage/innodb_plugin/row/row0mysql.c index 9e8d0a884f4..c4911400cee 100644 --- a/storage/innodb_plugin/row/row0mysql.c +++ b/storage/innodb_plugin/row/row0mysql.c @@ -573,7 +573,7 @@ handle_new_error: "InnoDB: If the mysqld server crashes" " after the startup or when\n" "InnoDB: you dump the tables, look at\n" - "InnoDB: " REFMAN "forcing-recovery.html" + "InnoDB: " REFMAN "forcing-innodb-recovery.html" " for help.\n", stderr); break; case DB_FOREIGN_EXCEED_MAX_CASCADE: @@ -871,7 +871,8 @@ row_update_statistics_if_needed( if (counter > 2000000000 || ((ib_int64_t)counter > 16 + table->stat_n_rows / 16)) { - dict_update_statistics(table); + dict_update_statistics(table, FALSE /* update even if stats + are initialized */); } } @@ -2964,7 +2965,8 @@ next_rec: dict_table_autoinc_lock(table); dict_table_autoinc_initialize(table, 1); dict_table_autoinc_unlock(table); - dict_update_statistics(table); + dict_update_statistics(table, FALSE /* update even if stats are + initialized */); trx_commit_for_mysql(trx); diff --git a/storage/innodb_plugin/row/row0purge.c b/storage/innodb_plugin/row/row0purge.c index 31b255cf2d4..8bf2ae0f458 100644 --- a/storage/innodb_plugin/row/row0purge.c +++ b/storage/innodb_plugin/row/row0purge.c @@ -413,7 +413,7 @@ row_purge_upd_exist_or_extern( while (node->index != NULL) { index = node->index; - if (row_upd_changes_ord_field_binary(NULL, node->index, + if (row_upd_changes_ord_field_binary(NULL, NULL, node->index, node->update)) { /* Build the older version of the index entry */ entry = row_build_index_entry(node->row, NULL, diff --git a/storage/innodb_plugin/row/row0sel.c b/storage/innodb_plugin/row/row0sel.c index ac78a95839c..423ddfade22 100644 --- a/storage/innodb_plugin/row/row0sel.c +++ b/storage/innodb_plugin/row/row0sel.c @@ -106,6 +106,18 @@ row_sel_sec_rec_is_for_blob( ulint len; byte buf[DICT_MAX_INDEX_COL_LEN]; + ut_a(clust_len >= BTR_EXTERN_FIELD_REF_SIZE); + + if (UNIV_UNLIKELY + (!memcmp(clust_field + clust_len - BTR_EXTERN_FIELD_REF_SIZE, + field_ref_zero, BTR_EXTERN_FIELD_REF_SIZE))) { + /* The externally stored field was not written yet. + This record should only be seen by + recv_recovery_rollback_active() or any + TRX_ISO_READ_UNCOMMITTED transactions. */ + return(FALSE); + } + len = btr_copy_externally_stored_field_prefix(buf, sizeof buf, zip_size, clust_field, clust_len); diff --git a/storage/innodb_plugin/row/row0umod.c b/storage/innodb_plugin/row/row0umod.c index 5998dadd16d..562f8093c38 100644 --- a/storage/innodb_plugin/row/row0umod.c +++ b/storage/innodb_plugin/row/row0umod.c @@ -668,19 +668,18 @@ row_undo_mod_upd_exist_sec( while (node->index != NULL) { index = node->index; - if (row_upd_changes_ord_field_binary(node->row, node->index, - node->update)) { + if (row_upd_changes_ord_field_binary( + node->row, node->ext, node->index, node->update)) { /* Build the newest version of the index entry */ entry = row_build_index_entry(node->row, node->ext, index, heap); if (UNIV_UNLIKELY(!entry)) { /* The server must have crashed in - row_upd_clust_rec_by_insert(), in - row_ins_index_entry_low() before - btr_store_big_rec_extern_fields() - has written the externally stored columns - (BLOBs) of the new clustered index entry. */ + row_upd_clust_rec_by_insert() before + the updated externally stored columns (BLOBs) + of the new clustered index entry were + written. */ /* The table must be in DYNAMIC or COMPRESSED format. REDUNDANT and COMPACT formats diff --git a/storage/innodb_plugin/row/row0upd.c b/storage/innodb_plugin/row/row0upd.c index 444003ba3f0..4aa1474a25b 100644 --- a/storage/innodb_plugin/row/row0upd.c +++ b/storage/innodb_plugin/row/row0upd.c @@ -371,8 +371,8 @@ UNIV_INTERN void row_upd_index_entry_sys_field( /*==========================*/ - const dtuple_t* entry, /*!< in: index entry, where the memory buffers - for sys fields are already allocated: + dtuple_t* entry, /*!< in/out: index entry, where the memory + buffers for sys fields are already allocated: the function just copies the new values to them */ dict_index_t* index, /*!< in: clustered index */ @@ -1198,20 +1198,21 @@ row_upd_changes_ord_field_binary( row and the data values in update are not known when this function is called, e.g., at compile time */ + const row_ext_t*ext, /*!< NULL, or prefixes of the externally + stored columns in the old row */ dict_index_t* index, /*!< in: index of the record */ const upd_t* update) /*!< in: update vector for the row; NOTE: the field numbers in this MUST be clustered index positions! */ { - ulint n_unique; - ulint n_upd_fields; - ulint i, j; - dict_index_t* clust_index; + ulint n_unique; + ulint i; + const dict_index_t* clust_index; - ut_ad(update && index); + ut_ad(update); + ut_ad(index); n_unique = dict_index_get_n_unique(index); - n_upd_fields = upd_get_n_fields(update); clust_index = dict_table_get_first_index(index->table); @@ -1219,33 +1220,72 @@ row_upd_changes_ord_field_binary( const dict_field_t* ind_field; const dict_col_t* col; - ulint col_pos; ulint col_no; + const upd_field_t* upd_field; + const dfield_t* dfield; + dfield_t dfield_ext; + ulint dfield_len; + const byte* buf; ind_field = dict_index_get_nth_field(index, i); col = dict_field_get_col(ind_field); - col_pos = dict_col_get_clust_pos(col, clust_index); col_no = dict_col_get_no(col); - for (j = 0; j < n_upd_fields; j++) { + upd_field = upd_get_field_by_field_no( + update, dict_col_get_clust_pos(col, clust_index)); - const upd_field_t* upd_field - = upd_get_nth_field(update, j); + if (upd_field == NULL) { + continue; + } + + if (row == NULL) { + ut_ad(ext == NULL); + return(TRUE); + } - /* Note that if the index field is a column prefix - then it may be that row does not contain an externally - stored part of the column value, and we cannot compare - the datas */ + dfield = dtuple_get_nth_field(row, col_no); - if (col_pos == upd_field->field_no - && (row == NULL - || ind_field->prefix_len > 0 - || !dfield_datas_are_binary_equal( - dtuple_get_nth_field(row, col_no), - &(upd_field->new_val)))) { + /* This treatment of column prefix indexes is loosely + based on row_build_index_entry(). */ - return(TRUE); + if (UNIV_LIKELY(ind_field->prefix_len == 0) + || dfield_is_null(dfield)) { + /* do nothing special */ + } else if (UNIV_LIKELY_NULL(ext)) { + /* See if the column is stored externally. */ + buf = row_ext_lookup(ext, col_no, &dfield_len); + + ut_ad(col->ord_part); + + if (UNIV_LIKELY_NULL(buf)) { + if (UNIV_UNLIKELY(buf == field_ref_zero)) { + /* This should never happen, but + we try to fail safe here. */ + ut_ad(0); + return(TRUE); + } + + goto copy_dfield; } + } else if (dfield_is_ext(dfield)) { + dfield_len = dfield_get_len(dfield); + ut_a(dfield_len > BTR_EXTERN_FIELD_REF_SIZE); + dfield_len -= BTR_EXTERN_FIELD_REF_SIZE; + ut_a(dict_index_is_clust(index) + || ind_field->prefix_len <= dfield_len); + buf = dfield_get_data(dfield); +copy_dfield: + ut_a(dfield_len > 0); + dfield_copy(&dfield_ext, dfield); + dfield_set_data(&dfield_ext, buf, dfield_len); + dfield = &dfield_ext; + } + + if (!dfield_datas_are_binary_equal( + dfield, &upd_field->new_val, + ind_field->prefix_len)) { + + return(TRUE); } } @@ -1329,7 +1369,7 @@ row_upd_changes_first_fields_binary( if (col_pos == upd_field->field_no && !dfield_datas_are_binary_equal( dtuple_get_nth_field(entry, i), - &(upd_field->new_val))) { + &upd_field->new_val, 0)) { return(TRUE); } @@ -1568,14 +1608,99 @@ row_upd_sec_step( ut_ad(!dict_index_is_clust(node->index)); if (node->state == UPD_NODE_UPDATE_ALL_SEC - || row_upd_changes_ord_field_binary(node->row, node->index, - node->update)) { + || row_upd_changes_ord_field_binary(node->row, node->ext, + node->index, node->update)) { return(row_upd_sec_index_entry(node, thr)); } return(DB_SUCCESS); } +#ifdef UNIV_DEBUG +# define row_upd_clust_rec_by_insert_inherit(rec,offsets,entry,update) \ + row_upd_clust_rec_by_insert_inherit_func(rec,offsets,entry,update) +#else /* UNIV_DEBUG */ +# define row_upd_clust_rec_by_insert_inherit(rec,offsets,entry,update) \ + row_upd_clust_rec_by_insert_inherit_func(entry,update) +#endif /* UNIV_DEBUG */ +/*******************************************************************//** +Mark non-updated off-page columns inherited when the primary key is +updated. We must mark them as inherited in entry, so that they are not +freed in a rollback. A limited version of this function used to be +called btr_cur_mark_dtuple_inherited_extern(). +@return TRUE if any columns were inherited */ +static __attribute__((warn_unused_result)) +ibool +row_upd_clust_rec_by_insert_inherit_func( +/*=====================================*/ +#ifdef UNIV_DEBUG + const rec_t* rec, /*!< in: old record, or NULL */ + const ulint* offsets,/*!< in: rec_get_offsets(rec), or NULL */ +#endif /* UNIV_DEBUG */ + dtuple_t* entry, /*!< in/out: updated entry to be + inserted into the clustered index */ + const upd_t* update) /*!< in: update vector */ +{ + ibool inherit = FALSE; + ulint i; + + ut_ad(!rec == !offsets); + ut_ad(!rec || rec_offs_any_extern(offsets)); + + for (i = 0; i < dtuple_get_n_fields(entry); i++) { + dfield_t* dfield = dtuple_get_nth_field(entry, i); + byte* data; + ulint len; + + ut_ad(!offsets + || !rec_offs_nth_extern(offsets, i) + == !dfield_is_ext(dfield) + || upd_get_field_by_field_no(update, i)); + if (!dfield_is_ext(dfield) + || upd_get_field_by_field_no(update, i)) { + continue; + } + +#ifdef UNIV_DEBUG + if (UNIV_LIKELY(rec != NULL)) { + const byte* rec_data + = rec_get_nth_field(rec, offsets, i, &len); + ut_ad(len == dfield_get_len(dfield)); + ut_ad(len != UNIV_SQL_NULL); + ut_ad(len >= BTR_EXTERN_FIELD_REF_SIZE); + + rec_data += len - BTR_EXTERN_FIELD_REF_SIZE; + + /* The pointer must not be zero. */ + ut_ad(memcmp(rec_data, field_ref_zero, + BTR_EXTERN_FIELD_REF_SIZE)); + /* The BLOB must be owned. */ + ut_ad(!(rec_data[BTR_EXTERN_LEN] + & BTR_EXTERN_OWNER_FLAG)); + } +#endif /* UNIV_DEBUG */ + + len = dfield_get_len(dfield); + ut_a(len != UNIV_SQL_NULL); + ut_a(len >= BTR_EXTERN_FIELD_REF_SIZE); + data = dfield_get_data(dfield); + data += len - BTR_EXTERN_FIELD_REF_SIZE; + /* The pointer must not be zero. */ + ut_a(memcmp(data, field_ref_zero, BTR_EXTERN_FIELD_REF_SIZE)); + /* The BLOB must be owned. */ + ut_a(!(data[BTR_EXTERN_LEN] & BTR_EXTERN_OWNER_FLAG)); + + data[BTR_EXTERN_LEN] |= BTR_EXTERN_INHERITED_FLAG; + /* The BTR_EXTERN_INHERITED_FLAG only matters in + rollback. Purge will always free the extern fields of + a delete-marked row. */ + + inherit = TRUE; + } + + return(inherit); +} + /***********************************************************//** Marks the clustered index record deleted and inserts the updated version of the record to the index. This function should be used when the ordering @@ -1587,21 +1712,23 @@ static ulint row_upd_clust_rec_by_insert( /*========================*/ - upd_node_t* node, /*!< in: row update node */ + upd_node_t* node, /*!< in/out: row update node */ dict_index_t* index, /*!< in: clustered index of the record */ que_thr_t* thr, /*!< in: query thread */ ibool check_ref,/*!< in: TRUE if index may be referenced in a foreign key constraint */ - mtr_t* mtr) /*!< in: mtr; gets committed here */ + mtr_t* mtr) /*!< in/out: mtr; gets committed here */ { - mem_heap_t* heap = NULL; + mem_heap_t* heap; btr_pcur_t* pcur; btr_cur_t* btr_cur; trx_t* trx; dict_table_t* table; dtuple_t* entry; ulint err; - ibool change_ownership = FALSE; + ibool change_ownership = FALSE; + rec_t* rec; + ulint* offsets = NULL; ut_ad(node); ut_ad(dict_index_is_clust(index)); @@ -1611,77 +1738,112 @@ row_upd_clust_rec_by_insert( pcur = node->pcur; btr_cur = btr_pcur_get_btr_cur(pcur); - if (node->state != UPD_NODE_INSERT_CLUSTERED) { - rec_t* rec; - dict_index_t* index; - ulint offsets_[REC_OFFS_NORMAL_SIZE]; - ulint* offsets; - rec_offs_init(offsets_); + heap = mem_heap_create(1000); + + entry = row_build_index_entry(node->upd_row, node->upd_ext, + index, heap); + ut_a(entry); - err = btr_cur_del_mark_set_clust_rec(BTR_NO_LOCKING_FLAG, - btr_cur, TRUE, thr, mtr); + row_upd_index_entry_sys_field(entry, index, DATA_TRX_ID, trx->id); + + switch (node->state) { + default: + ut_error; + case UPD_NODE_INSERT_BLOB: + /* A lock wait occurred in row_ins_index_entry() in + the previous invocation of this function. Mark the + off-page columns in the entry inherited. */ + + change_ownership = row_upd_clust_rec_by_insert_inherit( + NULL, NULL, entry, node->update); + ut_a(change_ownership); + /* fall through */ + case UPD_NODE_INSERT_CLUSTERED: + /* A lock wait occurred in row_ins_index_entry() in + the previous invocation of this function. */ + break; + case UPD_NODE_UPDATE_CLUSTERED: + /* This is the first invocation of the function where + we update the primary key. Delete-mark the old record + in the clustered index and prepare to insert a new entry. */ + rec = btr_cur_get_rec(btr_cur); + offsets = rec_get_offsets(rec, index, NULL, + ULINT_UNDEFINED, &heap); + ut_ad(page_rec_is_user_rec(rec)); + + err = btr_cur_del_mark_set_clust_rec( + BTR_NO_LOCKING_FLAG, btr_cur_get_block(btr_cur), + rec, index, offsets, TRUE, thr, mtr); if (err != DB_SUCCESS) { +err_exit: mtr_commit(mtr); + mem_heap_free(heap); return(err); } - /* Mark as not-owned the externally stored fields which the new - row inherits from the delete marked record: purge should not - free those externally stored fields even if the delete marked - record is removed from the index tree, or updated. */ + /* If the the new row inherits externally stored + fields (off-page columns a.k.a. BLOBs) from the + delete-marked old record, mark them disowned by the + old record and owned by the new entry. */ + + if (rec_offs_any_extern(offsets)) { + change_ownership = row_upd_clust_rec_by_insert_inherit( + rec, offsets, entry, node->update); + + if (change_ownership) { + btr_pcur_store_position(pcur, mtr); + } + } - rec = btr_cur_get_rec(btr_cur); - index = dict_table_get_first_index(table); - offsets = rec_get_offsets(rec, index, offsets_, - ULINT_UNDEFINED, &heap); - change_ownership = btr_cur_mark_extern_inherited_fields( - btr_cur_get_page_zip(btr_cur), rec, index, offsets, - node->update, mtr); if (check_ref) { /* NOTE that the following call loses the position of pcur ! */ err = row_upd_check_references_constraints( node, pcur, table, index, offsets, thr, mtr); if (err != DB_SUCCESS) { - mtr_commit(mtr); - if (UNIV_LIKELY_NULL(heap)) { - mem_heap_free(heap); - } - return(err); + goto err_exit; } } } mtr_commit(mtr); - if (!heap) { - heap = mem_heap_create(500); - } - node->state = UPD_NODE_INSERT_CLUSTERED; + err = row_ins_index_entry(index, entry, + node->upd_ext ? node->upd_ext->n_ext : 0, + TRUE, thr); + node->state = change_ownership + ? UPD_NODE_INSERT_BLOB + : UPD_NODE_INSERT_CLUSTERED; - entry = row_build_index_entry(node->upd_row, node->upd_ext, - index, heap); - ut_a(entry); + if (err == DB_SUCCESS && change_ownership) { + /* Mark the non-updated fields disowned by the old record. */ - row_upd_index_entry_sys_field(entry, index, DATA_TRX_ID, trx->id); + /* NOTE: this transaction has an x-lock on the record + and therefore other transactions cannot modify the + record when we have no latch on the page. In addition, + we assume that other query threads of the same + transaction do not modify the record in the meantime. + Therefore we can assert that the restoration of the + cursor succeeds. */ - if (change_ownership) { - /* If we return from a lock wait, for example, we may have - extern fields marked as not-owned in entry (marked in the - if-branch above). We must unmark them, take the ownership - back. */ + mtr_start(mtr); - btr_cur_unmark_dtuple_extern_fields(entry); + if (!btr_pcur_restore_position(BTR_MODIFY_LEAF, pcur, mtr)) { + ut_error; + } - /* We must mark non-updated extern fields in entry as - inherited, so that a possible rollback will not free them. */ + rec = btr_cur_get_rec(btr_cur); + offsets = rec_get_offsets(rec, index, offsets, + ULINT_UNDEFINED, &heap); + ut_ad(page_rec_is_user_rec(rec)); - btr_cur_mark_dtuple_inherited_extern(entry, node->update); + btr_cur_disown_inherited_fields( + btr_cur_get_page_zip(btr_cur), + rec, index, offsets, node->update, mtr); + + mtr_commit(mtr); } - err = row_ins_index_entry(index, entry, - node->upd_ext ? node->upd_ext->n_ext : 0, - TRUE, thr); mem_heap_free(heap); return(err); @@ -1825,8 +1987,9 @@ row_upd_del_mark_clust_rec( /* Mark the clustered index record deleted; we do not have to check locks, because we assume that we have an x-lock on the record */ - err = btr_cur_del_mark_set_clust_rec(BTR_NO_LOCKING_FLAG, - btr_cur, TRUE, thr, mtr); + err = btr_cur_del_mark_set_clust_rec( + BTR_NO_LOCKING_FLAG, btr_cur_get_block(btr_cur), + btr_cur_get_rec(btr_cur), index, offsets, TRUE, thr, mtr); if (err == DB_SUCCESS && check_ref) { /* NOTE that the following call loses the position of pcur ! */ @@ -1973,7 +2136,8 @@ exit_func: row_upd_store_row(node); - if (row_upd_changes_ord_field_binary(node->row, index, node->update)) { + if (row_upd_changes_ord_field_binary(node->row, node->ext, index, + node->update)) { /* Update causes an ordering field (ordering fields within the B-tree) of the clustered index record to change: perform @@ -2042,7 +2206,8 @@ row_upd( } if (node->state == UPD_NODE_UPDATE_CLUSTERED - || node->state == UPD_NODE_INSERT_CLUSTERED) { + || node->state == UPD_NODE_INSERT_CLUSTERED + || node->state == UPD_NODE_INSERT_BLOB) { log_free_check(); err = row_upd_clust_step(node, thr); diff --git a/storage/innodb_plugin/srv/srv0start.c b/storage/innodb_plugin/srv/srv0start.c index f823b72fbc1..73f8f319704 100644 --- a/storage/innodb_plugin/srv/srv0start.c +++ b/storage/innodb_plugin/srv/srv0start.c @@ -1286,8 +1286,25 @@ innobase_start_or_create_for_mysql(void) fil_init(srv_file_per_table ? 50000 : 5000, srv_max_n_open_files); + /* Print time to initialize the buffer pool */ + ut_print_timestamp(stderr); + fprintf(stderr, + " InnoDB: Initializing buffer pool, size ="); + + if (srv_buf_pool_size >= 1024 * 1024 * 1024) { + fprintf(stderr, + " %.1fG\n", + ((double) srv_buf_pool_size) / (1024 * 1024 * 1024)); + } else { + fprintf(stderr, + " %.1fM\n", + ((double) srv_buf_pool_size) / (1024 * 1024)); + } + ret = buf_pool_init(); + ut_print_timestamp(stderr); + if (ret == NULL) { fprintf(stderr, "InnoDB: Fatal error: cannot allocate the memory" @@ -1296,6 +1313,9 @@ innobase_start_or_create_for_mysql(void) return(DB_ERROR); } + fprintf(stderr, + " InnoDB: Completed initialization of buffer pool\n"); + #ifdef UNIV_DEBUG /* We have observed deadlocks with a 5MB buffer pool but the actual lower limit could very well be a little higher. */ diff --git a/storage/innodb_plugin/sync/sync0rw.c b/storage/innodb_plugin/sync/sync0rw.c index 52eaa5d0f43..572c3690a7f 100644 --- a/storage/innodb_plugin/sync/sync0rw.c +++ b/storage/innodb_plugin/sync/sync0rw.c @@ -335,10 +335,13 @@ rw_lock_validate( /*=============*/ rw_lock_t* lock) /*!< in: rw-lock */ { + ulint waiters; + lint lock_word; + ut_a(lock); - ulint waiters = rw_lock_get_waiters(lock); - lint lock_word = lock->lock_word; + waiters = rw_lock_get_waiters(lock); + lock_word = lock->lock_word; ut_ad(lock->magic_n == RW_LOCK_MAGIC_N); ut_a(waiters == 0 || waiters == 1); @@ -988,7 +991,7 @@ rw_lock_debug_print( rwt = info->lock_type; - fprintf(stderr, "Locked: thread %ld file %s line %ld ", + fprintf(stderr, "Locked: thread %lu file %s line %lu ", (ulong) os_thread_pf(info->thread_id), info->file_name, (ulong) info->line); if (rwt == RW_LOCK_SHARED) { diff --git a/storage/innodb_plugin/thr/thr0loc.c b/storage/innodb_plugin/thr/thr0loc.c index 59a234a6b72..94b84b11fbe 100644 --- a/storage/innodb_plugin/thr/thr0loc.c +++ b/storage/innodb_plugin/thr/thr0loc.c @@ -71,6 +71,24 @@ struct thr_local_struct{ /** The value of thr_local_struct::magic_n */ #define THR_LOCAL_MAGIC_N 1231234 +#ifdef UNIV_DEBUG +/*******************************************************************//** +Validates thread local data. +@return TRUE if valid */ +static +ibool +thr_local_validate( +/*===============*/ + const thr_local_t* local) /*!< in: data to validate */ +{ + ut_ad(local->magic_n == THR_LOCAL_MAGIC_N); + ut_ad(local->slot_no == ULINT_UNDEFINED + || local->slot_no < OS_THREAD_MAX_N); + ut_ad(local->in_ibuf == FALSE || local->in_ibuf == TRUE); + return(TRUE); +} +#endif /* UNIV_DEBUG */ + /*******************************************************************//** Returns the local storage struct for a thread. @return local storage */ @@ -91,7 +109,8 @@ try_again: local = NULL; HASH_SEARCH(hash, thr_local_hash, os_thread_pf(id), - thr_local_t*, local,, os_thread_eq(local->id, id)); + thr_local_t*, local, ut_ad(thr_local_validate(local)), + os_thread_eq(local->id, id)); if (local == NULL) { mutex_exit(&thr_local_mutex); @@ -102,7 +121,7 @@ try_again: goto try_again; } - ut_ad(local->magic_n == THR_LOCAL_MAGIC_N); + ut_ad(thr_local_validate(local)); return(local); } @@ -188,7 +207,7 @@ thr_local_create(void) local->id = os_thread_get_curr_id(); local->handle = os_thread_get_curr(); local->magic_n = THR_LOCAL_MAGIC_N; - + local->slot_no = ULINT_UNDEFINED; local->in_ibuf = FALSE; mutex_enter(&thr_local_mutex); @@ -215,7 +234,8 @@ thr_local_free( /* Look for the local struct in the hash table */ HASH_SEARCH(hash, thr_local_hash, os_thread_pf(id), - thr_local_t*, local,, os_thread_eq(local->id, id)); + thr_local_t*, local, ut_ad(thr_local_validate(local)), + os_thread_eq(local->id, id)); if (local == NULL) { mutex_exit(&thr_local_mutex); @@ -228,6 +248,7 @@ thr_local_free( mutex_exit(&thr_local_mutex); ut_a(local->magic_n == THR_LOCAL_MAGIC_N); + ut_ad(thr_local_validate(local)); mem_free(local); } @@ -270,6 +291,7 @@ thr_local_close(void) local = HASH_GET_NEXT(hash, prev_local); ut_a(prev_local->magic_n == THR_LOCAL_MAGIC_N); + ut_ad(thr_local_validate(prev_local)); mem_free(prev_local); } } diff --git a/storage/innodb_plugin/trx/trx0i_s.c b/storage/innodb_plugin/trx/trx0i_s.c index c0b9a73a68c..e148234888b 100644 --- a/storage/innodb_plugin/trx/trx0i_s.c +++ b/storage/innodb_plugin/trx/trx0i_s.c @@ -404,6 +404,42 @@ table_cache_create_empty_row( return(row); } +#ifdef UNIV_DEBUG +/*******************************************************************//** +Validates a row in the locks cache. +@return TRUE if valid */ +static +ibool +i_s_locks_row_validate( +/*===================*/ + const i_s_locks_row_t* row) /*!< in: row to validate */ +{ + ut_ad(row->lock_trx_id != 0); + ut_ad(row->lock_mode != NULL); + ut_ad(row->lock_type != NULL); + ut_ad(row->lock_table != NULL); + ut_ad(row->lock_table_id != 0); + + if (row->lock_space == ULINT_UNDEFINED) { + /* table lock */ + ut_ad(!strcmp("TABLE", row->lock_type)); + ut_ad(row->lock_index == NULL); + ut_ad(row->lock_data == NULL); + ut_ad(row->lock_page == ULINT_UNDEFINED); + ut_ad(row->lock_rec == ULINT_UNDEFINED); + } else { + /* record lock */ + ut_ad(!strcmp("RECORD", row->lock_type)); + ut_ad(row->lock_index != NULL); + /* row->lock_data == NULL if buf_page_try_get() == NULL */ + ut_ad(row->lock_page != ULINT_UNDEFINED); + ut_ad(row->lock_rec != ULINT_UNDEFINED); + } + + return(TRUE); +} +#endif /* UNIV_DEBUG */ + /*******************************************************************//** Fills i_s_trx_row_t object. If memory can not be allocated then FALSE is returned. @@ -431,18 +467,15 @@ fill_trx_row( row->trx_id = trx_get_id(trx); row->trx_started = (ib_time_t) trx->start_time; row->trx_state = trx_get_que_state_str(trx); + row->requested_lock_row = requested_lock_row; + ut_ad(requested_lock_row == NULL + || i_s_locks_row_validate(requested_lock_row)); if (trx->wait_lock != NULL) { - ut_a(requested_lock_row != NULL); - - row->requested_lock_row = requested_lock_row; row->trx_wait_started = (ib_time_t) trx->wait_started; } else { - ut_a(requested_lock_row == NULL); - - row->requested_lock_row = NULL; row->trx_wait_started = 0; } @@ -461,7 +494,6 @@ fill_trx_row( stmt = innobase_get_stmt(trx->mysql_thd, &stmt_len); if (stmt != NULL) { - char query[TRX_I_S_TRX_QUERY_MAX_LEN + 1]; if (stmt_len > TRX_I_S_TRX_QUERY_MAX_LEN) { @@ -475,6 +507,8 @@ fill_trx_row( cache->storage, stmt, stmt_len + 1, MAX_ALLOWED_FOR_STORAGE(cache)); + row->trx_query_cs = innobase_get_charset(trx->mysql_thd); + if (row->trx_query == NULL) { return(FALSE); @@ -725,6 +759,7 @@ fill_locks_row( row->lock_table_id = lock_get_table_id(lock); row->hash_chain.value = row; + ut_ad(i_s_locks_row_validate(row)); return(TRUE); } @@ -745,6 +780,9 @@ fill_lock_waits_row( relevant blocking lock row in innodb_locks */ { + ut_ad(i_s_locks_row_validate(requested_lock_row)); + ut_ad(i_s_locks_row_validate(blocking_lock_row)); + row->requested_lock_row = requested_lock_row; row->blocking_lock_row = blocking_lock_row; @@ -816,6 +854,7 @@ locks_row_eq_lock( or ULINT_UNDEFINED if the lock is a table lock */ { + ut_ad(i_s_locks_row_validate(row)); #ifdef TEST_NO_LOCKS_ROW_IS_EVER_EQUAL_TO_LOCK_T return(0); #else @@ -873,7 +912,7 @@ search_innodb_locks( /* auxiliary variable */ hash_chain, /* assertion on every traversed item */ - , + ut_ad(i_s_locks_row_validate(hash_chain->value)), /* this determines if we have found the lock */ locks_row_eq_lock(hash_chain->value, lock, heap_no)); @@ -913,6 +952,7 @@ add_lock_to_cache( dst_row = search_innodb_locks(cache, lock, heap_no); if (dst_row != NULL) { + ut_ad(i_s_locks_row_validate(dst_row)); return(dst_row); } #endif @@ -950,6 +990,7 @@ add_lock_to_cache( } /* for()-loop */ #endif + ut_ad(i_s_locks_row_validate(dst_row)); return(dst_row); } diff --git a/storage/innodb_plugin/ut/ut0dbg.c b/storage/innodb_plugin/ut/ut0dbg.c index 4484e6c36de..7839466e16f 100644 --- a/storage/innodb_plugin/ut/ut0dbg.c +++ b/storage/innodb_plugin/ut/ut0dbg.c @@ -79,7 +79,7 @@ ut_dbg_assertion_failed( " or crashes, even\n" "InnoDB: immediately after the mysqld startup, there may be\n" "InnoDB: corruption in the InnoDB tablespace. Please refer to\n" - "InnoDB: " REFMAN "forcing-recovery.html\n" + "InnoDB: " REFMAN "forcing-innodb-recovery.html\n" "InnoDB: about forcing recovery.\n", stderr); #if defined(UNIV_SYNC_DEBUG) || !defined(UT_DBG_USE_ABORT) ut_dbg_stop_threads = TRUE; diff --git a/storage/maria/ma_key_recover.c b/storage/maria/ma_key_recover.c index aeaf9945599..71af3a011e3 100644 --- a/storage/maria/ma_key_recover.c +++ b/storage/maria/ma_key_recover.c @@ -1027,7 +1027,7 @@ uint _ma_apply_redo_index(MARIA_HA *info, insert_length, changed_length)); DBUG_ASSERT(insert_length <= changed_length && - page_length + changed_length <= max_page_size); + page_length + insert_length <= max_page_size); bmove_upp(buff + page_length + insert_length, buff + page_length, page_length - keypage_header); diff --git a/storage/myisam/ft_nlq_search.c b/storage/myisam/ft_nlq_search.c index 90ad2d635b7..a00fa8e840c 100644 --- a/storage/myisam/ft_nlq_search.c +++ b/storage/myisam/ft_nlq_search.c @@ -79,7 +79,6 @@ static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio) #else #error #endif - DBUG_ENTER("walk_and_match"); word->weight=LWS_FOR_QUERY; diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index b843ecfe7a1..f8f9340ba3a 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -590,7 +590,11 @@ int ha_myisam::net_read_dump(NET* net) int data_fd = file->dfile; int error = 0; - my_seek(data_fd, 0L, MY_SEEK_SET, MYF(MY_WME)); + if (my_seek(data_fd, 0L, MY_SEEK_SET, MYF(MY_WME)) == MY_FILEPOS_ERROR) + { + error= my_errno; + goto err; + } for (;;) { ulong packet_len = my_net_read(net); @@ -626,7 +630,11 @@ int ha_myisam::dump(THD* thd, int fd) return ENOMEM; int error = 0; - my_seek(data_fd, 0L, MY_SEEK_SET, MYF(MY_WME)); + if (my_seek(data_fd, 0L, MY_SEEK_SET, MYF(MY_WME)) == MY_FILEPOS_ERROR) + { + error= my_errno; + goto err; + } for (; bytes_to_read > 0;) { size_t bytes = my_read(data_fd, buf, blocksize, MYF(MY_WME)); diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c index 68565777b43..310f747a1a8 100644 --- a/storage/myisam/mi_check.c +++ b/storage/myisam/mi_check.c @@ -1740,6 +1740,8 @@ err: MYF(MY_REDEL_MAKE_BACKUP): MYF(0))) || mi_open_datafile(info,share,name,-1)) got_error=1; + + param->retry_repair= 0; } } if (got_error) diff --git a/storage/myisam/myisampack.c b/storage/myisam/myisampack.c index ba3ff3cdf0d..f1b9e04c474 100644 --- a/storage/myisam/myisampack.c +++ b/storage/myisam/myisampack.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright (C) 2000-2007 MySQL AB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/storage/ndb/Makefile.am b/storage/ndb/Makefile.am index 0da8ec136c9..835b8c83fd8 100644 --- a/storage/ndb/Makefile.am +++ b/storage/ndb/Makefile.am @@ -35,7 +35,7 @@ dist-hook: done windoze: - for i in `find . -name 'old_dirs' -prune -o -name 'Makefile.am' -print`; \ + for i in `find . -name 'Makefile.am' -print`; \ do make -C `dirname $$i` windoze-dsp; done windoze-dsp: diff --git a/storage/ndb/config/make-win-dsw.sh b/storage/ndb/config/make-win-dsw.sh index b0613620f8a..070a3665bc0 100755 --- a/storage/ndb/config/make-win-dsw.sh +++ b/storage/ndb/config/make-win-dsw.sh @@ -1,3 +1,17 @@ +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA cat <<EOF Microsoft Developer Studio Workspace File, Format Version 6.00 diff --git a/storage/ndb/config/win-includes b/storage/ndb/config/win-includes index fa5984fd25e..0d6eec83ae7 100755 --- a/storage/ndb/config/win-includes +++ b/storage/ndb/config/win-includes @@ -1,5 +1,20 @@ #!/bin/sh +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + dst=$1 shift diff --git a/storage/ndb/config/win-libraries b/storage/ndb/config/win-libraries index c7a6fb696ee..bc9275f9a7b 100755 --- a/storage/ndb/config/win-libraries +++ b/storage/ndb/config/win-libraries @@ -1,5 +1,20 @@ #!/bin/sh +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + dst=$1 shift diff --git a/storage/ndb/config/win-name b/storage/ndb/config/win-name index 036f2b9cc2e..1ceb7019d3f 100755 --- a/storage/ndb/config/win-name +++ b/storage/ndb/config/win-name @@ -1,5 +1,20 @@ #!/bin/sh +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + dst=$1 shift diff --git a/storage/ndb/config/win-sources b/storage/ndb/config/win-sources index a383bb0e613..ccf0f6b7618 100755 --- a/storage/ndb/config/win-sources +++ b/storage/ndb/config/win-sources @@ -1,5 +1,20 @@ #!/bin/sh +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + dst=$1 shift diff --git a/storage/ndb/docs/Makefile.am b/storage/ndb/docs/Makefile.am index b0166d40779..a16fa1325c3 100644 --- a/storage/ndb/docs/Makefile.am +++ b/storage/ndb/docs/Makefile.am @@ -14,7 +14,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA DOXYDIR = doxygen -noinst_HEADERS = $(DOXYDIR)/predoxy.pl $(DOXYDIR)/postdoxy.pl $(DOXYDIR)/Doxyfile.ndbapi $(DOXYDIR)/Doxyfile.mgmapi $(DOXYDIR)/header.ndbapi.tex $(DOXYDIR)/header.mgmapi.tex +noinst_HEADERS = $(DOXYDIR)/predoxy.pl $(DOXYDIR)/postdoxy.pl $(DOXYDIR)/Doxyfile.ndbapi $(DOXYDIR)/Doxyfile.mgmapi all-local: do-check-html ndbapidoc-html mgmapidoc-html all-pdf: do-check-pdf ndbapidoc-pdf mgmapidoc-pdf diff --git a/storage/ndb/docs/doxygen/Doxyfile.mgmapi b/storage/ndb/docs/doxygen/Doxyfile.mgmapi index 1e743dcb60e..59090d9dd95 100644 --- a/storage/ndb/docs/doxygen/Doxyfile.mgmapi +++ b/storage/ndb/docs/doxygen/Doxyfile.mgmapi @@ -1,3 +1,18 @@ +# Copyright (C) 2004, 2005 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # Doxyfile 1.2.12 # This file describes the settings to be used by the documentation system @@ -537,7 +552,7 @@ EXTRA_PACKAGES = # the first chapter. If it is left blank doxygen will generate a # standard header. Notice: only use this tag if you know what you are doing! -LATEX_HEADER = ../doxygen/header.mgmapi.tex +LATEX_HEADER = # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated # is prepared for conversion to pdf (using ps2pdf). The pdf file will diff --git a/storage/ndb/docs/doxygen/Doxyfile.ndb b/storage/ndb/docs/doxygen/Doxyfile.ndb index 3986a7cd17f..96365c8868f 100644 --- a/storage/ndb/docs/doxygen/Doxyfile.ndb +++ b/storage/ndb/docs/doxygen/Doxyfile.ndb @@ -1,3 +1,18 @@ +# Copyright (C) 2004, 2005 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # Doxyfile 1.2.14 # This file describes the settings to be used by the documentation system diff --git a/storage/ndb/docs/doxygen/Doxyfile.ndbapi b/storage/ndb/docs/doxygen/Doxyfile.ndbapi index da610148468..fb41b58a89f 100644 --- a/storage/ndb/docs/doxygen/Doxyfile.ndbapi +++ b/storage/ndb/docs/doxygen/Doxyfile.ndbapi @@ -1,3 +1,18 @@ +# Copyright (C) 2004, 2005 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # Doxyfile 1.2.12 # This file describes the settings to be used by the documentation system @@ -537,7 +552,7 @@ EXTRA_PACKAGES = # the first chapter. If it is left blank doxygen will generate a # standard header. Notice: only use this tag if you know what you are doing! -LATEX_HEADER = ../doxygen/header.ndbapi.tex +LATEX_HEADER = # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated # is prepared for conversion to pdf (using ps2pdf). The pdf file will diff --git a/storage/ndb/docs/doxygen/Doxyfile.odbc b/storage/ndb/docs/doxygen/Doxyfile.odbc index 262513852b7..aa0d97ffdf7 100644 --- a/storage/ndb/docs/doxygen/Doxyfile.odbc +++ b/storage/ndb/docs/doxygen/Doxyfile.odbc @@ -1,3 +1,18 @@ +# Copyright (C) 2004, 2005 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # Doxyfile 1.2.14 # This file describes the settings to be used by the documentation system diff --git a/storage/ndb/docs/doxygen/header.mgmapi.tex b/storage/ndb/docs/doxygen/header.mgmapi.tex deleted file mode 100644 index 1b55ceb15c7..00000000000 --- a/storage/ndb/docs/doxygen/header.mgmapi.tex +++ /dev/null @@ -1,44 +0,0 @@ -\documentclass[a4paper]{book} -\usepackage{a4wide} -\usepackage{makeidx} -\usepackage{fancyhdr} -\usepackage{graphicx} -\usepackage{multicol} -\usepackage{float} -\usepackage{textcomp} -\usepackage{alltt} -\usepackage{times} -\ifx\pdfoutput\undefined -\usepackage[ps2pdf, - pagebackref=true, - colorlinks=true, - linkcolor=blue - ]{hyperref} -\usepackage{pspicture} -\else -\usepackage[pdftex, - pagebackref=true, - colorlinks=true, - linkcolor=blue - ]{hyperref} -\fi -\usepackage{doxygen} -\makeindex -\setcounter{tocdepth}{1} -\renewcommand{\footrulewidth}{0.4pt} -\begin{document} -\begin{titlepage} -\vspace*{7cm} -\begin{center} -{\Huge NDB Cluster MGM API Guide \mbox{}\vspace{-3cm}\mbox{}\hrule\bigskip\bigskip\bigskip\bigskip\mbox{}\Huge{}}\\\vspace*{1cm} -\begin{center}\LARGE{MySQL AB}\end{center}\hfill\bigskip\bigskip\bigskip\hrule\bigskip\bigskip\bigskip\bigskip\bigskip\bigskip\bigskip\bigskip\bigskip\bigskip\bigskip\bigskip NDB Cluster Release RELEASE -\bigskip\bigskip\bigskip\bigskip\bigskip\hfill\vspace*{0.5cm} -{\small DATE}\\ -\end{center} -\end{titlepage} -\clearemptydoublepage -\pagenumbering{roman} -\tableofcontents -\clearemptydoublepage -\pagenumbering{arabic} - diff --git a/storage/ndb/docs/doxygen/header.ndbapi.tex b/storage/ndb/docs/doxygen/header.ndbapi.tex deleted file mode 100644 index c37ce286ed8..00000000000 --- a/storage/ndb/docs/doxygen/header.ndbapi.tex +++ /dev/null @@ -1,44 +0,0 @@ -\documentclass[a4paper]{book} -\usepackage{a4wide} -\usepackage{makeidx} -\usepackage{fancyhdr} -\usepackage{graphicx} -\usepackage{multicol} -\usepackage{float} -\usepackage{textcomp} -\usepackage{alltt} -\usepackage{times} -\ifx\pdfoutput\undefined -\usepackage[ps2pdf, - pagebackref=true, - colorlinks=true, - linkcolor=blue - ]{hyperref} -\usepackage{pspicture} -\else -\usepackage[pdftex, - pagebackref=true, - colorlinks=true, - linkcolor=blue - ]{hyperref} -\fi -\usepackage{doxygen} -\makeindex -\setcounter{tocdepth}{1} -\renewcommand{\footrulewidth}{0.4pt} -\begin{document} -\begin{titlepage} -\vspace*{7cm} -\begin{center} -{\Huge NDB API Programmer's Guide \mbox{}\vspace{-3cm}\mbox{}\hrule\bigskip\bigskip\bigskip\bigskip\mbox{}\Huge{}}\\\vspace*{1cm} -\begin{center}\LARGE{MySQL AB}\end{center}\hfill\bigskip\bigskip\bigskip\hrule\bigskip\bigskip\bigskip\bigskip\bigskip\bigskip\bigskip\bigskip\bigskip\bigskip\bigskip\bigskip NDB Cluster Release RELEASE -\bigskip\bigskip\bigskip\bigskip\bigskip\hfill\vspace*{0.5cm} -{\small DATE}\\ -\end{center} -\end{titlepage} -\clearemptydoublepage -\pagenumbering{roman} -\tableofcontents -\clearemptydoublepage -\pagenumbering{arabic} - diff --git a/storage/ndb/docs/doxygen/postdoxy.pl b/storage/ndb/docs/doxygen/postdoxy.pl index 3bf54e4ff75..a8eab31d47d 100755 --- a/storage/ndb/docs/doxygen/postdoxy.pl +++ b/storage/ndb/docs/doxygen/postdoxy.pl @@ -1,3 +1,18 @@ +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # # Written by Lars Thalmann, lars@mysql.com, 2003. # diff --git a/storage/ndb/docs/doxygen/predoxy.pl b/storage/ndb/docs/doxygen/predoxy.pl index 3994054dcf6..553052648af 100755 --- a/storage/ndb/docs/doxygen/predoxy.pl +++ b/storage/ndb/docs/doxygen/predoxy.pl @@ -1,3 +1,18 @@ +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # # Written by Lars Thalmann, lars@mysql.com, 2003. # diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs b/storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs index ea1798c8c67..b19875b97ef 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Drawing; using System.Collections; diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs b/storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs index 9763fac5622..5ee35e5e90e 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Drawing; using System.Collections; diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs b/storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs index c01e41f3e60..506cb6777f0 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Drawing; using System.Collections; diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs b/storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs index 5b4d1b56df7..a126c632ffd 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Drawing; using System.Collections; diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/Database.cs b/storage/ndb/src/cw/cpcc-win32/csharp/Database.cs index 39b8c160159..80a8daee2d0 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/Database.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/Database.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Drawing; using System.Collections; diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs b/storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs index f492aa64c60..a780190f86c 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + //author:Arun //date:Nov 13,2002 //Wizard using panel diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/Process.cs b/storage/ndb/src/cw/cpcc-win32/csharp/Process.cs index c1ee1b2fe9e..eac12d4868e 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/Process.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/Process.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Drawing; using System.Collections; diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs b/storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs index 581b8383e7c..ab8d58ed11f 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Drawing; using System.Collections; diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs b/storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs index b3a2361bcb0..41929c104d0 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Text; using System.Collections.Specialized; diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs b/storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs index b8ff2844af9..6e070875b25 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Collections; using System.IO; diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs b/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs index 2cef5d34f17..9025f122994 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Net; using System.Net.Sockets; diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs b/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs index 9c0d82a0b27..25d0d9947d6 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Net; using System.Net.Sockets; diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs b/storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs index cecfcaeb0f3..4261efc8a29 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Drawing; using System.Collections; diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs b/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs index a7966947e1f..5258ad290fc 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs @@ -1,3 +1,18 @@ +/* Copyright (C) 2004 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + using System; using System.Drawing; using System.Collections; diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Computer.cls b/storage/ndb/src/cw/cpcc-win32/vb6/Computer.cls deleted file mode 100644 index 5b42dfeadb6..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Computer.cls +++ /dev/null @@ -1,20 +0,0 @@ -VERSION 1.0 CLASS -BEGIN - MultiUse = -1 'True - Persistable = 0 'NotPersistable - DataBindingBehavior = 0 'vbNone - DataSourceBehavior = 0 'vbNone - MTSTransactionMode = 0 'NotAnMTSObject -END -Attribute VB_Name = "Computer" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = True -Attribute VB_PredeclaredId = False -Attribute VB_Exposed = False -Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes" -Attribute VB_Ext_KEY = "Top_Level" ,"Yes" -Public m_ip As String -Public m_name As String -Public m_status As String -Public m_processes As Collection - diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Database.cls b/storage/ndb/src/cw/cpcc-win32/vb6/Database.cls deleted file mode 100644 index dfb1195d910..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Database.cls +++ /dev/null @@ -1,18 +0,0 @@ -VERSION 1.0 CLASS -BEGIN - MultiUse = -1 'True - Persistable = 0 'NotPersistable - DataBindingBehavior = 0 'vbNone - DataSourceBehavior = 0 'vbNone - MTSTransactionMode = 0 'NotAnMTSObject -END -Attribute VB_Name = "Database_" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = True -Attribute VB_PredeclaredId = False -Attribute VB_Exposed = False -Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes" -Attribute VB_Ext_KEY = "Top_Level" ,"Yes" -Public m_name As String -Public m_processes As Collection -Public m_status As String diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 110.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 110.ico Binary files differdeleted file mode 100644 index 34b85992394..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 110.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 231.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 231.ico Binary files differdeleted file mode 100644 index fe30ff5d1e6..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 231.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 237.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 237.ico Binary files differdeleted file mode 100644 index af0a1294f9e..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 237.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 241.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 241.ico Binary files differdeleted file mode 100644 index e8caf6e9a73..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 241.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 242.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 242.ico Binary files differdeleted file mode 100644 index 2deff5472bc..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 242.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 270.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 270.ico Binary files differdeleted file mode 100644 index 9cab239de23..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 270.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 271.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 271.ico Binary files differdeleted file mode 100644 index f05c95f74fe..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 271.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 273.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 273.ico Binary files differdeleted file mode 100644 index 800606eda0c..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 273.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 31.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 31.ico Binary files differdeleted file mode 100644 index a2404977771..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 31.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 337.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 337.ico Binary files differdeleted file mode 100644 index 9dadb12cfbe..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 337.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 338.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 338.ico Binary files differdeleted file mode 100644 index a13c80c81b4..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 338.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 339.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 339.ico Binary files differdeleted file mode 100644 index 5eb4c06815d..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Icon 339.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/MSSCCPRJ.SCC b/storage/ndb/src/cw/cpcc-win32/vb6/MSSCCPRJ.SCC deleted file mode 100644 index 3100640f8bd..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/MSSCCPRJ.SCC +++ /dev/null @@ -1,5 +0,0 @@ -[SCC] -SCC=This is a source code control file -[NdbCPC.vbp] -SCC_Project_Name=this project is not under source code control -SCC_Aux_Path=<This is an empty string for the mssccprj.scc file> diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Module1.bas b/storage/ndb/src/cw/cpcc-win32/vb6/Module1.bas deleted file mode 100644 index ae8ed444a41..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Module1.bas +++ /dev/null @@ -1,233 +0,0 @@ -Attribute VB_Name = "Module1" -Option Explicit -Public fMainForm As frmMain -Public g_computers As New Collection -Public g_databases As New Collection - -Sub Main() - If False Then - Dim fLogin As New frmLogin - fLogin.Show vbModal - If Not fLogin.OK Then - 'Login Failed so exit app - End - End If - Unload fLogin - - frmSplash.Show - frmSplash.Refresh - End If - - init - - Set fMainForm = New frmMain - Load fMainForm - Unload frmSplash - - fMainForm.Show -End Sub - -Private Sub init() - Dim c As Computer - Dim p As Process - - ' --- - ' One node configuration - ' - Set c = New Computer - With c - .m_ip = "130.100.232.31" - .m_name = "ndb-client31" - .m_status = "Connected" - Set .m_processes = New Collection - End With - addComputer c - - Set p = New Process - With p - .m_id = "1" - .m_name = "mgm-1" - .m_database = "elathal" - .m_status = "Running" - .m_owner = "elathal" - Set .m_computer = c - End With - addProcess c, p - - Set p = New Process - With p - .m_id = "2" - .m_name = "ndb-2" - .m_database = "elathal" - .m_status = "Running" - .m_owner = "elathal" - Set .m_computer = c - End With - addProcess c, p - - Set p = New Process - With p - .m_id = "3" - .m_name = "api-3" - .m_database = "elathal" - .m_status = "Running" - .m_owner = "elathal" - Set .m_computer = c - End With - addProcess c, p - - ' --- - ' Two node configuration - ' - Set p = New Process - With p - .m_id = "4" - .m_name = "mgm-1" - .m_database = "ejonore-2-node" - .m_status = "Running" - .m_owner = "ejonore" - Set .m_computer = c - End With - addProcess c, p - - Set c = New Computer - With c - .m_ip = "10.0.1.1" - .m_name = "cluster-1" - .m_status = "Connected" - Set .m_processes = New Collection - End With - addComputer c - - Set p = New Process - With p - .m_id = "1" - .m_name = "ndb-2" - .m_database = "ejonore-2-node" - .m_status = "Running" - .m_owner = "ejonore" - Set .m_computer = c - End With - addProcess c, p - - Set c = New Computer - With c - .m_ip = "10.0.2.1" - .m_name = "cluster-2" - .m_status = "Connected" - Set .m_processes = New Collection - End With - addComputer c - - Set p = New Process - With p - .m_id = "1" - .m_name = "ndb-3" - .m_database = "ejonore-2-node" - .m_status = "Running" - .m_owner = "ejonore" - Set .m_computer = c - End With - addProcess c, p - - Set c = New Computer - With c - .m_ip = "10.0.3.1" - .m_name = "cluster-3" - .m_status = "Connected" - Set .m_processes = New Collection - End With - addComputer c - - Set p = New Process - With p - .m_id = "1" - .m_name = "api-4" - .m_database = "ejonore-2-node" - .m_status = "Running" - .m_owner = "ejonore" - Set .m_computer = c - End With - addProcess c, p - - Set c = New Computer - With c - .m_ip = "10.0.4.1" - .m_name = "cluster-4" - .m_status = "Connected" - Set .m_processes = New Collection - End With - addComputer c - - Set p = New Process - With p - .m_id = "1" - .m_name = "api-5" - .m_database = "ejonore-2-node" - .m_status = "Running" - .m_owner = "ejonore" - Set .m_computer = c - End With - addProcess c, p - - Set c = New Computer - With c - .m_ip = "130.100.232.5" - .m_name = "ndbs05" - .m_status = "Not connected" - Set .m_processes = New Collection - End With - addComputer c - - Set c = New Computer - With c - .m_ip = "130.100.232.7" - .m_name = "ndb-srv7" - .m_status = "No contact" - Set .m_processes = New Collection - End With - addComputer c - -End Sub - -Public Sub addComputer(ByRef c As Computer) - g_computers.Add c, "_" & c.m_name -End Sub - -Private Sub addProcess(ByRef c As Computer, ByRef p As Process) - c.m_processes.Add p, "_" & p.m_id - - Dim cl As Database_ - If Not Exists(g_databases, "_" & p.m_database) Then - Set cl = New Database_ - With cl - .m_name = p.m_database - .m_status = "Unknown" - Set .m_processes = New Collection - End With - g_databases.Add cl, "_" & p.m_database - Else - Set cl = g_databases("_" & p.m_database) - End If - cl.m_processes.Add p, "_" & p.m_computer.m_name & "_" & p.m_id -End Sub - -Public Function Exists(ByRef c As Collection, ByVal k As String) As Boolean - Dim r As Boolean - Dim o As Object - - r = True - - On Error GoTo NotFound - Set o = c.Item(k) - GoTo Continue -NotFound: - If Err.Number <> 5 Then - Err.Raise Err.Number, Err.Source, Err.Description - End If - - r = False -Continue: - Exists = r -End Function - diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbp b/storage/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbp deleted file mode 100644 index dc8f3780a74..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbp +++ /dev/null @@ -1,49 +0,0 @@ -Type=Exe -Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; mscomctl.ocx -Module=Module1; Module1.bas -Form=frmMain.frm -Form=frmSplash.frm -Form=frmLogin.frm -Form=frmOptions.frm -Form=frmAbout.frm -Class=Computer; Computer.cls -Class=Process; Process.cls -Class=Database_; Database.cls -Form=frmNewComputer.frm -Form=frmNewDatabase3.frm -Form=frmNewDatabase1.frm -Form=frmNewDatabase2.frm -IconForm="frmAbout" -Startup="Sub Main" -HelpFile="" -Title="NdbCPC" -ExeName32="NdbCPC.exe" -Command32="" -Name="NdbCPC" -HelpContextID="0" -CompatibleMode="0" -MajorVer=1 -MinorVer=0 -RevisionVer=0 -AutoIncrementVer=0 -ServerSupportFiles=0 -VersionCompanyName="ctp" -CompilationType=0 -OptimizationType=0 -FavorPentiumPro(tm)=0 -CodeViewDebugInfo=0 -NoAliasing=0 -BoundsCheck=0 -OverflowCheck=0 -FlPointCheck=0 -FDIVCheck=0 -UnroundedFP=0 -StartMode=0 -Unattended=0 -Retained=0 -ThreadPerObject=0 -MaxNumberOfThreads=1 -DebugStartupOption=0 - -[MS Transaction Server] -AutoRefresh=1 diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbw b/storage/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbw deleted file mode 100644 index 825abbc923a..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbw +++ /dev/null @@ -1,13 +0,0 @@ -Module1 = 44, 44, 577, 492, -frmMain = 44, 44, 577, 492, , 66, 66, 599, 514, C -frmSplash = 132, 132, 670, 576, C, 88, 88, 621, 536, C -frmLogin = 0, 0, 538, 444, C, 110, 110, 643, 558, C -frmOptions = 176, 176, 714, 620, C, 132, 132, 665, 580, C -frmAbout = 132, 132, 759, 511, C, 154, 154, 687, 602, C -Computer = 110, 110, 648, 554, -Process = 132, 132, 670, 576, C -Database_ = 88, 88, 626, 532, C -frmNewComputer = 44, 44, 582, 488, , 22, 22, 390, 218, C -frmNewDatabase3 = 0, 0, 506, 444, , 0, 0, 506, 444, C -frmNewDatabase1 = 132, 132, 638, 550, , 154, 154, 660, 572, C -frmNewDatabase2 = 198, 198, 704, 616, , 176, 176, 682, 594, C diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/Process.cls b/storage/ndb/src/cw/cpcc-win32/vb6/Process.cls deleted file mode 100644 index fcb4c2cbb2c..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/Process.cls +++ /dev/null @@ -1,22 +0,0 @@ -VERSION 1.0 CLASS -BEGIN - MultiUse = -1 'True - Persistable = 0 'NotPersistable - DataBindingBehavior = 0 'vbNone - DataSourceBehavior = 0 'vbNone - MTSTransactionMode = 0 'NotAnMTSObject -END -Attribute VB_Name = "Process" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = True -Attribute VB_PredeclaredId = False -Attribute VB_Exposed = False -Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes" -Attribute VB_Ext_KEY = "Top_Level" ,"Yes" -Public m_computer As Computer -Public m_id As String -Public m_name As String -Public m_database As String -Public m_status As String -Public m_owner As String - diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/closed folder.ico b/storage/ndb/src/cw/cpcc-win32/vb6/closed folder.ico Binary files differdeleted file mode 100644 index fe82350d376..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/closed folder.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/computer.ico b/storage/ndb/src/cw/cpcc-win32/vb6/computer.ico Binary files differdeleted file mode 100644 index d73302d1cd5..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/computer.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/frmAbout.frm b/storage/ndb/src/cw/cpcc-win32/vb6/frmAbout.frm deleted file mode 100644 index b842d20de21..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/frmAbout.frm +++ /dev/null @@ -1,245 +0,0 @@ -VERSION 5.00 -Begin VB.Form frmAbout - BorderStyle = 3 'Fixed Dialog - Caption = "About NdbCPC" - ClientHeight = 3630 - ClientLeft = 45 - ClientTop = 330 - ClientWidth = 5865 - ClipControls = 0 'False - LinkTopic = "Form1" - MaxButton = 0 'False - MinButton = 0 'False - ScaleHeight = 3630 - ScaleWidth = 5865 - ShowInTaskbar = 0 'False - StartUpPosition = 1 'CenterOwner - Tag = "About NdbCPC" - Begin VB.PictureBox picIcon - AutoSize = -1 'True - BackColor = &H00C0C0C0& - ClipControls = 0 'False - Height = 540 - Left = 240 - Picture = "frmAbout.frx":0000 - ScaleHeight = 480 - ScaleMode = 0 'User - ScaleWidth = 480 - TabIndex = 2 - TabStop = 0 'False - Top = 240 - Width = 540 - End - Begin VB.CommandButton cmdOK - Cancel = -1 'True - Caption = "OK" - Default = -1 'True - Height = 345 - Left = 4245 - TabIndex = 0 - Tag = "OK" - Top = 2625 - Width = 1467 - End - Begin VB.CommandButton cmdSysInfo - Caption = "&System Info..." - Height = 345 - Left = 4260 - TabIndex = 1 - Tag = "&System Info..." - Top = 3075 - Width = 1452 - End - Begin VB.Label lblDescription - Caption = "App Description" - ForeColor = &H00000000& - Height = 1170 - Left = 1050 - TabIndex = 6 - Tag = "App Description" - Top = 1125 - Width = 4092 - End - Begin VB.Label lblTitle - Caption = "Application Title" - ForeColor = &H00000000& - Height = 480 - Left = 1050 - TabIndex = 5 - Tag = "Application Title" - Top = 240 - Width = 4092 - End - Begin VB.Line Line1 - BorderColor = &H00808080& - BorderStyle = 6 'Inside Solid - Index = 1 - X1 = 225 - X2 = 5657 - Y1 = 2430 - Y2 = 2430 - End - Begin VB.Line Line1 - BorderColor = &H00FFFFFF& - BorderWidth = 2 - Index = 0 - X1 = 240 - X2 = 5657 - Y1 = 2445 - Y2 = 2445 - End - Begin VB.Label lblVersion - Caption = "Version" - Height = 225 - Left = 1050 - TabIndex = 4 - Tag = "Version" - Top = 780 - Width = 4092 - End - Begin VB.Label lblDisclaimer - Caption = "Warning: ..." - ForeColor = &H00000000& - Height = 825 - Left = 255 - TabIndex = 3 - Tag = "Warning: ..." - Top = 2625 - Width = 3870 - End -End -Attribute VB_Name = "frmAbout" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -' Reg Key Security Options... -Const KEY_ALL_ACCESS = &H2003F - - -' Reg Key ROOT Types... -Const HKEY_LOCAL_MACHINE = &H80000002 -Const ERROR_SUCCESS = 0 -Const REG_SZ = 1 ' Unicode nul terminated string -Const REG_DWORD = 4 ' 32-bit number - - -Const gREGKEYSYSINFOLOC = "SOFTWARE\Microsoft\Shared Tools Location" -Const gREGVALSYSINFOLOC = "MSINFO" -Const gREGKEYSYSINFO = "SOFTWARE\Microsoft\Shared Tools\MSINFO" -Const gREGVALSYSINFO = "PATH" - - -Private Declare Function RegOpenKeyEx Lib "advapi32" Alias "RegOpenKeyExA" (ByVal hKey As Long, ByVal lpSubKey As String, ByVal ulOptions As Long, ByVal samDesired As Long, ByRef phkResult As Long) As Long -Private Declare Function RegQueryValueEx Lib "advapi32" Alias "RegQueryValueExA" (ByVal hKey As Long, ByVal lpValueName As String, ByVal lpReserved As Long, ByRef lpType As Long, ByVal lpData As String, ByRef lpcbData As Long) As Long -Private Declare Function RegCloseKey Lib "advapi32" (ByVal hKey As Long) As Long - -Private Sub Form_Load() - lblVersion.Caption = "Version " & App.Major & "." & App.Minor & "." & App.Revision - lblTitle.Caption = App.Title -End Sub - - - -Private Sub cmdSysInfo_Click() - Call StartSysInfo -End Sub - - -Private Sub cmdOK_Click() - Unload Me -End Sub - - -Public Sub StartSysInfo() - On Error GoTo SysInfoErr - - - Dim rc As Long - Dim SysInfoPath As String - - - ' Try To Get System Info Program Path\Name From Registry... - If GetKeyValue(HKEY_LOCAL_MACHINE, gREGKEYSYSINFO, gREGVALSYSINFO, SysInfoPath) Then - ' Try To Get System Info Program Path Only From Registry... - ElseIf GetKeyValue(HKEY_LOCAL_MACHINE, gREGKEYSYSINFOLOC, gREGVALSYSINFOLOC, SysInfoPath) Then - ' Validate Existance Of Known 32 Bit File Version - If (Dir(SysInfoPath & "\MSINFO32.EXE") <> "") Then - SysInfoPath = SysInfoPath & "\MSINFO32.EXE" - - - ' Error - File Can Not Be Found... - Else - GoTo SysInfoErr - End If - ' Error - Registry Entry Can Not Be Found... - Else - GoTo SysInfoErr - End If - - - Call Shell(SysInfoPath, vbNormalFocus) - - - Exit Sub -SysInfoErr: - MsgBox "System Information Is Unavailable At This Time", vbOKOnly -End Sub - - -Public Function GetKeyValue(KeyRoot As Long, KeyName As String, SubKeyRef As String, ByRef KeyVal As String) As Boolean - Dim i As Long ' Loop Counter - Dim rc As Long ' Return Code - Dim hKey As Long ' Handle To An Open Registry Key - Dim hDepth As Long ' - Dim KeyValType As Long ' Data Type Of A Registry Key - Dim tmpVal As String ' Tempory Storage For A Registry Key Value - Dim KeyValSize As Long ' Size Of Registry Key Variable - '------------------------------------------------------------ - ' Open RegKey Under KeyRoot {HKEY_LOCAL_MACHINE...} - '------------------------------------------------------------ - rc = RegOpenKeyEx(KeyRoot, KeyName, 0, KEY_ALL_ACCESS, hKey) ' Open Registry Key - - - If (rc <> ERROR_SUCCESS) Then GoTo GetKeyError ' Handle Error... - - - tmpVal = String$(1024, 0) ' Allocate Variable Space - KeyValSize = 1024 ' Mark Variable Size - - - '------------------------------------------------------------ - ' Retrieve Registry Key Value... - '------------------------------------------------------------ - rc = RegQueryValueEx(hKey, SubKeyRef, 0, KeyValType, tmpVal, KeyValSize) ' Get/Create Key Value - - - If (rc <> ERROR_SUCCESS) Then GoTo GetKeyError ' Handle Errors - - - tmpVal = VBA.Left(tmpVal, InStr(tmpVal, VBA.Chr(0)) - 1) - '------------------------------------------------------------ - ' Determine Key Value Type For Conversion... - '------------------------------------------------------------ - Select Case KeyValType ' Search Data Types... - Case REG_SZ ' String Registry Key Data Type - KeyVal = tmpVal ' Copy String Value - Case REG_DWORD ' Double Word Registry Key Data Type - For i = Len(tmpVal) To 1 Step -1 ' Convert Each Bit - KeyVal = KeyVal + Hex(Asc(Mid(tmpVal, i, 1))) ' Build Value Char. By Char. - Next - KeyVal = Format$("&h" + KeyVal) ' Convert Double Word To String - End Select - - - GetKeyValue = True ' Return Success - rc = RegCloseKey(hKey) ' Close Registry Key - Exit Function ' Exit - - -GetKeyError: ' Cleanup After An Error Has Occured... - KeyVal = "" ' Set Return Val To Empty String - GetKeyValue = False ' Return Failure - rc = RegCloseKey(hKey) ' Close Registry Key -End Function - diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/frmLogin.frm b/storage/ndb/src/cw/cpcc-win32/vb6/frmLogin.frm deleted file mode 100644 index d4d663c93c2..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/frmLogin.frm +++ /dev/null @@ -1,119 +0,0 @@ -VERSION 5.00 -Begin VB.Form frmLogin - BorderStyle = 3 'Fixed Dialog - Caption = "Login" - ClientHeight = 1590 - ClientLeft = 45 - ClientTop = 330 - ClientWidth = 3750 - LinkTopic = "Form1" - MaxButton = 0 'False - MinButton = 0 'False - ScaleHeight = 1590 - ScaleWidth = 3750 - ShowInTaskbar = 0 'False - StartUpPosition = 2 'CenterScreen - Tag = "Login" - Begin VB.CommandButton cmdCancel - Cancel = -1 'True - Caption = "Cancel" - Height = 360 - Left = 2100 - TabIndex = 5 - Tag = "Cancel" - Top = 1020 - Width = 1140 - End - Begin VB.CommandButton cmdOK - Caption = "OK" - Default = -1 'True - Height = 360 - Left = 495 - TabIndex = 4 - Tag = "OK" - Top = 1020 - Width = 1140 - End - Begin VB.TextBox txtPassword - Height = 285 - IMEMode = 3 'DISABLE - Left = 1305 - PasswordChar = "*" - TabIndex = 1 - Top = 525 - Width = 2325 - End - Begin VB.TextBox txtUserName - Height = 285 - Left = 1305 - TabIndex = 3 - Top = 135 - Width = 2325 - End - Begin VB.Label lblLabels - Caption = "&Password:" - Height = 248 - Index = 1 - Left = 105 - TabIndex = 0 - Tag = "&Password:" - Top = 540 - Width = 1080 - End - Begin VB.Label lblLabels - Caption = "&User Name:" - Height = 248 - Index = 0 - Left = 105 - TabIndex = 2 - Tag = "&User Name:" - Top = 150 - Width = 1080 - End -End -Attribute VB_Name = "frmLogin" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Private Declare Function GetUserName Lib "advapi32.dll" Alias "GetUserNameA" (ByVal lpbuffer As String, nSize As Long) As Long - - -Public OK As Boolean -Private Sub Form_Load() - Dim sBuffer As String - Dim lSize As Long - - - sBuffer = Space$(255) - lSize = Len(sBuffer) - Call GetUserName(sBuffer, lSize) - If lSize > 0 Then - txtUserName.Text = Left$(sBuffer, lSize) - Else - txtUserName.Text = vbNullString - End If -End Sub - - - -Private Sub cmdCancel_Click() - OK = False - Me.Hide -End Sub - - -Private Sub cmdOK_Click() - 'ToDo: create test for correct password - 'check for correct password - If txtPassword.Text = "" Then - OK = True - Me.Hide - Else - MsgBox "Invalid Password, try again!", , "Login" - txtPassword.SetFocus - txtPassword.SelStart = 0 - txtPassword.SelLength = Len(txtPassword.Text) - End If -End Sub - diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/frmMain.frm b/storage/ndb/src/cw/cpcc-win32/vb6/frmMain.frm deleted file mode 100644 index a4bf5b58941..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/frmMain.frm +++ /dev/null @@ -1,1207 +0,0 @@ -VERSION 5.00 -Object = "{831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0"; "mscomctl.ocx" -Begin VB.Form frmMain - Caption = "NdbCPC" - ClientHeight = 5955 - ClientLeft = 2115 - ClientTop = 2250 - ClientWidth = 8880 - LinkTopic = "Form1" - ScaleHeight = 5955 - ScaleWidth = 8880 - Begin MSComctlLib.ImageList ImageList1 - Left = 6840 - Top = 3120 - _ExtentX = 1005 - _ExtentY = 1005 - BackColor = 16777215 - ImageWidth = 16 - ImageHeight = 16 - MaskColor = 12632256 - _Version = 393216 - BeginProperty Images {2C247F25-8591-11D1-B16A-00C0F0283628} - NumListImages = 11 - BeginProperty ListImage1 {2C247F27-8591-11D1-B16A-00C0F0283628} - Picture = "frmMain.frx":0000 - Key = "close" - EndProperty - BeginProperty ListImage2 {2C247F27-8591-11D1-B16A-00C0F0283628} - Picture = "frmMain.frx":27B4 - Key = "open" - EndProperty - BeginProperty ListImage3 {2C247F27-8591-11D1-B16A-00C0F0283628} - Picture = "frmMain.frx":4F68 - Key = "computer_unknown" - EndProperty - BeginProperty ListImage4 {2C247F27-8591-11D1-B16A-00C0F0283628} - Picture = "frmMain.frx":5284 - Key = "computer_stopped" - EndProperty - BeginProperty ListImage5 {2C247F27-8591-11D1-B16A-00C0F0283628} - Picture = "frmMain.frx":55A0 - Key = "computer_started" - EndProperty - BeginProperty ListImage6 {2C247F27-8591-11D1-B16A-00C0F0283628} - Picture = "frmMain.frx":58BC - Key = "" - EndProperty - BeginProperty ListImage7 {2C247F27-8591-11D1-B16A-00C0F0283628} - Picture = "frmMain.frx":5BD8 - Key = "" - EndProperty - BeginProperty ListImage8 {2C247F27-8591-11D1-B16A-00C0F0283628} - Picture = "frmMain.frx":5EF4 - Key = "" - EndProperty - BeginProperty ListImage9 {2C247F27-8591-11D1-B16A-00C0F0283628} - Picture = "frmMain.frx":6210 - Key = "db" - EndProperty - BeginProperty ListImage10 {2C247F27-8591-11D1-B16A-00C0F0283628} - Picture = "frmMain.frx":652A - Key = "computer" - EndProperty - BeginProperty ListImage11 {2C247F27-8591-11D1-B16A-00C0F0283628} - Picture = "frmMain.frx":6844 - Key = "properties" - EndProperty - EndProperty - End - Begin VB.PictureBox picSplitter - BackColor = &H00808080& - BorderStyle = 0 'None - FillColor = &H00808080& - Height = 4800 - Left = 5400 - ScaleHeight = 2090.126 - ScaleMode = 0 'User - ScaleWidth = 780 - TabIndex = 6 - Top = 705 - Width = 72 - Visible = 0 'False - End - Begin MSComctlLib.TreeView tvTreeView - Height = 4800 - Left = 0 - TabIndex = 5 - Top = 705 - Width = 2016 - _ExtentX = 3545 - _ExtentY = 8467 - _Version = 393217 - HideSelection = 0 'False - Indentation = 0 - LineStyle = 1 - Sorted = -1 'True - Style = 7 - FullRowSelect = -1 'True - ImageList = "ImageList1" - Appearance = 1 - End - Begin VB.PictureBox picTitles - Align = 1 'Align Top - Appearance = 0 'Flat - BorderStyle = 0 'None - ForeColor = &H80000008& - Height = 300 - Left = 0 - ScaleHeight = 300 - ScaleWidth = 8880 - TabIndex = 2 - TabStop = 0 'False - Top = 420 - Width = 8880 - Begin VB.Label lblTitle - BorderStyle = 1 'Fixed Single - Caption = " ListView:" - Height = 270 - Index = 1 - Left = 2078 - TabIndex = 4 - Tag = " ListView:" - Top = 12 - Width = 3216 - End - Begin VB.Label lblTitle - BorderStyle = 1 'Fixed Single - Caption = " TreeView:" - Height = 270 - Index = 0 - Left = 0 - TabIndex = 3 - Tag = " TreeView:" - Top = 12 - Width = 2016 - End - End - Begin MSComctlLib.Toolbar tbToolBar - Align = 1 'Align Top - Height = 420 - Left = 0 - TabIndex = 1 - Top = 0 - Width = 8880 - _ExtentX = 15663 - _ExtentY = 741 - ButtonWidth = 609 - ButtonHeight = 582 - Appearance = 1 - ImageList = "ImageList1" - _Version = 393216 - BeginProperty Buttons {66833FE8-8583-11D1-B16A-00C0F0283628} - NumButtons = 5 - BeginProperty Button1 {66833FEA-8583-11D1-B16A-00C0F0283628} - Style = 3 - EndProperty - BeginProperty Button2 {66833FEA-8583-11D1-B16A-00C0F0283628} - Key = "Add computer" - Object.ToolTipText = "Add computer" - ImageKey = "computer" - EndProperty - BeginProperty Button3 {66833FEA-8583-11D1-B16A-00C0F0283628} - Key = "New database" - Object.ToolTipText = "New database" - ImageKey = "db" - EndProperty - BeginProperty Button4 {66833FEA-8583-11D1-B16A-00C0F0283628} - Style = 3 - EndProperty - BeginProperty Button5 {66833FEA-8583-11D1-B16A-00C0F0283628} - Key = "Properties" - Object.ToolTipText = "Properties" - ImageKey = "properties" - EndProperty - EndProperty - End - Begin MSComctlLib.StatusBar sbStatusBar - Align = 2 'Align Bottom - Height = 270 - Left = 0 - TabIndex = 0 - Top = 5685 - Width = 8880 - _ExtentX = 15663 - _ExtentY = 476 - _Version = 393216 - BeginProperty Panels {8E3867A5-8586-11D1-B16A-00C0F0283628} - NumPanels = 3 - BeginProperty Panel1 {8E3867AB-8586-11D1-B16A-00C0F0283628} - AutoSize = 1 - Object.Width = 10028 - Text = "Status" - TextSave = "Status" - EndProperty - BeginProperty Panel2 {8E3867AB-8586-11D1-B16A-00C0F0283628} - Style = 6 - AutoSize = 2 - TextSave = "2002-10-15" - EndProperty - BeginProperty Panel3 {8E3867AB-8586-11D1-B16A-00C0F0283628} - Style = 5 - AutoSize = 2 - TextSave = "09:44" - EndProperty - EndProperty - End - Begin MSComctlLib.ListView lvProcesses - Height = 4815 - Left = 2040 - TabIndex = 8 - Top = 720 - Width = 3255 - _ExtentX = 5741 - _ExtentY = 8493 - Sorted = -1 'True - MultiSelect = -1 'True - LabelWrap = -1 'True - HideSelection = 0 'False - AllowReorder = -1 'True - FullRowSelect = -1 'True - _Version = 393217 - ForeColor = -2147483640 - BackColor = -2147483643 - BorderStyle = 1 - Appearance = 1 - NumItems = 6 - BeginProperty ColumnHeader(1) {BDD1F052-858B-11D1-B16A-00C0F0283628} - Key = "Id" - Text = "Id" - Object.Width = 2540 - EndProperty - BeginProperty ColumnHeader(2) {BDD1F052-858B-11D1-B16A-00C0F0283628} - SubItemIndex = 1 - Key = "Computer" - Text = "Computer" - Object.Width = 2540 - EndProperty - BeginProperty ColumnHeader(3) {BDD1F052-858B-11D1-B16A-00C0F0283628} - SubItemIndex = 2 - Key = "Database" - Text = "Database" - Object.Width = 2540 - EndProperty - BeginProperty ColumnHeader(4) {BDD1F052-858B-11D1-B16A-00C0F0283628} - SubItemIndex = 3 - Key = "Name" - Text = "Name" - Object.Width = 2540 - EndProperty - BeginProperty ColumnHeader(5) {BDD1F052-858B-11D1-B16A-00C0F0283628} - SubItemIndex = 4 - Key = "Status" - Text = "Status" - Object.Width = 2540 - EndProperty - BeginProperty ColumnHeader(6) {BDD1F052-858B-11D1-B16A-00C0F0283628} - SubItemIndex = 5 - Key = "Owner" - Text = "Owner" - Object.Width = 2540 - EndProperty - End - Begin MSComctlLib.ListView lvComputers - Height = 4815 - Left = 2040 - TabIndex = 7 - Top = 720 - Width = 3255 - _ExtentX = 5741 - _ExtentY = 8493 - Sorted = -1 'True - MultiSelect = -1 'True - LabelWrap = -1 'True - HideSelection = -1 'True - AllowReorder = -1 'True - FullRowSelect = -1 'True - _Version = 393217 - Icons = "ImageList1" - SmallIcons = "ImageList1" - ForeColor = -2147483640 - BackColor = -2147483643 - BorderStyle = 1 - Appearance = 1 - NumItems = 2 - BeginProperty ColumnHeader(1) {BDD1F052-858B-11D1-B16A-00C0F0283628} - Text = "Computer" - Object.Width = 2540 - EndProperty - BeginProperty ColumnHeader(2) {BDD1F052-858B-11D1-B16A-00C0F0283628} - SubItemIndex = 1 - Text = "Status" - Object.Width = 2540 - EndProperty - End - Begin MSComctlLib.ListView lvDatabases - Height = 4815 - Left = 2040 - TabIndex = 9 - Top = 720 - Width = 3255 - _ExtentX = 5741 - _ExtentY = 8493 - View = 3 - Sorted = -1 'True - MultiSelect = -1 'True - LabelWrap = -1 'True - HideSelection = -1 'True - AllowReorder = -1 'True - FullRowSelect = -1 'True - _Version = 393217 - Icons = "ImageList1" - SmallIcons = "ImageList1" - ForeColor = -2147483640 - BackColor = -2147483643 - BorderStyle = 1 - Appearance = 1 - NumItems = 2 - BeginProperty ColumnHeader(1) {BDD1F052-858B-11D1-B16A-00C0F0283628} - Key = "Database" - Text = "Database" - Object.Width = 2540 - EndProperty - BeginProperty ColumnHeader(2) {BDD1F052-858B-11D1-B16A-00C0F0283628} - SubItemIndex = 1 - Key = "Status" - Text = "Status" - Object.Width = 2540 - EndProperty - End - Begin VB.Image imgSplitter - Height = 4788 - Left = 1965 - MousePointer = 9 'Size W E - Top = 705 - Width = 150 - End - Begin VB.Menu mnuFile - Caption = "&File" - Begin VB.Menu mnuFileOpen - Caption = "&Open..." - End - Begin VB.Menu mnuFileFind - Caption = "&Find" - End - Begin VB.Menu mnuFileBar0 - Caption = "-" - End - Begin VB.Menu mnuFileSendTo - Caption = "Sen&d to" - End - Begin VB.Menu mnuFileBar1 - Caption = "-" - End - Begin VB.Menu mnuFileNew - Caption = "&New" - Shortcut = ^N - End - Begin VB.Menu mnuFileBar2 - Caption = "-" - End - Begin VB.Menu mnuFileDelete - Caption = "&Delete" - End - Begin VB.Menu mnuFileRename - Caption = "Rena&me" - End - Begin VB.Menu mnuFileProperties - Caption = "Propert&ies" - End - Begin VB.Menu mnuFileBar3 - Caption = "-" - End - Begin VB.Menu mnuFileMRU - Caption = "" - Index = 1 - Visible = 0 'False - End - Begin VB.Menu mnuFileMRU - Caption = "" - Index = 2 - Visible = 0 'False - End - Begin VB.Menu mnuFileMRU - Caption = "" - Index = 3 - Visible = 0 'False - End - Begin VB.Menu mnuFileBar4 - Caption = "-" - Visible = 0 'False - End - Begin VB.Menu mnuFileBar5 - Caption = "-" - End - Begin VB.Menu mnuFileClose - Caption = "&Close" - End - End - Begin VB.Menu mnuEdit - Caption = "&Edit" - Begin VB.Menu mnuEditUndo - Caption = "&Undo" - End - Begin VB.Menu mnuEditBar0 - Caption = "-" - End - Begin VB.Menu mnuEditCut - Caption = "Cu&t" - Shortcut = ^X - End - Begin VB.Menu mnuEditCopy - Caption = "&Copy" - Shortcut = ^C - End - Begin VB.Menu mnuEditPaste - Caption = "&Paste" - Shortcut = ^V - End - Begin VB.Menu mnuEditPasteSpecial - Caption = "Paste &Special..." - End - Begin VB.Menu mnuEditBar1 - Caption = "-" - End - Begin VB.Menu mnuEditSelectAll - Caption = "Select &All" - Shortcut = ^A - End - Begin VB.Menu mnuEditInvertSelection - Caption = "&Invert Selection" - End - End - Begin VB.Menu mnuView - Caption = "&View" - Begin VB.Menu mnuViewToolbar - Caption = "&Toolbar" - Checked = -1 'True - End - Begin VB.Menu mnuViewStatusBar - Caption = "Status &Bar" - Checked = -1 'True - End - Begin VB.Menu mnuViewBar0 - Caption = "-" - End - Begin VB.Menu mnuListViewMode - Caption = "Lar&ge Icons" - Index = 0 - End - Begin VB.Menu mnuListViewMode - Caption = "S&mall Icons" - Index = 1 - End - Begin VB.Menu mnuListViewMode - Caption = "&List" - Index = 2 - End - Begin VB.Menu mnuListViewMode - Caption = "&Details" - Index = 3 - End - Begin VB.Menu mnuViewBar1 - Caption = "-" - End - Begin VB.Menu mnuViewArrangeIcons - Caption = "Arrange &Icons" - End - Begin VB.Menu mnuViewBar2 - Caption = "-" - End - Begin VB.Menu mnuViewRefresh - Caption = "&Refresh" - End - Begin VB.Menu mnuViewOptions - Caption = "&Options..." - End - Begin VB.Menu mnuViewWebBrowser - Caption = "&Web Browser" - End - End - Begin VB.Menu mnuHelp - Caption = "&Help" - Begin VB.Menu mnuHelpContents - Caption = "&Contents" - End - Begin VB.Menu mnuHelpSearchForHelpOn - Caption = "&Search For Help On..." - End - Begin VB.Menu mnuHelpBar0 - Caption = "-" - End - Begin VB.Menu mnuHelpAbout - Caption = "&About " - End - End - Begin VB.Menu mnuPopComputers - Caption = "" - Visible = 0 'False - Begin VB.Menu mnuPopAddComputer - Caption = "Add computer" - End - Begin VB.Menu mnuPop__ - Caption = "-" - End - Begin VB.Menu mnuPopSortComputers - Caption = "Sorted" - End - End - Begin VB.Menu mnuPopDatabases - Caption = "" - Visible = 0 'False - Begin VB.Menu mnuPopNewDatabase - Caption = "New database" - End - Begin VB.Menu mnuPopSortDatabases0 - Caption = "-" - End - Begin VB.Menu mnuPopSortDatabases - Caption = "Sorted" - End - End - Begin VB.Menu mnuPopComputer - Caption = "" - Visible = 0 'False - Begin VB.Menu mnuPopComputerName - Caption = "ComputerName" - Enabled = 0 'False - End - Begin VB.Menu mnuPopComputer0 - Caption = "-" - End - Begin VB.Menu mnuPopConnectComputer - Caption = "Connect" - End - Begin VB.Menu mnuPopDisconnectComputer - Caption = "Disconnect" - End - Begin VB.Menu mnuPopRemoveComputer - Caption = "Remove" - End - Begin VB.Menu mnuComputer1 - Caption = "-" - End - Begin VB.Menu mnuPopComputerProperties - Caption = "Properties" - End - End -End -Attribute VB_Name = "frmMain" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Option Explicit -Private Declare Function OSWinHelp% Lib "user32" Alias "WinHelpA" (ByVal hwnd&, ByVal HelpFile$, ByVal wCommand%, dwData As Any) - -Dim mbMoving As Boolean -Const sglSplitLimit = 500 -Dim m_currentNode As MSComctlLib.Node -Dim m_currentList As ListView - -Dim m_currentView As Integer -Dim m_computerWidth As Integer -Dim m_databaseWidth As Integer - -Dim m_currentComputer As Computer -Dim m_currentDatabase As Database_ - -Private Sub Form_Load() - tvTreeView.Nodes.Clear - lvComputers.ListItems.Clear - lvProcesses.ListItems.Clear - lvDatabases.ListItems.Clear - - Me.Left = GetSetting(App.Title, "Settings", "MainLeft", 1000) - Me.Top = GetSetting(App.Title, "Settings", "MainTop", 1000) - Me.Width = GetSetting(App.Title, "Settings", "MainWidth", 6500) - Me.Height = GetSetting(App.Title, "Settings", "MainHeight", 6500) - - tvTreeView.Nodes.Add , tvwChild, "Computers", "Computers", 1, 2 - Dim c As Computer - For Each c In g_computers - addComputer c - Next - - Set m_currentNode = tvTreeView.Nodes("Computers") - Set m_currentList = lvComputers - - tvTreeView.Nodes.Add , tvwChild, "Databases", "Databases", 1, 2 - Dim d As Database_ - For Each d In g_databases - AddDatabase d - Next - - lvComputers.Visible = True - lvProcesses.Visible = False - lvDatabases.Visible = False - lvComputers.View = lvwReport - lvProcesses.View = lvwReport - lvDatabases.View = lvwReport - m_computerWidth = lvProcesses.ColumnHeaders("Computer").Width - m_databaseWidth = lvProcesses.ColumnHeaders("Database").Width - lvProcesses.ColumnHeaders("Id").Width = 0 -End Sub - -Private Sub setComputer(ByVal f_ip As String) - Dim c As Computer - Set c = g_computers(f_ip) - If c Is Nothing Then - MsgBox "Unknown computer: " & f_ip - Exit Sub - End If - - Set m_currentComputer = c - - lblTitle(1).Caption = "Processes defined on computer: " & c.m_name - setProcesses c.m_processes - - If lvProcesses.ColumnHeaders("Computer").Width <> 0 Then - m_computerWidth = lvProcesses.ColumnHeaders("Computer").Width - lvProcesses.ColumnHeaders("Computer").Width = 0 - End If - - If lvProcesses.ColumnHeaders("Database").Width = 0 Then - lvProcesses.ColumnHeaders("Database").Width = m_databaseWidth - End If -End Sub - -Private Sub setDatabase(ByVal f_name As String) - Dim c As Database_ - Set c = g_databases(f_name) - If c Is Nothing Then - MsgBox "Unknown database: " & f_name - Exit Sub - End If - - Set m_currentDatabase = c - - lblTitle(1).Caption = "Processes defined for database: " & c.m_name - setProcesses c.m_processes - - If lvProcesses.ColumnHeaders("Database").Width <> 0 Then - m_databaseWidth = lvProcesses.ColumnHeaders("Database").Width - lvProcesses.ColumnHeaders("Database").Width = 0 - End If - - If lvProcesses.ColumnHeaders("Computer").Width = 0 Then - lvProcesses.ColumnHeaders("Computer").Width = m_computerWidth - End If - -End Sub - -Private Sub setProcesses(ByRef c As Collection) - lvProcesses.ListItems.Clear - Dim p As Process - For Each p In c - Dim li As ListItem - Set li = lvProcesses.ListItems.Add(, "_" & p.m_computer.m_name & "_" & p.m_id, p.m_id) - li.SubItems(1) = p.m_computer.m_name - li.SubItems(2) = p.m_database - li.SubItems(3) = p.m_name - li.SubItems(4) = p.m_status - li.SubItems(5) = p.m_owner - Next -End Sub - -Public Sub addComputer(ByRef c As Computer) - Dim icon As Integer - Select Case c.m_status - Case "No contact" - icon = 4 - Case "Connected" - icon = 5 - Case Else - icon = 3 - End Select - - Dim li As ListItem - Set li = lvComputers.ListItems.Add(, "_" & c.m_name, c.m_name, icon, icon) - li.SubItems(1) = c.m_status - - tvTreeView.Nodes.Add "Computers", tvwChild, "_" & c.m_name, c.m_name, icon, icon -End Sub - -Public Sub removeComputer(ByRef name As String) - lvComputers.ListItems.Remove "_" & name - tvTreeView.Nodes.Remove "_" & name - - ' - ' Check if should remove database - Dim c As Computer - Set c = g_computers("_" & name) - Dim db As Database_ - Dim dbs As New Collection - Dim p As Process - For Each p In c.m_processes - Set db = g_databases("_" & p.m_database) - db.m_processes.Remove "_" & p.m_computer.m_name & "_" & p.m_id - If Not Exists(dbs, p.m_database) Then dbs.Add db, p.m_database - Next - - For Each db In dbs - If db.m_processes.Count = 0 Then - g_databases.Remove "_" & db.m_name - tvTreeView.Nodes.Remove "_" & db.m_name - End If - Next - - g_computers.Remove "_" & name - - ' - ' Check if should remove database - - Dim n As MSComctlLib.Node - Set n = tvTreeView.SelectedItem - selectNode n -End Sub - -Private Sub AddDatabase(ByRef c As Database_) - Dim li As ListItem - Set li = lvDatabases.ListItems.Add(, "_" & c.m_name, c.m_name, 9, 9) - li.SubItems(1) = c.m_status - tvTreeView.Nodes.Add "Databases", tvwChild, "_" & c.m_name, c.m_name, 9, 9 -End Sub - -Private Sub Form_Unload(Cancel As Integer) - Dim i As Integer - - - 'close all sub forms - For i = Forms.Count - 1 To 1 Step -1 - Unload Forms(i) - Next - If Me.WindowState <> vbMinimized Then - SaveSetting App.Title, "Settings", "MainLeft", Me.Left - SaveSetting App.Title, "Settings", "MainTop", Me.Top - SaveSetting App.Title, "Settings", "MainWidth", Me.Width - SaveSetting App.Title, "Settings", "MainHeight", Me.Height - End If -End Sub - -Private Sub Form_Resize() - On Error Resume Next - If Me.Width < 3000 Then Me.Width = 3000 - SizeControls imgSplitter.Left -End Sub - -Private Sub imgSplitter_MouseDown(Button As Integer, Shift As Integer, X As Single, Y As Single) - With imgSplitter - picSplitter.Move .Left, .Top, .Width \ 2, .Height - 20 - End With - picSplitter.Visible = True - mbMoving = True -End Sub - -Private Sub imgSplitter_MouseMove(Button As Integer, Shift As Integer, X As Single, Y As Single) - Dim sglPos As Single - - - If mbMoving Then - sglPos = X + imgSplitter.Left - If sglPos < sglSplitLimit Then - picSplitter.Left = sglSplitLimit - ElseIf sglPos > Me.Width - sglSplitLimit Then - picSplitter.Left = Me.Width - sglSplitLimit - Else - picSplitter.Left = sglPos - End If - End If -End Sub - - -Private Sub imgSplitter_MouseUp(Button As Integer, Shift As Integer, X As Single, Y As Single) - SizeControls picSplitter.Left - picSplitter.Visible = False - mbMoving = False -End Sub - - -Private Sub TreeView1_DragDrop(Source As Control, X As Single, Y As Single) - If Source = imgSplitter Then - SizeControls X - End If -End Sub - - -Sub SizeControls(X As Single) - On Error Resume Next - - 'set the width - If X < 1500 Then X = 1500 - If X > (Me.Width - 1500) Then X = Me.Width - 1500 - tvTreeView.Width = X - imgSplitter.Left = X - - Dim t_left, t_width As Integer - t_left = X + 40 - t_width = Me.Width - (tvTreeView.Width + 140) - - lblTitle(0).Width = tvTreeView.Width - lblTitle(1).Left = t_left + 20 - lblTitle(1).Width = t_width - 40 - - - 'set the top - If tbToolBar.Visible Then - tvTreeView.Top = tbToolBar.Height + picTitles.Height - Else - tvTreeView.Top = picTitles.Height - End If - - - 'set the height - If sbStatusBar.Visible Then - tvTreeView.Height = Me.ScaleHeight - (picTitles.Top + picTitles.Height + sbStatusBar.Height) - Else - tvTreeView.Height = Me.ScaleHeight - (picTitles.Top + picTitles.Height) - End If - - - imgSplitter.Top = tvTreeView.Top - imgSplitter.Height = tvTreeView.Height - - setListDimensions t_left, t_width, tvTreeView.Top, tvTreeView.Height -End Sub - -Private Sub setListView(ByVal f_View As Integer) - lvComputers.View = f_View - lvProcesses.View = f_View -End Sub - -Private Sub setListDimensions(ByVal f_Left As Integer, ByVal f_Width As Integer, ByVal f_Top As Integer, ByVal f_Height As Integer) - With lvComputers - .Left = f_Left - .Width = f_Width - .Top = f_Top - .Height = f_Height - End With - With lvProcesses - .Left = f_Left - .Width = f_Width - .Top = f_Top - .Height = f_Height - End With - With lvDatabases - .Left = f_Left - .Width = f_Width - .Top = f_Top - .Height = f_Height - End With -End Sub - -Private Sub tbToolBar_ButtonClick(ByVal Button As MSComctlLib.Button) - On Error Resume Next - Select Case Button.Key - Case "New database" - 'ToDo: Add 'Back' button code. - mnuPopNewDatabase_Click - Case "Add computer" - 'ToDo: Add 'Forward' button code. - frmNewComputer.Show vbModal, Me - Dim c As Computer - For Each c In frmNewComputer.m_hosts - addComputer c - g_computers.Add c, "_" & c.m_name - Next - Case "Properties" - mnuFileProperties_Click - End Select -End Sub - -Private Sub mnuHelpAbout_Click() - frmAbout.Show vbModal, Me -End Sub - -Private Sub mnuHelpSearchForHelpOn_Click() - Dim nRet As Integer - - - 'if there is no helpfile for this project display a message to the user - 'you can set the HelpFile for your application in the - 'Project Properties dialog - If Len(App.HelpFile) = 0 Then - MsgBox "Unable to display Help Contents. There is no Help associated with this project.", vbInformation, Me.Caption - Else - On Error Resume Next - nRet = OSWinHelp(Me.hwnd, App.HelpFile, 261, 0) - If Err Then - MsgBox Err.Description - End If - End If - -End Sub - -Private Sub mnuHelpContents_Click() - Dim nRet As Integer - - - 'if there is no helpfile for this project display a message to the user - 'you can set the HelpFile for your application in the - 'Project Properties dialog - If Len(App.HelpFile) = 0 Then - MsgBox "Unable to display Help Contents. There is no Help associated with this project.", vbInformation, Me.Caption - Else - On Error Resume Next - nRet = OSWinHelp(Me.hwnd, App.HelpFile, 3, 0) - If Err Then - MsgBox Err.Description - End If - End If - -End Sub - - -Private Sub mnuViewWebBrowser_Click() - 'ToDo: Add 'mnuViewWebBrowser_Click' code. - MsgBox "Add 'mnuViewWebBrowser_Click' code." -End Sub - -Private Sub mnuViewOptions_Click() - frmOptions.Show vbModal, Me -End Sub - -Private Sub mnuViewRefresh_Click() - 'ToDo: Add 'mnuViewRefresh_Click' code. - MsgBox "Add 'mnuViewRefresh_Click' code." -End Sub - - -Private Sub mnuViewStatusBar_Click() - mnuViewStatusBar.Checked = Not mnuViewStatusBar.Checked - sbStatusBar.Visible = mnuViewStatusBar.Checked - SizeControls imgSplitter.Left -End Sub - -Private Sub mnuViewToolbar_Click() - mnuViewToolbar.Checked = Not mnuViewToolbar.Checked - tbToolBar.Visible = mnuViewToolbar.Checked - SizeControls imgSplitter.Left -End Sub - -Private Sub mnuEditInvertSelection_Click() - 'ToDo: Add 'mnuEditInvertSelection_Click' code. - MsgBox "Add 'mnuEditInvertSelection_Click' code." -End Sub - -Private Sub mnuEditSelectAll_Click() - 'ToDo: Add 'mnuEditSelectAll_Click' code. - MsgBox "Add 'mnuEditSelectAll_Click' code." -End Sub - -Private Sub mnuEditPasteSpecial_Click() - 'ToDo: Add 'mnuEditPasteSpecial_Click' code. - MsgBox "Add 'mnuEditPasteSpecial_Click' code." -End Sub - -Private Sub mnuEditPaste_Click() - 'ToDo: Add 'mnuEditPaste_Click' code. - MsgBox "Add 'mnuEditPaste_Click' code." -End Sub - -Private Sub mnuEditCopy_Click() - 'ToDo: Add 'mnuEditCopy_Click' code. - MsgBox "Add 'mnuEditCopy_Click' code." -End Sub - -Private Sub mnuEditCut_Click() - 'ToDo: Add 'mnuEditCut_Click' code. - MsgBox "Add 'mnuEditCut_Click' code." -End Sub - -Private Sub mnuEditUndo_Click() - 'ToDo: Add 'mnuEditUndo_Click' code. - MsgBox "Add 'mnuEditUndo_Click' code." -End Sub - -Private Sub mnuFileClose_Click() - 'unload the form - Unload Me - -End Sub - -Private Sub mnuFileProperties_Click() - 'ToDo: Add 'mnuFileProperties_Click' code. - MsgBox "Add 'mnuFileProperties_Click' code." -End Sub - -Private Sub mnuFileRename_Click() - 'ToDo: Add 'mnuFileRename_Click' code. - MsgBox "Add 'mnuFileRename_Click' code." -End Sub - -Private Sub mnuFileDelete_Click() - 'ToDo: Add 'mnuFileDelete_Click' code. - MsgBox "Add 'mnuFileDelete_Click' code." -End Sub - -Private Sub mnuFileNew_Click() - 'ToDo: Add 'mnuFileNew_Click' code. - MsgBox "Add 'mnuFileNew_Click' code." -End Sub - -Private Sub mnuFileSendTo_Click() - 'ToDo: Add 'mnuFileSendTo_Click' code. - MsgBox "Add 'mnuFileSendTo_Click' code." -End Sub - -Private Sub mnuFileFind_Click() - 'ToDo: Add 'mnuFileFind_Click' code. - MsgBox "Add 'mnuFileFind_Click' code." -End Sub - -Private Sub mnuFileOpen_Click() - Dim sFile As String -End Sub - -Private Sub mnuPopComputerProperties_Click() - mnuFileProperties_Click -End Sub - -Private Sub mnuPopNewDatabase_Click() - frmNewDatabase1.Show vbModal, Me - frmNewDatabase2.Show vbModal, Me - frmNewDatabase3.Show vbModal, Me -End Sub - -Private Sub mnuPopAddComputer_Click() - frmNewComputer.Show vbModal, Me - Dim c As Computer - For Each c In frmNewComputer.m_hosts - addComputer c - g_computers.Add c, "_" & c.m_name - Next -End Sub - -Private Sub mnuPopSortComputers_Click() - If m_currentNode.Sorted = True Then - mnuPopSortComputers.Checked = False - m_currentNode.Sorted = False - Else - mnuPopSortComputers.Checked = True - m_currentNode.Sorted = True - End If -End Sub - -Private Sub mnuPopRemoveComputer_Click() - Dim res As VbMsgBoxResult - Dim str As String - str = "Remove computer " & m_currentComputer.m_name - res = MsgBox(str, vbOKCancel, str) - If res = vbOK Then - removeComputer (m_currentComputer.m_name) - End If -End Sub - -Private Sub mnuPopSortDatabases_Click() - If m_currentNode.Sorted = True Then - mnuPopSortDatabases.Checked = False - m_currentNode.Sorted = False - Else - mnuPopSortDatabases.Checked = True - m_currentNode.Sorted = True - End If -End Sub - -Private Sub tvTreeView_BeforeLabelEdit(Cancel As Integer) - Cancel = True -End Sub - -Private Sub tvTreeView_Collapse(ByVal Node As MSComctlLib.Node) - 'MsgBox "tvTreeView_Collapse" -End Sub - -Private Sub tvTreeView_Expand(ByVal Node As MSComctlLib.Node) - 'MsgBox "tvTreeView_Expand" -End Sub - -Private Sub tvTreeView_NodeClick(ByVal Node As MSComctlLib.Node) - selectNode Node -End Sub - -Private Sub tvTreeView_MouseUp(Button As Integer, Shift As Integer, X As Single, Y As Single) - 'MsgBox "tvTreeView_MouseUp Button: " & Button & " Shift: " & Shift - Dim Node As MSComctlLib.Node - Dim place As Integer - - Set Node = tvTreeView.HitTest(X, Y) - place = selectNode(Node) - If Button = vbRightButton Then - ShowPopup place - End If -End Sub - -Private Function selectNode(ByRef n As MSComctlLib.Node) As Integer - Dim list As ListView - Dim place As Integer - - If n Is Nothing Then - If Not m_currentNode Is Nothing Then - place = 1 - m_currentNode.Selected = False - Else - place = 2 - End If - Else - n.Selected = True - If n.Text = "Computers" Then - place = 3 - Set list = lvComputers - lblTitle(1).Caption = "Computers" - ElseIf n.Text = "Databases" Then - place = 4 - Set list = lvDatabases - lblTitle(1).Caption = "Databases" - ElseIf n.Parent.Text = "Computers" Then - place = 5 - Set list = lvProcesses - setComputer (n.Key) - ElseIf n.Parent.Text = "Databases" Then - place = 6 - Set list = lvProcesses - setDatabase (n.Key) - End If - - If m_currentList.hwnd <> list.hwnd Then - m_currentList.Visible = False - list.Visible = True - Set m_currentList = list - End If - End If - Set m_currentNode = n - selectNode = place -End Function - -Private Sub lvComputers_MouseUp(Button As Integer, Shift As Integer, X As Single, Y As Single) - Dim li As ListItem - Set li = lvComputers.HitTest(X, Y) - If Button = vbRightButton And Not li Is Nothing Then - Dim c As Computer - Set m_currentComputer = g_computers(li.Key) - ShowPopup 5 - End If -End Sub - -Private Sub ShowPopup(ByVal place As Integer) - Select Case place - Case 3 - PopupMenu mnuPopComputers - Case 4 - PopupMenu mnuPopDatabases - Case 5 - mnuPopComputerName.Caption = m_currentComputer.m_name & ": " & m_currentComputer.m_status - Select Case m_currentComputer.m_status - Case "Connected" - mnuPopConnectComputer.Enabled = False - mnuPopDisconnectComputer.Enabled = True - Case "Connecting" - mnuPopConnectComputer.Enabled = False - mnuPopDisconnectComputer.Enabled = True - Case "Not connected" - mnuPopConnectComputer.Enabled = True - mnuPopDisconnectComputer.Enabled = False - Case "No contact" - mnuPopConnectComputer.Enabled = True - mnuPopDisconnectComputer.Enabled = False - Case Else - mnuPopConnectComputer.Enabled = False - mnuPopDisconnectComputer.Enabled = False - End Select - - PopupMenu mnuPopComputer, , , , mnuPopComputerName - End Select -End Sub - -Private Sub lvComputers_BeforeLabelEdit(Cancel As Integer) - Cancel = True -End Sub - -Private Sub lvProcesses_BeforeLabelEdit(Cancel As Integer) - Cancel = True -End Sub - -Private Sub lvDatabases_BeforeLabelEdit(Cancel As Integer) - Cancel = True -End Sub - -Private Sub ColumnClick(ByRef list As ListView, i As Integer) - i = i - 1 - If list.SortKey = i Then - list.SortOrder = 1 - list.SortOrder - Else - list.SortKey = i - End If -End Sub - -Private Sub lvComputers_ColumnClick(ByVal ColumnHeader As MSComctlLib.ColumnHeader) - ColumnClick lvComputers, ColumnHeader.Index -End Sub - -Private Sub lvProcesses_ColumnClick(ByVal ColumnHeader As MSComctlLib.ColumnHeader) - ColumnClick lvProcesses, ColumnHeader.Index -End Sub - -Private Sub lvDatabases_ColumnClick(ByVal ColumnHeader As MSComctlLib.ColumnHeader) - ColumnClick lvDatabases, ColumnHeader.Index -End Sub - diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frm b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frm deleted file mode 100644 index eae5802493c..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frm +++ /dev/null @@ -1,124 +0,0 @@ -VERSION 5.00 -Begin VB.Form frmNewComputer - Caption = "Add computer" - ClientHeight = 1545 - ClientLeft = 60 - ClientTop = 345 - ClientWidth = 4605 - LinkTopic = "Form1" - ScaleHeight = 1545 - ScaleWidth = 4605 - StartUpPosition = 3 'Windows Default - Begin VB.CommandButton Command3 - Caption = "Apply" - Default = -1 'True - Height = 360 - Left = 3240 - TabIndex = 4 - Tag = "OK" - Top = 840 - Width = 1140 - End - Begin VB.CommandButton Command2 - Caption = "Cancel" - Height = 360 - Left = 1920 - TabIndex = 3 - Tag = "OK" - Top = 840 - Width = 1140 - End - Begin VB.CommandButton Command1 - Caption = "OK" - Height = 360 - Left = 600 - TabIndex = 2 - Tag = "OK" - Top = 840 - Width = 1140 - End - Begin VB.TextBox Text1 - Height = 285 - Left = 1440 - TabIndex = 1 - Top = 240 - Width = 2925 - End - Begin VB.Label lblLabels - Caption = "Computer name:" - Height = 255 - Index = 1 - Left = 120 - TabIndex = 0 - Tag = "&User Name:" - Top = 240 - Width = 1440 - End -End -Attribute VB_Name = "frmNewComputer" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Public m_hosts As New Collection - -Private Sub Form_Load() - If m_hosts.Count > 0 Then - For i = m_hosts.Count To 1 Step -1 - m_hosts.Remove i - Next - End If -End Sub - -Private Sub Command1_Click() - If Text1.Text = "" Then - MsgBox "Invalid hostname" - Exit Sub - End If - - If Exists(g_computers, "_" & Text1.Text) Then - MsgBox Text1.Text & " already exists" - Exit Sub - End If - - Dim c As New Computer - With c - .m_ip = "" - .m_name = Text1.Text - .m_status = "Not connected" - Set .m_processes = New Collection - End With - - m_hosts.Add c - - Unload Me -End Sub - -Private Sub Command2_Click() - Unload Me -End Sub - -Private Sub Command3_Click() - If Text1.Text = "" Then - MsgBox "Invalid hostname" - Exit Sub - End If - - If Exists(g_computers, "_" & Text1.Text) Then - MsgBox Text1.Text & " already exists" - Exit Sub - End If - - Dim c As New Computer - With c - .m_ip = "" - .m_name = Text1.Text - .m_status = "Not connected" - Set .m_processes = New Collection - End With - - m_hosts.Add c - - Text1.Text = "" -End Sub - diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frx b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frx Binary files differdeleted file mode 100644 index 593f4708db8..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frx +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase.frx b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase.frx Binary files differdeleted file mode 100644 index b20c2b651ae..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase.frx +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase1.frm b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase1.frm deleted file mode 100644 index 3fa1fd4c4e8..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase1.frm +++ /dev/null @@ -1,187 +0,0 @@ -VERSION 5.00 -Begin VB.Form frmNewDatabase1 - BorderStyle = 5 'Sizable ToolWindow - Caption = "Nodes" - ClientHeight = 3000 - ClientLeft = 2850 - ClientTop = 3450 - ClientWidth = 6240 - LinkTopic = "Form1" - MaxButton = 0 'False - MinButton = 0 'False - ScaleHeight = 3281.25 - ScaleMode = 0 'User - ScaleWidth = 6359.712 - ShowInTaskbar = 0 'False - StartUpPosition = 2 'CenterScreen - Begin VB.TextBox textApiNodes - Height = 285 - Left = 2760 - TabIndex = 12 - Text = "4" - Top = 1665 - Width = 375 - End - Begin VB.VScrollBar VScroll1 - Height = 255 - Left = 3240 - TabIndex = 11 - Top = 1680 - Width = 135 - End - Begin VB.OptionButton Option4 - Alignment = 1 'Right Justify - Caption = "1" - Height = 375 - Left = 2760 - TabIndex = 10 - Top = 1020 - Width = 375 - End - Begin VB.OptionButton Option3 - Alignment = 1 'Right Justify - Caption = "4" - Height = 375 - Left = 3960 - TabIndex = 9 - Top = 360 - Width = 375 - End - Begin VB.OptionButton Option2 - Alignment = 1 'Right Justify - Caption = "2" - Height = 375 - Left = 3360 - TabIndex = 8 - Top = 360 - Width = 375 - End - Begin VB.OptionButton Option1 - Alignment = 1 'Right Justify - Caption = "1" - Height = 375 - Left = 2760 - TabIndex = 7 - Top = 360 - Value = -1 'True - Width = 375 - End - Begin VB.CommandButton cmdCancel - Cancel = -1 'True - Caption = "Cancel" - Height = 305 - Left = 1320 - TabIndex = 3 - Top = 2400 - Width = 1140 - End - Begin VB.CommandButton cmdFinish - Caption = "Finish" - Enabled = 0 'False - Height = 305 - Left = 5040 - TabIndex = 2 - Top = 2400 - Width = 1140 - End - Begin VB.CommandButton cmdBack - Caption = "Back" - Default = -1 'True - Enabled = 0 'False - Height = 305 - Left = 2640 - TabIndex = 0 - Top = 2400 - Width = 1140 - End - Begin VB.CommandButton cmdNext - Caption = "Next" - Height = 305 - Left = 3720 - TabIndex = 1 - Top = 2400 - Width = 1140 - End - Begin VB.Label Label3 - Caption = "No of api nodes" - Height = 255 - Left = 240 - TabIndex = 6 - Top = 1680 - Width = 2415 - End - Begin VB.Label Label2 - Caption = "No of management nodes" - Height = 255 - Left = 240 - TabIndex = 5 - Top = 1080 - Width = 2415 - End - Begin VB.Label Label1 - Caption = "No of database nodes" - Height = 255 - Left = 240 - TabIndex = 4 - Top = 420 - Width = 2415 - End - Begin VB.Line Line1 - BorderColor = &H80000003& - X1 = 122.302 - X2 = 6237.41 - Y1 = 2493.75 - Y2 = 2493.75 - End -End -Attribute VB_Name = "frmNewDatabase1" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Option Explicit - -Private Sub Form_Resize() - If Me.Width < 6375 Then Me.Width = 6375 - cmdCancel.Left = Me.ScaleWidth - 5136 + 400 - cmdBack.Left = Me.ScaleWidth - 3897 + 400 - cmdNext.Left = Me.ScaleWidth - 2883 + 400 - cmdFinish.Left = Me.ScaleWidth - 1643 + 400 - Line1.X2 = Me.ScaleWidth - 480 + 400 - - cmdCancel.Top = Me.ScaleHeight - 375 - cmdBack.Top = Me.ScaleHeight - 375 - cmdNext.Top = Me.ScaleHeight - 375 - cmdFinish.Top = Me.ScaleHeight - 375 - Line1.Y1 = Me.ScaleHeight - 475 - Line1.Y2 = Me.ScaleHeight - 475 -End Sub - -Private Sub cmdCancel_Click() - 'set the global var to false - 'to denote a failed login - Unload Me -End Sub - -Private Sub Option1_Click() - Option2.Value = False - Option3.Value = False -End Sub - -Private Sub Option2_Click() - Option1.Value = False - Option3.Value = False -End Sub - -Private Sub Option3_Click() - Option1.Value = False - Option2.Value = False -End Sub - -Private Sub Option4_Click() - Option4.Value = True -End Sub - -Private Sub textApiNodes_Validate(Cancel As Boolean) - 'If Not isnumber(textApiNodes.Text) Then Cancel = False -End Sub diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.frm b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.frm deleted file mode 100644 index 49806a695ea..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.frm +++ /dev/null @@ -1,136 +0,0 @@ -VERSION 5.00 -Begin VB.Form frmNewDatabase2 - BorderStyle = 5 'Sizable ToolWindow - Caption = "Computers" - ClientHeight = 2895 - ClientLeft = 2850 - ClientTop = 3450 - ClientWidth = 6240 - LinkTopic = "Form1" - MaxButton = 0 'False - MinButton = 0 'False - ScaleHeight = 3166.406 - ScaleMode = 0 'User - ScaleWidth = 6359.712 - ShowInTaskbar = 0 'False - StartUpPosition = 2 'CenterScreen - Begin VB.ComboBox Combo1 - Height = 315 - Left = 2400 - TabIndex = 7 - Text = "Combo1" - Top = 360 - Width = 1455 - End - Begin VB.VScrollBar VScroll2 - Height = 255 - Left = 4560 - TabIndex = 6 - Top = 375 - Width = 135 - End - Begin VB.TextBox Text1 - Height = 285 - Left = 4080 - TabIndex = 5 - Text = "4" - Top = 360 - Width = 375 - End - Begin VB.CommandButton cmdCancel - Cancel = -1 'True - Caption = "Cancel" - Height = 305 - Left = 1320 - TabIndex = 3 - Top = 2400 - Width = 1140 - End - Begin VB.CommandButton cmdFinish - Caption = "Finish" - Enabled = 0 'False - Height = 305 - Left = 5040 - TabIndex = 2 - Top = 2400 - Width = 1140 - End - Begin VB.CommandButton cmdBack - Caption = "Back" - Default = -1 'True - Enabled = 0 'False - Height = 305 - Left = 2640 - TabIndex = 0 - Top = 2400 - Width = 1140 - End - Begin VB.CommandButton cmdNext - Caption = "Next" - Height = 305 - Left = 3720 - TabIndex = 1 - Top = 2400 - Width = 1140 - End - Begin VB.Label Label5 - Caption = "Computer" - Height = 255 - Left = 2400 - TabIndex = 9 - Top = 0 - Width = 975 - End - Begin VB.Label Label4 - Caption = "Node id" - Height = 255 - Left = 4080 - TabIndex = 8 - Top = 120 - Width = 615 - End - Begin VB.Label Label1 - Caption = "Database node 1" - Height = 255 - Left = 240 - TabIndex = 4 - Top = 420 - Width = 2415 - End - Begin VB.Line Line1 - BorderColor = &H80000003& - X1 = 122.302 - X2 = 6237.41 - Y1 = 2493.75 - Y2 = 2493.75 - End -End -Attribute VB_Name = "frmNewDatabase2" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Option Explicit - -Private Sub Form_Resize() - If Me.Width < 6375 Then Me.Width = 6375 - cmdCancel.Left = Me.ScaleWidth - 5136 + 400 - cmdBack.Left = Me.ScaleWidth - 3897 + 400 - cmdNext.Left = Me.ScaleWidth - 2883 + 400 - cmdFinish.Left = Me.ScaleWidth - 1643 + 400 - Line1.X2 = Me.ScaleWidth - 480 + 400 - - cmdCancel.Top = Me.ScaleHeight - 375 - cmdBack.Top = Me.ScaleHeight - 375 - cmdNext.Top = Me.ScaleHeight - 375 - cmdFinish.Top = Me.ScaleHeight - 375 - Line1.Y1 = Me.ScaleHeight - 475 - Line1.Y2 = Me.ScaleHeight - 475 -End Sub - -Private Sub cmdCancel_Click() - 'set the global var to false - 'to denote a failed login - Unload Me -End Sub - diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.log b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.log deleted file mode 100644 index 808b21866e5..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.log +++ /dev/null @@ -1 +0,0 @@ -Line 2: The Form or MDIForm name frmNewDatabase1 is already in use; cannot load this form. diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase3.frm b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase3.frm deleted file mode 100644 index ba050a58a09..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase3.frm +++ /dev/null @@ -1,88 +0,0 @@ -VERSION 5.00 -Begin VB.Form frmNewDatabase3 - BorderStyle = 5 'Sizable ToolWindow - Caption = "Database configuration" - ClientHeight = 3000 - ClientLeft = 2850 - ClientTop = 3450 - ClientWidth = 6240 - LinkTopic = "Form1" - MaxButton = 0 'False - MinButton = 0 'False - ScaleHeight = 3281.25 - ScaleMode = 0 'User - ScaleWidth = 6359.712 - ShowInTaskbar = 0 'False - StartUpPosition = 2 'CenterScreen - Begin VB.CommandButton cmdCancel - Cancel = -1 'True - Caption = "Cancel" - Height = 305 - Left = 1320 - TabIndex = 3 - Top = 2400 - Width = 1140 - End - Begin VB.CommandButton cmdFinish - Caption = "Finish" - Enabled = 0 'False - Height = 305 - Left = 5040 - TabIndex = 2 - Top = 2400 - Width = 1140 - End - Begin VB.CommandButton cmdBack - Caption = "Back" - Default = -1 'True - Enabled = 0 'False - Height = 305 - Left = 2640 - TabIndex = 0 - Top = 2400 - Width = 1140 - End - Begin VB.CommandButton cmdNext - Caption = "Next" - Height = 305 - Left = 3720 - TabIndex = 1 - Top = 2400 - Width = 1140 - End - Begin VB.Line Line1 - BorderColor = &H80000003& - X1 = 122.302 - X2 = 6237.41 - Y1 = 2493.75 - Y2 = 2493.75 - End -End -Attribute VB_Name = "frmNewDatabase3" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Option Explicit - -Private Sub Form_Resize() - If Me.Width < 6375 Then Me.Width = 6375 - cmdCancel.Left = Me.ScaleWidth - 5136 + 400 - cmdBack.Left = Me.ScaleWidth - 3897 + 400 - cmdNext.Left = Me.ScaleWidth - 2883 + 400 - cmdFinish.Left = Me.ScaleWidth - 1643 + 400 - Line1.X2 = Me.ScaleWidth - 480 + 400 - - cmdCancel.Top = Me.ScaleHeight - 375 - cmdBack.Top = Me.ScaleHeight - 375 - cmdNext.Top = Me.ScaleHeight - 375 - cmdFinish.Top = Me.ScaleHeight - 375 - Line1.Y1 = Me.ScaleHeight - 475 - Line1.Y2 = Me.ScaleHeight - 475 -End Sub - -Private Sub cmdCancel_Click() - 'set the global var to false - 'to denote a failed login - Unload Me -End Sub diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/frmOptions.frm b/storage/ndb/src/cw/cpcc-win32/vb6/frmOptions.frm deleted file mode 100644 index e526a35b3ec..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/frmOptions.frm +++ /dev/null @@ -1,231 +0,0 @@ -VERSION 5.00 -Object = "{831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0"; "mscomctl.ocx" -Begin VB.Form frmOptions - BorderStyle = 3 'Fixed Dialog - Caption = "Options" - ClientHeight = 5040 - ClientLeft = 6600 - ClientTop = 4575 - ClientWidth = 6150 - KeyPreview = -1 'True - LinkTopic = "Form1" - MaxButton = 0 'False - MinButton = 0 'False - ScaleHeight = 5040 - ScaleWidth = 6150 - ShowInTaskbar = 0 'False - Tag = "Options" - Begin VB.CommandButton cmdOK - Caption = "OK" - Height = 375 - Left = 2490 - TabIndex = 1 - Tag = "OK" - Top = 4455 - Width = 1095 - End - Begin VB.CommandButton cmdCancel - Cancel = -1 'True - Caption = "Cancel" - Height = 375 - Left = 3720 - TabIndex = 3 - Tag = "Cancel" - Top = 4455 - Width = 1095 - End - Begin VB.CommandButton cmdApply - Caption = "&Apply" - Height = 375 - Left = 4920 - TabIndex = 5 - Tag = "&Apply" - Top = 4455 - Width = 1095 - End - Begin VB.PictureBox picOptions - BorderStyle = 0 'None - Height = 3780 - Index = 3 - Left = -20000 - ScaleHeight = 3840.968 - ScaleMode = 0 'User - ScaleWidth = 5745.64 - TabIndex = 7 - TabStop = 0 'False - Top = 480 - Width = 5685 - Begin VB.Frame fraSample4 - Caption = "Sample 4" - Height = 2022 - Left = 505 - TabIndex = 11 - Tag = "Sample 4" - Top = 502 - Width = 2033 - End - End - Begin VB.PictureBox picOptions - BorderStyle = 0 'None - Height = 3780 - Index = 2 - Left = -20000 - ScaleHeight = 3840.968 - ScaleMode = 0 'User - ScaleWidth = 5745.64 - TabIndex = 9 - TabStop = 0 'False - Top = 480 - Width = 5685 - Begin VB.Frame fraSample3 - Caption = "Sample 3" - Height = 2022 - Left = 406 - TabIndex = 10 - Tag = "Sample 3" - Top = 403 - Width = 2033 - End - End - Begin VB.PictureBox picOptions - BorderStyle = 0 'None - Height = 3780 - Index = 1 - Left = -20000 - ScaleHeight = 3840.968 - ScaleMode = 0 'User - ScaleWidth = 5745.64 - TabIndex = 6 - TabStop = 0 'False - Top = 480 - Width = 5685 - Begin VB.Frame fraSample2 - Caption = "Sample 2" - Height = 2022 - Left = 307 - TabIndex = 8 - Tag = "Sample 2" - Top = 305 - Width = 2033 - End - End - Begin VB.PictureBox picOptions - BorderStyle = 0 'None - Height = 3780 - Index = 0 - Left = 210 - ScaleHeight = 3840.968 - ScaleMode = 0 'User - ScaleWidth = 5745.64 - TabIndex = 2 - TabStop = 0 'False - Top = 480 - Width = 5685 - Begin VB.Frame fraSample1 - Caption = "Sample 1" - Height = 2022 - Left = 208 - TabIndex = 4 - Tag = "Sample 1" - Top = 207 - Width = 2033 - End - End - Begin MSComctlLib.TabStrip tbsOptions - Height = 4245 - Left = 105 - TabIndex = 0 - Top = 120 - Width = 5895 - _ExtentX = 10398 - _ExtentY = 7488 - _Version = 393216 - BeginProperty Tabs {1EFB6598-857C-11D1-B16A-00C0F0283628} - NumTabs = 4 - BeginProperty Tab1 {1EFB659A-857C-11D1-B16A-00C0F0283628} - Caption = "Group 1" - ImageVarType = 2 - EndProperty - BeginProperty Tab2 {1EFB659A-857C-11D1-B16A-00C0F0283628} - Caption = "Group 2" - ImageVarType = 2 - EndProperty - BeginProperty Tab3 {1EFB659A-857C-11D1-B16A-00C0F0283628} - Caption = "Group 3" - ImageVarType = 2 - EndProperty - BeginProperty Tab4 {1EFB659A-857C-11D1-B16A-00C0F0283628} - Caption = "Group 4" - ImageVarType = 2 - EndProperty - EndProperty - End -End -Attribute VB_Name = "frmOptions" -Attribute VB_GlobalNameSpace = False -Attribute VB_Creatable = False -Attribute VB_PredeclaredId = True -Attribute VB_Exposed = False -Private Sub cmdApply_Click() - 'ToDo: Add 'cmdApply_Click' code. - MsgBox "Apply Code goes here to set options w/o closing dialog!" -End Sub - - -Private Sub cmdCancel_Click() - Unload Me -End Sub - - -Private Sub cmdOK_Click() - 'ToDo: Add 'cmdOK_Click' code. - MsgBox "Code goes here to set options and close dialog!" - Unload Me -End Sub - - -Private Sub Form_KeyDown(KeyCode As Integer, Shift As Integer) - Dim i As Integer - i = tbsOptions.SelectedItem.Index - 'handle ctrl+tab to move to the next tab - If (Shift And 3) = 2 And KeyCode = vbKeyTab Then - If i = tbsOptions.Tabs.Count Then - 'last tab so we need to wrap to tab 1 - Set tbsOptions.SelectedItem = tbsOptions.Tabs(1) - Else - 'increment the tab - Set tbsOptions.SelectedItem = tbsOptions.Tabs(i + 1) - End If - ElseIf (Shift And 3) = 3 And KeyCode = vbKeyTab Then - If i = 1 Then - 'last tab so we need to wrap to tab 1 - Set tbsOptions.SelectedItem = tbsOptions.Tabs(tbsOptions.Tabs.Count) - Else - 'increment the tab - Set tbsOptions.SelectedItem = tbsOptions.Tabs(i - 1) - End If - End If -End Sub - - - - -Private Sub tbsOptions_Click() - - - Dim i As Integer - 'show and enable the selected tab's controls - 'and hide and disable all others - For i = 0 To tbsOptions.Tabs.Count - 1 - If i = tbsOptions.SelectedItem.Index - 1 Then - picOptions(i).Left = 210 - picOptions(i).Enabled = True - Else - picOptions(i).Left = -20000 - picOptions(i).Enabled = False - End If - Next - - -End Sub - diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/frmSplash.frx b/storage/ndb/src/cw/cpcc-win32/vb6/frmSplash.frx Binary files differdeleted file mode 100644 index fee0c5c59de..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/frmSplash.frx +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/networking.ico b/storage/ndb/src/cw/cpcc-win32/vb6/networking.ico Binary files differdeleted file mode 100644 index 6bbf8022fc6..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/networking.ico +++ /dev/null diff --git a/storage/ndb/src/cw/cpcc-win32/vb6/open folder.ico b/storage/ndb/src/cw/cpcc-win32/vb6/open folder.ico Binary files differdeleted file mode 100644 index 7bb32cc83d3..00000000000 --- a/storage/ndb/src/cw/cpcc-win32/vb6/open folder.ico +++ /dev/null diff --git a/storage/ndb/src/libndb.ver.in b/storage/ndb/src/libndb.ver.in index 72bf93d196f..c7b97876d44 100644 --- a/storage/ndb/src/libndb.ver.in +++ b/storage/ndb/src/libndb.ver.in @@ -1,2 +1,17 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + libndbclient_@NDB_SHARED_LIB_MAJOR_VERSION@ { global: *; }; diff --git a/storage/ndb/test/ndbapi/slow_select.cpp b/storage/ndb/test/ndbapi/slow_select.cpp index 8d615fa5771..21e3ce7400c 100644 --- a/storage/ndb/test/ndbapi/slow_select.cpp +++ b/storage/ndb/test/ndbapi/slow_select.cpp @@ -1,3 +1,17 @@ +/* Copyright (C) 2004, 2005 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <ndb_global.h> #include <NdbApi.hpp> diff --git a/storage/ndb/test/ndbapi/testBitfield.cpp b/storage/ndb/test/ndbapi/testBitfield.cpp index 41bb7b4622c..27ee870705f 100644 --- a/storage/ndb/test/ndbapi/testBitfield.cpp +++ b/storage/ndb/test/ndbapi/testBitfield.cpp @@ -1,3 +1,17 @@ +/* Copyright (C) 2004, 2008 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <ndb_global.h> #include <ndb_opts.h> diff --git a/storage/ndb/test/ndbapi/testLcp.cpp b/storage/ndb/test/ndbapi/testLcp.cpp index 69789b0191f..d8bf1611dfb 100644 --- a/storage/ndb/test/ndbapi/testLcp.cpp +++ b/storage/ndb/test/ndbapi/testLcp.cpp @@ -1,3 +1,17 @@ +/* Copyright (C) 2004, 2005 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <NDBT.hpp> #include <NdbApi.hpp> diff --git a/storage/ndb/test/ndbnet/test.run b/storage/ndb/test/ndbnet/test.run index 30042488c92..195a657aeb5 100644 --- a/storage/ndb/test/ndbnet/test.run +++ b/storage/ndb/test/ndbnet/test.run @@ -1,3 +1,18 @@ +# Copyright (C) 2004 MySQL AB # +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; version 2 +# of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +# MA 02111-1307, USA system("printenv|sort"); diff --git a/storage/ndb/test/ndbnet/testError.run b/storage/ndb/test/ndbnet/testError.run index 3cce489a3da..6ace2cbbd20 100644 --- a/storage/ndb/test/ndbnet/testError.run +++ b/storage/ndb/test/ndbnet/testError.run @@ -1,3 +1,20 @@ +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; version 2 +# of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +# MA 02111-1307, USA + # # file : test/ndbnet/testError.run # usage: perl testError.run diff --git a/storage/ndb/test/ndbnet/testMNF.run b/storage/ndb/test/ndbnet/testMNF.run index df226cd3359..2903313f306 100644 --- a/storage/ndb/test/ndbnet/testMNF.run +++ b/storage/ndb/test/ndbnet/testMNF.run @@ -1,3 +1,20 @@ +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; version 2 +# of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +# MA 02111-1307, USA + # # file : test/ndbnet/testError.run # usage: perl testError.run diff --git a/storage/ndb/test/ndbnet/testNR.run b/storage/ndb/test/ndbnet/testNR.run index 01a3d76266d..5019f597b42 100644 --- a/storage/ndb/test/ndbnet/testNR.run +++ b/storage/ndb/test/ndbnet/testNR.run @@ -1,4 +1,19 @@ +# Copyright (C) 2004 MySQL AB # +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; version 2 +# of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +# MA 02111-1307, USA use strict; use NDB::Run; diff --git a/storage/ndb/test/ndbnet/testNR1.run b/storage/ndb/test/ndbnet/testNR1.run index 8819a92c8ca..a02b487b663 100644 --- a/storage/ndb/test/ndbnet/testNR1.run +++ b/storage/ndb/test/ndbnet/testNR1.run @@ -1,3 +1,20 @@ +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; version 2 +# of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +# MA 02111-1307, USA + # Node recovery killing 1 node out of 4 at the time and waiting for recover use strict; diff --git a/storage/ndb/test/ndbnet/testNR4.run b/storage/ndb/test/ndbnet/testNR4.run index f7a5eef3494..378d2743145 100644 --- a/storage/ndb/test/ndbnet/testNR4.run +++ b/storage/ndb/test/ndbnet/testNR4.run @@ -1,3 +1,20 @@ +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; version 2 +# of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +# MA 02111-1307, USA + # Node recovery killing 1 node out of 4 at the time and waiting for recover use strict; diff --git a/storage/ndb/test/ndbnet/testSRhang.run b/storage/ndb/test/ndbnet/testSRhang.run index 8cb65a75ded..570ed897eef 100644 --- a/storage/ndb/test/ndbnet/testSRhang.run +++ b/storage/ndb/test/ndbnet/testSRhang.run @@ -1,4 +1,19 @@ +# Copyright (C) 2004 MySQL AB # +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; version 2 +# of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +# MA 02111-1307, USA use strict; use NDB::Run; diff --git a/storage/ndb/test/ndbnet/testTR295.run b/storage/ndb/test/ndbnet/testTR295.run index ce4250b60ae..df26000cbda 100644 --- a/storage/ndb/test/ndbnet/testTR295.run +++ b/storage/ndb/test/ndbnet/testTR295.run @@ -1,3 +1,20 @@ +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; version 2 +# of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +# MA 02111-1307, USA + # testing TR295, kill non-master when recovering in phase 4 use strict; diff --git a/storage/ndb/test/run-test/16node-tests.txt b/storage/ndb/test/run-test/16node-tests.txt index 11ade56c28c..21dd67c9b4b 100644 --- a/storage/ndb/test/run-test/16node-tests.txt +++ b/storage/ndb/test/run-test/16node-tests.txt @@ -1,3 +1,18 @@ +# Copyright (C) 2005 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # BASIC FUNCTIONALITY max-time: 500 cmd: testBasic diff --git a/storage/ndb/test/run-test/atrt-analyze-result.sh b/storage/ndb/test/run-test/atrt-analyze-result.sh index 0fa46e918ef..9a482faee86 100755 --- a/storage/ndb/test/run-test/atrt-analyze-result.sh +++ b/storage/ndb/test/run-test/atrt-analyze-result.sh @@ -1,5 +1,22 @@ #!/bin/sh +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; version 2 +# of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +# MA 02111-1307, USA + f=`find result -name 'log.out' | xargs grep "NDBT_ProgramExit: " | grep -c "Failed"` o=`find result -name 'log.out' | xargs grep "NDBT_ProgramExit: " | grep -c "OK"` diff --git a/storage/ndb/test/run-test/atrt-clear-result.sh b/storage/ndb/test/run-test/atrt-clear-result.sh index 57d3d43d247..7eeb54daef3 100755 --- a/storage/ndb/test/run-test/atrt-clear-result.sh +++ b/storage/ndb/test/run-test/atrt-clear-result.sh @@ -1,4 +1,21 @@ #!/bin/sh +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; version 2 +# of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +# MA 02111-1307, USA + set -e rm -rf result diff --git a/storage/ndb/test/run-test/atrt-gather-result.sh b/storage/ndb/test/run-test/atrt-gather-result.sh index f2473578b41..36989d04c07 100755 --- a/storage/ndb/test/run-test/atrt-gather-result.sh +++ b/storage/ndb/test/run-test/atrt-gather-result.sh @@ -1,5 +1,22 @@ #!/bin/sh +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; version 2 +# of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +# MA 02111-1307, USA + set -e mkdir -p result diff --git a/storage/ndb/test/run-test/atrt-mysql-test-run b/storage/ndb/test/run-test/atrt-mysql-test-run index 2ebc11b0070..55afc45bef9 100755 --- a/storage/ndb/test/run-test/atrt-mysql-test-run +++ b/storage/ndb/test/run-test/atrt-mysql-test-run @@ -1,5 +1,22 @@ #!/bin/sh +# Copyright (C) 2004, 2005 MySQL AB +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; version 2 +# of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +# MA 02111-1307, USA + set -x p=`pwd` cd $MYSQL_BASE_DIR/mysql-test diff --git a/storage/ndb/test/run-test/atrt-setup.sh b/storage/ndb/test/run-test/atrt-setup.sh index aff5d4119dc..786b1d812de 100755 --- a/storage/ndb/test/run-test/atrt-setup.sh +++ b/storage/ndb/test/run-test/atrt-setup.sh @@ -1,5 +1,22 @@ #!/bin/sh +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; version 2 +# of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +# MA 02111-1307, USA + set -e ssh $1 mkdir -p $3 diff --git a/storage/ndb/test/run-test/atrt-testBackup b/storage/ndb/test/run-test/atrt-testBackup index 3ed7641a42e..2ed6f70b7aa 100755 --- a/storage/ndb/test/run-test/atrt-testBackup +++ b/storage/ndb/test/run-test/atrt-testBackup @@ -1,5 +1,22 @@ #!/bin/sh +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; version 2 +# of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +# MA 02111-1307, USA + PATH=$PATH:$MYSQL_BASE_DIR/bin export PATH diff --git a/storage/ndb/test/run-test/basic.txt b/storage/ndb/test/run-test/basic.txt index ec9e21359e5..69555b8c587 100644 --- a/storage/ndb/test/run-test/basic.txt +++ b/storage/ndb/test/run-test/basic.txt @@ -1,3 +1,18 @@ +# Copyright (C) 2004, 2005 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # BASIC FUNCTIONALITY max-time: 500 cmd: testBasic diff --git a/storage/ndb/test/run-test/daily-basic-tests.txt b/storage/ndb/test/run-test/daily-basic-tests.txt index 70c395fab17..84c1111bd78 100644 --- a/storage/ndb/test/run-test/daily-basic-tests.txt +++ b/storage/ndb/test/run-test/daily-basic-tests.txt @@ -1,3 +1,18 @@ +# Copyright (C) 2004-2008 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + max-time: 600 cmd: atrt-testBackup args: -n NFMaster T1 diff --git a/storage/ndb/test/run-test/daily-devel-tests.txt b/storage/ndb/test/run-test/daily-devel-tests.txt index f73bd021440..dc17e31de6a 100644 --- a/storage/ndb/test/run-test/daily-devel-tests.txt +++ b/storage/ndb/test/run-test/daily-devel-tests.txt @@ -1,3 +1,18 @@ +# Copyright (C) 2004, 2005 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # # INDEX # diff --git a/storage/ndb/test/run-test/make-config.sh b/storage/ndb/test/run-test/make-config.sh index a5ea2e58ae6..3ce780f9551 100755 --- a/storage/ndb/test/run-test/make-config.sh +++ b/storage/ndb/test/run-test/make-config.sh @@ -1,5 +1,22 @@ #!/bin/sh +# Copyright (C) 2004, 2005 MySQL AB +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; version 2 +# of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +# MA 02111-1307, USA + baseport="" basedir="" proc_no=1 diff --git a/storage/ndb/test/run-test/make-html-reports.sh b/storage/ndb/test/run-test/make-html-reports.sh index 67395ceba47..dc6d1225dbe 100755 --- a/storage/ndb/test/run-test/make-html-reports.sh +++ b/storage/ndb/test/run-test/make-html-reports.sh @@ -1,5 +1,22 @@ #!/bin/sh +# Copyright (C) 2004, 2005 MySQL AB +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; version 2 +# of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +# MA 02111-1307, USA + src_dir=$1 run=$2 date=$3 diff --git a/storage/ndb/test/run-test/make-index.sh b/storage/ndb/test/run-test/make-index.sh index 944f0df790b..f13ac098567 100755 --- a/storage/ndb/test/run-test/make-index.sh +++ b/storage/ndb/test/run-test/make-index.sh @@ -1,4 +1,22 @@ #!/bin/sh + +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; version 2 +# of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +# MA 02111-1307, USA + # NAME # make-index.sh # diff --git a/storage/ndb/test/run-test/ndb-autotest.sh b/storage/ndb/test/run-test/ndb-autotest.sh index 289f1045b21..a144c7a0329 100755 --- a/storage/ndb/test/run-test/ndb-autotest.sh +++ b/storage/ndb/test/run-test/ndb-autotest.sh @@ -1,4 +1,22 @@ #!/bin/sh + +# Copyright (C) 2005, 2006 MySQL AB +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; version 2 +# of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +# MA 02111-1307, USA + ############################################################# # This script created by Jonas does the following # # Cleans up clones and pevious builds, pulls new clones, # diff --git a/storage/ndb/test/sql/test_create_drop.pl b/storage/ndb/test/sql/test_create_drop.pl index 7f62898b3d1..eb9d5e31dc8 100644 --- a/storage/ndb/test/sql/test_create_drop.pl +++ b/storage/ndb/test/sql/test_create_drop.pl @@ -1,3 +1,20 @@ +# Copyright (C) 2005 MySQL AB +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; version 2 +# of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +# MA 02111-1307, USA + use strict; use IO::Socket; use DBI; diff --git a/storage/ndb/test/sql/test_range_bounds.pl b/storage/ndb/test/sql/test_range_bounds.pl index abe1ea28298..964847044de 100644 --- a/storage/ndb/test/sql/test_range_bounds.pl +++ b/storage/ndb/test/sql/test_range_bounds.pl @@ -1,3 +1,20 @@ +# Copyright (C) 2005 MySQL AB +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; version 2 +# of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +# MA 02111-1307, USA + # # test range scan bounds # give option --all to test all cases diff --git a/storage/ndb/tools/clean-links.sh b/storage/ndb/tools/clean-links.sh index 01820f30616..84052a619d0 100755 --- a/storage/ndb/tools/clean-links.sh +++ b/storage/ndb/tools/clean-links.sh @@ -1,5 +1,20 @@ #! /bin/sh +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + # 1 - Dir # 2 - Link dst diff --git a/storage/ndb/tools/make-errors.pl b/storage/ndb/tools/make-errors.pl index 65819209a89..ac9c7d1d58a 100644 --- a/storage/ndb/tools/make-errors.pl +++ b/storage/ndb/tools/make-errors.pl @@ -1,5 +1,20 @@ #! /usr/local/bin/perl +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + use strict; use Getopt::Long; use XML::Parser; diff --git a/storage/ndb/tools/make-links.sh b/storage/ndb/tools/make-links.sh index e0c4f55986e..6008406ad6a 100755 --- a/storage/ndb/tools/make-links.sh +++ b/storage/ndb/tools/make-links.sh @@ -1,5 +1,20 @@ #! /bin/sh +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + # 1 - Link top src # 2 - Link dst diff --git a/storage/ndb/tools/ndb_error_reporter b/storage/ndb/tools/ndb_error_reporter index 7ad7a2f478a..1af3bf83469 100644 --- a/storage/ndb/tools/ndb_error_reporter +++ b/storage/ndb/tools/ndb_error_reporter @@ -1,5 +1,20 @@ #!/usr/bin/perl -w +# Copyright (C) 2005 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + use strict; if(@ARGV < 1) diff --git a/storage/ndb/tools/rgrep b/storage/ndb/tools/rgrep index 212b068639d..b1ed4fb6f5e 100755 --- a/storage/ndb/tools/rgrep +++ b/storage/ndb/tools/rgrep @@ -1,5 +1,20 @@ #!/vobs/wds/swt/bin/perl +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + die "Usage: rgrep [-iredblLn] regexp filepat ...\n rgrep -h for help\n" if $#ARGV < $[; |