diff options
Diffstat (limited to 'innobase')
41 files changed, 171 insertions, 137 deletions
diff --git a/innobase/CMakeLists.txt b/innobase/CMakeLists.txt index ae6f1bf21e5..21b9210a73e 100755 --- a/innobase/CMakeLists.txt +++ b/innobase/CMakeLists.txt @@ -1,3 +1,18 @@ +# Copyright (C) 2006 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 + #SET(CMAKE_CXX_FLAGS_DEBUG "-DSAFEMALLOC -DSAFE_MUTEX") #SET(CMAKE_C_FLAGS_DEBUG "-DSAFEMALLOC -DSAFE_MUTEX") ADD_DEFINITIONS(-DMYSQL_SERVER -D_WIN32 -DWIN32 -D_LIB) diff --git a/innobase/Makefile.am b/innobase/Makefile.am index 10e793396d8..82bd44ba207 100644 --- a/innobase/Makefile.am +++ b/innobase/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2004, 2006 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 diff --git a/innobase/btr/Makefile.am b/innobase/btr/Makefile.am index ed61facb695..6b09b289cdc 100644 --- a/innobase/btr/Makefile.am +++ b/innobase/btr/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -22,3 +20,6 @@ noinst_LIBRARIES = libbtr.a libbtr_a_SOURCES = btr0btr.c btr0cur.c btr0pcur.c btr0sea.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/buf/Makefile.am b/innobase/buf/Makefile.am index 3f56c8b02d7..946d5a2e5c2 100644 --- a/innobase/buf/Makefile.am +++ b/innobase/buf/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -22,3 +20,6 @@ noinst_LIBRARIES = libbuf.a libbuf_a_SOURCES = buf0buf.c buf0flu.c buf0lru.c buf0rea.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/buf/buf0buf.c b/innobase/buf/buf0buf.c index f24f1744363..ff7622aca81 100644 --- a/innobase/buf/buf0buf.c +++ b/innobase/buf/buf0buf.c @@ -649,7 +649,7 @@ buf_pool_init( } } - buf_pool->page_hash = hash_create(2 * max_size); + buf_pool->page_hash = hash0_create(2 * max_size); buf_pool->n_pend_reads = 0; diff --git a/innobase/data/Makefile.am b/innobase/data/Makefile.am index eeb6f129de0..6f9407d40e5 100644 --- a/innobase/data/Makefile.am +++ b/innobase/data/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -22,3 +20,6 @@ noinst_LIBRARIES = libdata.a libdata_a_SOURCES = data0data.c data0type.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/dict/Makefile.am b/innobase/dict/Makefile.am index 0034d2f8f1e..15cacca6f58 100644 --- a/innobase/dict/Makefile.am +++ b/innobase/dict/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -23,3 +21,6 @@ libdict_a_SOURCES = dict0boot.c dict0crea.c dict0dict.c dict0load.c\ dict0mem.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/dict/dict0dict.c b/innobase/dict/dict0dict.c index ba03e1f5e41..4ceeb4cafc0 100644 --- a/innobase/dict/dict0dict.c +++ b/innobase/dict/dict0dict.c @@ -708,13 +708,13 @@ dict_init(void) mutex_create(&(dict_sys->mutex)); mutex_set_level(&(dict_sys->mutex), SYNC_DICT); - dict_sys->table_hash = hash_create(buf_pool_get_max_size() / + dict_sys->table_hash = hash0_create(buf_pool_get_max_size() / (DICT_POOL_PER_TABLE_HASH * UNIV_WORD_SIZE)); - dict_sys->table_id_hash = hash_create(buf_pool_get_max_size() / + dict_sys->table_id_hash = hash0_create(buf_pool_get_max_size() / (DICT_POOL_PER_TABLE_HASH * UNIV_WORD_SIZE)); - dict_sys->col_hash = hash_create(buf_pool_get_max_size() / + dict_sys->col_hash = hash0_create(buf_pool_get_max_size() / (DICT_POOL_PER_COL_HASH * UNIV_WORD_SIZE)); dict_sys->size = 0; diff --git a/innobase/dyn/Makefile.am b/innobase/dyn/Makefile.am index ec33a3c18a9..57d9a25e481 100644 --- a/innobase/dyn/Makefile.am +++ b/innobase/dyn/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -22,3 +20,6 @@ noinst_LIBRARIES = libdyn.a libdyn_a_SOURCES = dyn0dyn.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/eval/Makefile.am b/innobase/eval/Makefile.am index aebffb91be3..6c2b05d8b7a 100644 --- a/innobase/eval/Makefile.am +++ b/innobase/eval/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -22,3 +20,6 @@ noinst_LIBRARIES = libeval.a libeval_a_SOURCES = eval0eval.c eval0proc.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/fil/Makefile.am b/innobase/fil/Makefile.am index dc0baff7d1a..0a85ceb5b86 100644 --- a/innobase/fil/Makefile.am +++ b/innobase/fil/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -22,3 +20,6 @@ noinst_LIBRARIES = libfil.a libfil_a_SOURCES = fil0fil.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/fil/fil0fil.c b/innobase/fil/fil0fil.c index 65320b57183..460a2c9f7b8 100644 --- a/innobase/fil/fil0fil.c +++ b/innobase/fil/fil0fil.c @@ -1294,8 +1294,8 @@ fil_system_create( mutex_set_level(&(system->mutex), SYNC_ANY_LATCH); - system->spaces = hash_create(hash_size); - system->name_hash = hash_create(hash_size); + system->spaces = hash0_create(hash_size); + system->name_hash = hash0_create(hash_size); UT_LIST_INIT(system->LRU); diff --git a/innobase/fsp/Makefile.am b/innobase/fsp/Makefile.am index edf06bda0d6..7818cdafc1b 100644 --- a/innobase/fsp/Makefile.am +++ b/innobase/fsp/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -23,3 +21,6 @@ noinst_LIBRARIES = libfsp.a libfsp_a_SOURCES = fsp0fsp.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/fut/Makefile.am b/innobase/fut/Makefile.am index 839fdb1580e..ffe9835a023 100644 --- a/innobase/fut/Makefile.am +++ b/innobase/fut/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -22,3 +20,6 @@ noinst_LIBRARIES = libfut.a libfut_a_SOURCES = fut0fut.c fut0lst.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/ha/Makefile.am b/innobase/ha/Makefile.am index 121bafe167d..696cad0b203 100644 --- a/innobase/ha/Makefile.am +++ b/innobase/ha/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -22,3 +20,6 @@ noinst_LIBRARIES = libha.a libha_a_SOURCES = ha0ha.c hash0hash.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/ha/ha0ha.c b/innobase/ha/ha0ha.c index ab565acd64f..4c17f2d4b0e 100644 --- a/innobase/ha/ha0ha.c +++ b/innobase/ha/ha0ha.c @@ -32,7 +32,7 @@ ha_create( hash_table_t* table; ulint i; - table = hash_create(n); + table = hash0_create(n); if (in_btr_search) { table->adaptive = TRUE; diff --git a/innobase/ha/hash0hash.c b/innobase/ha/hash0hash.c index facdea66198..18b5b3cefd6 100644 --- a/innobase/ha/hash0hash.c +++ b/innobase/ha/hash0hash.c @@ -74,7 +74,7 @@ Creates a hash table with >= n array cells. The actual number of cells is chosen to be a prime number slightly bigger than n. */ hash_table_t* -hash_create( +hash0_create( /*========*/ /* out, own: created table */ ulint n) /* in: number of array cells */ diff --git a/innobase/ibuf/Makefile.am b/innobase/ibuf/Makefile.am index fb813d38ee5..42adda9a4ef 100644 --- a/innobase/ibuf/Makefile.am +++ b/innobase/ibuf/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 diff --git a/innobase/include/Makefile.am b/innobase/include/Makefile.am index b83aee06680..8a7efad64f9 100644 --- a/innobase/include/Makefile.am +++ b/innobase/include/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2004-2005 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 diff --git a/innobase/include/hash0hash.h b/innobase/include/hash0hash.h index 51315e40875..3abc05f174c 100644 --- a/innobase/include/hash0hash.h +++ b/innobase/include/hash0hash.h @@ -23,7 +23,7 @@ Creates a hash table with >= n array cells. The actual number of cells is chosen to be a prime number slightly bigger than n. */ hash_table_t* -hash_create( +hash0_create( /*========*/ /* out, own: created table */ ulint n); /* in: number of array cells */ diff --git a/innobase/lock/Makefile.am b/innobase/lock/Makefile.am index 549eb2604e3..4c6caa49853 100644 --- a/innobase/lock/Makefile.am +++ b/innobase/lock/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -22,3 +20,6 @@ noinst_LIBRARIES = liblock.a liblock_a_SOURCES = lock0lock.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/lock/lock0lock.c b/innobase/lock/lock0lock.c index 06475c8ef7e..52bb369d479 100644 --- a/innobase/lock/lock0lock.c +++ b/innobase/lock/lock0lock.c @@ -584,7 +584,7 @@ lock_sys_create( { lock_sys = mem_alloc(sizeof(lock_sys_t)); - lock_sys->rec_hash = hash_create(n_cells); + lock_sys->rec_hash = hash0_create(n_cells); /* hash_create_mutexes(lock_sys->rec_hash, 2, SYNC_REC_LOCK); */ diff --git a/innobase/log/Makefile.am b/innobase/log/Makefile.am index 2dbaf93e6d9..a40572a64da 100644 --- a/innobase/log/Makefile.am +++ b/innobase/log/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -22,3 +20,6 @@ noinst_LIBRARIES = liblog.a liblog_a_SOURCES = log0log.c log0recv.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/log/log0recv.c b/innobase/log/log0recv.c index c1ceb9791f2..e92b65ed139 100644 --- a/innobase/log/log0recv.c +++ b/innobase/log/log0recv.c @@ -148,7 +148,7 @@ recv_sys_init( recv_sys->len = 0; recv_sys->recovered_offset = 0; - recv_sys->addr_hash = hash_create(available_memory / 64); + recv_sys->addr_hash = hash0_create(available_memory / 64); recv_sys->n_addrs = 0; recv_sys->apply_log_recs = FALSE; @@ -187,7 +187,7 @@ recv_sys_empty_hash(void) hash_table_free(recv_sys->addr_hash); mem_heap_empty(recv_sys->heap); - recv_sys->addr_hash = hash_create(buf_pool_get_curr_size() / 256); + recv_sys->addr_hash = hash0_create(buf_pool_get_curr_size() / 256); } /************************************************************ diff --git a/innobase/mach/Makefile.am b/innobase/mach/Makefile.am index ce827c8033f..1a59cb3e4d7 100644 --- a/innobase/mach/Makefile.am +++ b/innobase/mach/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -22,3 +20,6 @@ noinst_LIBRARIES = libmach.a libmach_a_SOURCES = mach0data.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/mem/Makefile.am b/innobase/mem/Makefile.am index 10b7771b580..598dbb96124 100644 --- a/innobase/mem/Makefile.am +++ b/innobase/mem/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -24,3 +22,6 @@ libmem_a_SOURCES = mem0mem.c mem0pool.c EXTRA_DIST = mem0dbg.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/mtr/Makefile.am b/innobase/mtr/Makefile.am index 1e93a34ce23..80eb7c907be 100644 --- a/innobase/mtr/Makefile.am +++ b/innobase/mtr/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -22,3 +20,6 @@ noinst_LIBRARIES = libmtr.a libmtr_a_SOURCES = mtr0mtr.c mtr0log.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/os/Makefile.am b/innobase/os/Makefile.am index 3b09a10efb5..d5c45eba54e 100644 --- a/innobase/os/Makefile.am +++ b/innobase/os/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003-2004 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 diff --git a/innobase/page/Makefile.am b/innobase/page/Makefile.am index 2e260787438..1a5b202a2c9 100644 --- a/innobase/page/Makefile.am +++ b/innobase/page/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -22,3 +20,6 @@ noinst_LIBRARIES = libpage.a libpage_a_SOURCES = page0page.c page0cur.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/pars/Makefile.am b/innobase/pars/Makefile.am index 2356f330486..b10796c3d5e 100644 --- a/innobase/pars/Makefile.am +++ b/innobase/pars/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -24,3 +22,6 @@ noinst_HEADERS = pars0grm.h libpars_a_SOURCES = pars0grm.c lexyy.c pars0opt.c pars0pars.c pars0sym.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/que/Makefile.am b/innobase/que/Makefile.am index d9c046b4f4c..73f3fb07af4 100644 --- a/innobase/que/Makefile.am +++ b/innobase/que/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -22,3 +20,6 @@ noinst_LIBRARIES = libque.a libque_a_SOURCES = que0que.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/read/Makefile.am b/innobase/read/Makefile.am index 7edf2a5a2e1..1e56a9716c3 100644 --- a/innobase/read/Makefile.am +++ b/innobase/read/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -22,3 +20,6 @@ noinst_LIBRARIES = libread.a libread_a_SOURCES = read0read.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/rem/Makefile.am b/innobase/rem/Makefile.am index e2b2fdaf669..1026172b815 100644 --- a/innobase/rem/Makefile.am +++ b/innobase/rem/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -22,3 +20,6 @@ noinst_LIBRARIES = librem.a librem_a_SOURCES = rem0rec.c rem0cmp.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/row/Makefile.am b/innobase/row/Makefile.am index bd09f9a237d..6c1f960055d 100644 --- a/innobase/row/Makefile.am +++ b/innobase/row/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -23,3 +21,6 @@ librow_a_SOURCES = row0ins.c row0mysql.c row0purge.c row0row.c row0sel.c\ row0uins.c row0umod.c row0undo.c row0upd.c row0vers.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/srv/Makefile.am b/innobase/srv/Makefile.am index 752683b82b8..e0b5b911b04 100644 --- a/innobase/srv/Makefile.am +++ b/innobase/srv/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003-2004 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -22,3 +20,6 @@ noinst_LIBRARIES = libsrv.a libsrv_a_SOURCES = srv0srv.c srv0que.c srv0start.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/sync/Makefile.am b/innobase/sync/Makefile.am index c95955a733b..7cf274b64e8 100644 --- a/innobase/sync/Makefile.am +++ b/innobase/sync/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003-2004 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -22,3 +20,6 @@ noinst_LIBRARIES = libsync.a libsync_a_SOURCES = sync0arr.c sync0rw.c sync0sync.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/thr/Makefile.am b/innobase/thr/Makefile.am index 62c39492c07..febcdf3e1a3 100644 --- a/innobase/thr/Makefile.am +++ b/innobase/thr/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -22,3 +20,6 @@ noinst_LIBRARIES = libthr.a libthr_a_SOURCES = thr0loc.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/thr/thr0loc.c b/innobase/thr/thr0loc.c index 033bb22807f..f71048af2ba 100644 --- a/innobase/thr/thr0loc.c +++ b/innobase/thr/thr0loc.c @@ -224,7 +224,7 @@ thr_local_init(void) ut_a(thr_local_hash == NULL); - thr_local_hash = hash_create(OS_THREAD_MAX_N + 100); + thr_local_hash = hash0_create(OS_THREAD_MAX_N + 100); mutex_create(&thr_local_mutex); mutex_set_level(&thr_local_mutex, SYNC_THR_LOCAL); diff --git a/innobase/trx/Makefile.am b/innobase/trx/Makefile.am index 9e2b3c398e3..f9722454ef5 100644 --- a/innobase/trx/Makefile.am +++ b/innobase/trx/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -23,3 +21,6 @@ libtrx_a_SOURCES = trx0purge.c trx0rec.c trx0roll.c trx0rseg.c\ trx0sys.c trx0trx.c trx0undo.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/usr/Makefile.am b/innobase/usr/Makefile.am index bdcc832a76e..ea485022f71 100644 --- a/innobase/usr/Makefile.am +++ b/innobase/usr/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -22,3 +20,6 @@ noinst_LIBRARIES = libusr.a libusr_a_SOURCES = usr0sess.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/innobase/ut/Makefile.am b/innobase/ut/Makefile.am index 2fdbb99e0f3..41ba85f5836 100644 --- a/innobase/ut/Makefile.am +++ b/innobase/ut/Makefile.am @@ -1,10 +1,8 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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; either version 2 of the License, or -# (at your option) any later version. +# 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 @@ -22,3 +20,6 @@ noinst_LIBRARIES = libut.a libut_a_SOURCES = ut0byte.c ut0dbg.c ut0mem.c ut0rnd.c ut0ut.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% |