Browse Source
branches/zip: Merge revisions 1402:1493 from trunk.
branches/zip: Merge revisions 1402:1493 from trunk.
Remove mysql.patch, because the configuration parameter interface has changed.pull/73/head
marko
19 years ago
61 changed files with 1156 additions and 1576 deletions
-
233Makefile.am
-
25btr/Makefile.am
-
25buf/Makefile.am
-
25data/Makefile.am
-
2data/data0data.c
-
26dict/Makefile.am
-
3dict/dict0crea.c
-
2dict/dict0dict.c
-
25dyn/Makefile.am
-
25eval/Makefile.am
-
25fil/Makefile.am
-
26fsp/Makefile.am
-
25fut/Makefile.am
-
25ha/Makefile.am
-
28handler/Makefile.am
-
1110handler/ha_innodb.cc
-
37handler/ha_innodb.h
-
25ibuf/Makefile.am
-
56ibuf/ibuf0ibuf.c
-
10include/Makefile.i
-
5include/db0err.h
-
16include/ha_prototypes.h
-
3include/os0file.h
-
14include/row0mysql.h
-
4include/srv0srv.h
-
24include/trx0trx.h
-
13include/trx0undo.h
-
25lock/Makefile.am
-
6lock/lock0lock.c
-
25log/Makefile.am
-
25mach/Makefile.am
-
27mem/Makefile.am
-
25mtr/Makefile.am
-
36mysql-test/innodb.result
-
35mysql-test/innodb.test
-
72mysql.patch
-
25os/Makefile.am
-
16os/os0file.c
-
25page/Makefile.am
-
27pars/Makefile.am
-
33plug.in
-
25que/Makefile.am
-
25read/Makefile.am
-
25rem/Makefile.am
-
27row/Makefile.am
-
24row/row0ins.c
-
24row/row0mysql.c
-
27row/row0sel.c
-
2setup.sh
-
25srv/Makefile.am
-
38srv/srv0srv.c
-
6srv/srv0start.c
-
25sync/Makefile.am
-
25thr/Makefile.am
-
26trx/Makefile.am
-
18trx/trx0rec.c
-
4trx/trx0trx.c
-
96trx/trx0undo.c
-
25usr/Makefile.am
-
25ut/Makefile.am
-
1ut/ut0ut.c
@ -1,25 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
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.% |
|||
@ -1,25 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = libbuf.a |
|||
|
|||
libbuf_a_SOURCES = buf0buf.c buf0buddy.c buf0flu.c buf0lru.c buf0rea.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,25 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = libdata.a |
|||
|
|||
libdata_a_SOURCES = data0data.c data0type.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,26 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = libdict.a |
|||
|
|||
libdict_a_SOURCES = dict0boot.c dict0crea.c dict0dict.c dict0load.c\
|
|||
dict0mem.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,25 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = libdyn.a |
|||
|
|||
libdyn_a_SOURCES = dyn0dyn.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,25 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = libeval.a |
|||
|
|||
libeval_a_SOURCES = eval0eval.c eval0proc.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,25 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = libfil.a |
|||
|
|||
libfil_a_SOURCES = fil0fil.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,26 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = libfsp.a |
|||
|
|||
libfsp_a_SOURCES = fsp0fsp.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,25 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = libfut.a |
|||
|
|||
libfut_a_SOURCES = fut0fut.c fut0lst.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,25 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = libha.a |
|||
|
|||
libha_a_SOURCES = ha0ha.c hash0hash.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,28 +0,0 @@ |
|||
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult 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; 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 ../include/Makefile.i |
|||
|
|||
DEFS = -DMYSQL_SERVER @DEFS@ |
|||
|
|||
noinst_LIBRARIES = libhandler.a |
|||
|
|||
libhandler_a_SOURCES = ha_innodb.cc |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
1110
handler/ha_innodb.cc
File diff suppressed because it is too large
View File
File diff suppressed because it is too large
View File
@ -1,25 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = libibuf.a |
|||
|
|||
libibuf_a_SOURCES = ibuf0ibuf.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,10 +0,0 @@ |
|||
# Makefile included in Makefile.am in every subdirectory
|
|||
|
|||
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
|
|||
-I$(top_srcdir)/regex \
|
|||
-I$(top_srcdir)/storage/innobase/include \
|
|||
-I$(top_srcdir)/sql \
|
|||
-I$(srcdir) |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,25 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = liblock.a |
|||
|
|||
liblock_a_SOURCES = lock0lock.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,25 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = liblog.a |
|||
|
|||
liblog_a_SOURCES = log0log.c log0recv.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,25 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = libmach.a |
|||
|
|||
libmach_a_SOURCES = mach0data.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,27 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = libmem.a |
|||
|
|||
libmem_a_SOURCES = mem0mem.c mem0pool.c |
|||
|
|||
EXTRA_DIST = mem0dbg.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,25 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = libmtr.a |
|||
|
|||
libmtr_a_SOURCES = mtr0mtr.c mtr0log.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,72 +0,0 @@ |
|||
diff -pu mysql-5.1-bk/sql/mysqld.cc mysql-5.1-zip/sql/mysqld.cc
|
|||
--- mysql-5.1-bk/sql/mysqld.cc 2006-11-09 16:01:19.000000000 +0200
|
|||
+++ mysql-5.1-zip/sql/mysqld.cc 2006-11-13 12:54:04.000000000 +0200
|
|||
@@ -370,7 +370,6 @@ extern long innobase_lock_scan_time;
|
|||
extern long innobase_mirrored_log_groups, innobase_log_files_in_group; |
|||
extern longlong innobase_log_file_size; |
|||
extern long innobase_log_buffer_size; |
|||
-extern longlong innobase_buffer_pool_size;
|
|||
extern long innobase_additional_mem_pool_size; |
|||
extern long innobase_file_io_threads, innobase_lock_wait_timeout; |
|||
extern long innobase_force_recovery; |
|||
@@ -390,6 +389,8 @@ extern "C" {
|
|||
extern ulong srv_max_buf_pool_modified_pct; |
|||
extern ulong srv_max_purge_lag; |
|||
extern ulong srv_auto_extend_increment; |
|||
+extern ulong srv_buf_pool_curr_size;
|
|||
+extern ulong srv_buf_pool_size;
|
|||
extern ulong srv_n_spin_wait_rounds; |
|||
extern ulong srv_n_free_tickets_to_enter; |
|||
extern ulong srv_thread_sleep_delay; |
|||
@@ -5801,9 +5802,9 @@ log and this option does nothing anymore
|
|||
(gptr*) &srv_auto_extend_increment, |
|||
0, GET_LONG, REQUIRED_ARG, 8L, 1L, 1000L, 0, 1L, 0}, |
|||
{"innodb_buffer_pool_size", OPT_INNODB_BUFFER_POOL_SIZE, |
|||
- "The size of the memory buffer InnoDB uses to cache data and indexes of its tables.",
|
|||
- (gptr*) &innobase_buffer_pool_size, (gptr*) &innobase_buffer_pool_size, 0,
|
|||
- GET_LL, REQUIRED_ARG, 8*1024*1024L, 1024*1024L, LONGLONG_MAX, 0,
|
|||
+ "The requested size of the memory buffer InnoDB uses to cache data and indexes of its tables.",
|
|||
+ (gptr*) &srv_buf_pool_size, (gptr*) &srv_buf_pool_size, 0,
|
|||
+ GET_LL, REQUIRED_ARG, 8*1024*1024L, 5*1024*1024L, LONGLONG_MAX, 0,
|
|||
1024*1024L, 0}, |
|||
{"innodb_commit_concurrency", OPT_INNODB_COMMIT_CONCURRENCY, |
|||
"Helps in performance tuning in heavily concurrent environments.", |
|||
diff -pu mysql-5.1-bk/sql/set_var.cc mysql-5.1-zip/sql/set_var.cc
|
|||
--- mysql-5.1-bk/sql/set_var.cc 2006-11-09 16:01:19.000000000 +0200
|
|||
+++ mysql-5.1-zip/sql/set_var.cc 2006-11-13 12:54:05.000000000 +0200
|
|||
@@ -65,7 +65,6 @@ extern ulong innobase_fast_shutdown;
|
|||
extern long innobase_mirrored_log_groups, innobase_log_files_in_group; |
|||
extern longlong innobase_log_file_size; |
|||
extern long innobase_log_buffer_size; |
|||
-extern longlong innobase_buffer_pool_size;
|
|||
extern long innobase_additional_mem_pool_size; |
|||
extern long innobase_file_io_threads, innobase_lock_wait_timeout; |
|||
extern long innobase_force_recovery; |
|||
@@ -81,6 +80,8 @@ extern my_bool innobase_log_archive,
|
|||
innobase_locks_unsafe_for_binlog; |
|||
|
|||
extern "C" { |
|||
+extern ulong srv_buf_pool_curr_size;
|
|||
+extern ulong srv_buf_pool_size;
|
|||
extern ulong srv_max_buf_pool_modified_pct; |
|||
extern ulong srv_max_purge_lag; |
|||
extern ulong srv_auto_extend_increment; |
|||
@@ -499,6 +500,8 @@ sys_var_thd_bool sys_innodb_support_xa("
|
|||
&SV::innodb_support_xa); |
|||
sys_var_long_ptr sys_innodb_autoextend_increment("innodb_autoextend_increment", |
|||
&srv_auto_extend_increment); |
|||
+sys_var_long_ptr sys_innodb_buffer_pool_size("innodb_buffer_pool_size",
|
|||
+ &srv_buf_pool_size);
|
|||
sys_var_long_ptr sys_innodb_sync_spin_loops("innodb_sync_spin_loops", |
|||
&srv_n_spin_wait_rounds); |
|||
sys_var_long_ptr sys_innodb_concurrency_tickets("innodb_concurrency_tickets", |
|||
@@ -818,7 +821,8 @@ SHOW_VAR init_vars[]= {
|
|||
#ifdef WITH_INNOBASE_STORAGE_ENGINE |
|||
{"innodb_additional_mem_pool_size", (char*) &innobase_additional_mem_pool_size, SHOW_LONG }, |
|||
{sys_innodb_autoextend_increment.name, (char*) &sys_innodb_autoextend_increment, SHOW_SYS}, |
|||
- {"innodb_buffer_pool_size", (char*) &innobase_buffer_pool_size, SHOW_LONGLONG },
|
|||
+ {sys_innodb_buffer_pool_size.name, (char*) &sys_innodb_buffer_pool_size, SHOW_SYS },
|
|||
+ {"innodb_buffer_pool_curr_size", (char*) &srv_buf_pool_curr_size, SHOW_LONGLONG },
|
|||
{"innodb_checksums", (char*) &innobase_use_checksums, SHOW_MY_BOOL}, |
|||
{sys_innodb_commit_concurrency.name, (char*) &sys_innodb_commit_concurrency, SHOW_SYS}, |
|||
{sys_innodb_concurrency_tickets.name, (char*) &sys_innodb_concurrency_tickets, SHOW_SYS}, |
|||
@ -1,25 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = libos.a |
|||
|
|||
libos_a_SOURCES = os0proc.c os0sync.c os0thread.c os0file.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,25 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = libpage.a |
|||
|
|||
libpage_a_SOURCES = page0page.c page0cur.c page0zip.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,27 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = libpars.a |
|||
|
|||
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.% |
|||
@ -1,25 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = libque.a |
|||
|
|||
libque_a_SOURCES = que0que.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,25 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = libread.a |
|||
|
|||
libread_a_SOURCES = read0read.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,25 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = librem.a |
|||
|
|||
librem_a_SOURCES = rem0rec.c rem0cmp.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,27 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = librow.a |
|||
|
|||
librow_a_SOURCES = row0ext.c row0merge.c\
|
|||
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.% |
|||
@ -1,25 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = libsrv.a |
|||
|
|||
libsrv_a_SOURCES = srv0srv.c srv0que.c srv0start.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,25 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = libsync.a |
|||
|
|||
libsync_a_SOURCES = sync0arr.c sync0rw.c sync0sync.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,25 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = libthr.a |
|||
|
|||
libthr_a_SOURCES = thr0loc.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,26 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = libtrx.a |
|||
|
|||
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.% |
|||
@ -1,25 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = libusr.a |
|||
|
|||
libusr_a_SOURCES = usr0sess.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
@ -1,25 +0,0 @@ |
|||
# 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; 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 ../include/Makefile.i |
|||
|
|||
noinst_LIBRARIES = libut.a |
|||
|
|||
libut_a_SOURCES = ut0byte.c ut0dbg.c ut0mem.c ut0rnd.c ut0ut.c ut0vec.c ut0list.c ut0wqueue.c |
|||
|
|||
EXTRA_PROGRAMS = |
|||
|
|||
# Don't update the files from bitkeeper
|
|||
%::SCCS/s.% |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue