Commit d37bcf7b authored by monty@narttu.mysql.fi's avatar monty@narttu.mysql.fi

Merge

parents c7581d29 e2e483c3
.deps
.o
*.o
Makefile
Makefile.in'
Makefile.in
libmysql/*.c
*.lo
*.la
core
*.a *.a
*.la
*.lo
*.o
*.spec
*~ *~
mysql-test/var/lib/mysql .deps
mysql-test/var/lib/mysql/* .gdb_history
aclocal.m4 .o
config.h.in
configure
config.log
config.h
config.cache
libtool
config.status
stamp-h
INSTALL-SOURCE
linked_include_sources
linked_libmysql_sources
linked_client_sources
linked_server_sources
COPYING
COPYING.LIB
MIRRORS
BitKeeper/etc/pushed
BitKeeper/etc/csets BitKeeper/etc/csets
BitKeeper/etc/csets-in
BitKeeper/etc/csets-out
BitKeeper/etc/gone BitKeeper/etc/gone
include/mysql_version.h BitKeeper/etc/pushed
include/my_config.h BitKeeper/tmp/bkOF1wtJ
include/my_global.h BitKeeper/tmp/gone
COPYING
COPYING.LIB
Docs/INSTALL-BINARY
Docs/include.texi Docs/include.texi
Docs/manual.txt
Docs/mysql.info
Docs/manual_toc.html
Docs/manual.html Docs/manual.html
Docs/INSTALL-BINARY Docs/manual.log
Docs/manual.pdf Docs/manual.pdf
client/mysql Docs/manual.txt
client/mysqladmin Docs/manual_toc.html
client/mysqlshow Docs/mysql.info
client/mysqldump INSTALL-SOURCE
client/mysqlimport MIRRORS
client/mysqltest Makefile
client/insert_test Makefile.in
client/select_test Makefile.in'
client/thread_test PENDING/*
strings/ctype_autoconf.c
strings/conf_to_src
strings/ctype_extra_sources.c
mysys/testhash
mysys/test_charset
mysys/test_thr_alarm
mysys/test_thr_lock
extra/replace
extra/comp_err
extra/perror
extra/resolveip
extra/my_print_defaults
regex/re
isam/isamchk
isam/isamlog
isam/pack_isam
isam/test1
isam/test2
isam/test3
myisam/myisamchk
myisam/myisamlog
myisam/myisampack
myisam/mi_test1
myisam/mi_test2
myisam/mi_test3
myisam/ft_test1
myisam/ft_eval
myisam/mi_test_all
heap/hp_test1
heap/hp_test2
sql/mini_client_errors.c
sql/sql_yacc.cc
sql/sql_yacc.h
sql/mysqlbinlog
sql/gen_lex_hash
sql/lex_hash.h
sql/mysqld
sql/.gdb_history
scripts/mysql_install_db
scripts/safe_mysqld
scripts/mysql_config
scripts/msql2mysql
scripts/mysqlhotcopy
scripts/mysqlbug
scripts/mysql_fix_privilege_tables
scripts/mysql_setpermission
scripts/mysql_zap
scripts/mysqlaccess
scripts/mysql_convert_table_format
scripts/mysql_find_rows
scripts/make_binary_distribution
sql-bench/test-connect
sql-bench/test-ATIS
sql-bench/test-big-tables
sql-bench/test-create
sql-bench/test-insert
sql-bench/test-alter-table
sql-bench/test-select
sql-bench/test-wisconsin
sql-bench/compare-results
sql-bench/bench-init.pl
sql-bench/run-all-tests
sql-bench/server-cfg
sql-bench/crash-me
sql-bench/copy-db
support-files/mysql-log-rotate
support-files/my-small.cnf
support-files/my-medium.cnf
support-files/my-large.cnf
support-files/my-huge.cnf
support-files/mysql.server
support-files/mysql.spec
support-files/mysql-3.23.25-beta.spec
support-files/binary-configure
libmysql/mysys_priv.h
libmysql/my_static.h
libmysql/conf_to_src
libmysql/.libs/libmysqlclient.lai
mysql-test/share/mysql
mysql-test/var/lib/log.txt
mysql-test/var/lib/mysql-bin.001
mysql-test/var/lib/mysql-bin.index
mysql-test/var/lib/mysql-slow.log
mysql-test/var/lib/mysql-bin.002
mysql-test/var/lib/mysql-bin.003
mysql-test/var/lib/mysql-bin.004
mysql-test/var/lib/mysql-bin.005
mysql-test/var/lib/test/t.frm
mysql-test/var/lib/test/t.MYI
mysql-test/var/lib/test/t.MYD
mysql-test/var/lib/test/emails.frm
mysql-test/var/lib/test/emails.MYI
mysql-test/var/lib/test/emails.MYD
mysql-test/var/lib/test/domain.frm
mysql-test/var/lib/test/domain.MYI
mysql-test/var/lib/test/domain.MYD
mysql-test/var/log/mysqld.err
mysql-test/var/log/mysqld.log
PENDING/2000-10-11.01 PENDING/2000-10-11.01
PENDING/2000-10-11.02 PENDING/2000-10-11.02
PENDING/2000-10-11.03 PENDING/2000-10-11.03
PENDING/2000-10-11.04 PENDING/2000-10-11.04
PENDING/2000-10-11.05 PENDING/2000-10-11.05
PENDING/2000-10-11.06 PENDING/2000-10-11.06
BitKeeper/etc/csets-out
BitKeeper/etc/csets-in
support-files/mysql-3.23.26-beta.spec
include/.my_sys.h.swp
PENDING/2000-10-25.01 PENDING/2000-10-25.01
PENDING/2000-10-25.02 PENDING/2000-10-25.02
support-files/mysql-3.23.27-beta.spec
.gdb_history
mysql-test/r/3.23/sel000004.result.reject
mysql-test/var/lib/mysql-bin.006
mysql-test/var/lib/test/elt_ck1.frm
mysql-test/var/lib/test/elt_ck1.MYD
mysql-test/var/lib/test/elt_ck1.MYI
mysql-test/var/lib/test/elt_ck2.frm
mysql-test/var/lib/test/elt_ck2.MYD
mysql-test/var/lib/test/elt_ck2.MYI
repl-tests/test-repl-ts/repl-timestamp.master.reject
client/.mysqladmin.c.swp
repl-tests/test-repl/sum-wlen-slave.master.reje
support-files/mysql-3.23.28-gamma.spec
repl-tests/test-repl/foo-dump-slave.master.
repl-tests/test-repl/sum-wlen-slave.master.
repl-tests/test-repl/sum-wlen-slave.master.re
mysql-test/var/lib/test/foo.frm
mysql-test/var/lib/test/foo.MYD
mysql-test/var/lib/test/foo.MYI
mysql-test/var/lib/test/test.frm
mysql-test/var/lib/test/test.MYD
mysql-test/var/lib/test/test.MYI
mysql-test/var/lib/test/words1.frm
mysql-test/var/lib/test/words1.MYD
mysql-test/var/lib/test/words1.MYI
mysql-test/var/lib/test/words.frm
mysql-test/var/lib/test/words.MYD
mysql-test/var/lib/test/words.MYI
mysql-test/var/lib/test/x.frm
mysql-test/var/lib/test/x.MYD
mysql-test/var/lib/test/x.MYI
mysql-test/var/log/mysqld-slave.err
mysql-test/var/log/mysqld-slave.log
mysql-test/var/slave-data/master.info
mysql-test/var/slave-data/mysql/columns_priv.frm
mysql-test/var/slave-data/mysql/columns_priv.MYD
mysql-test/var/slave-data/mysql/columns_priv.MYI
mysql-test/var/slave-data/mysql/db.frm
mysql-test/var/slave-data/mysql/db.MYD
mysql-test/var/slave-data/mysql/db.MYI
mysql-test/var/slave-data/mysql/func.frm
mysql-test/var/slave-data/mysql/func.MYD
mysql-test/var/slave-data/mysql/func.MYI
mysql-test/var/slave-data/mysql/host.frm
mysql-test/var/slave-data/mysql/host.MYD
mysql-test/var/slave-data/mysql/host.MYI
mysql-test/var/slave-data/mysql/tables_priv.frm
mysql-test/var/slave-data/mysql/tables_priv.MYD
mysql-test/var/slave-data/mysql/tables_priv.MYI
mysql-test/var/slave-data/mysql/user.frm
mysql-test/var/slave-data/mysql/user.MYD
mysql-test/var/slave-data/mysql/user.MYI
mysql-test/var/slave-data/test/domain.frm
mysql-test/var/slave-data/test/domain.MYD
mysql-test/var/slave-data/test/domain.MYI
mysql-test/var/slave-data/test/elt_ck1.frm
mysql-test/var/slave-data/test/elt_ck1.MYD
mysql-test/var/slave-data/test/elt_ck1.MYI
mysql-test/var/slave-data/test/elt_ck2.frm
mysql-test/var/slave-data/test/elt_ck2.MYD
mysql-test/var/slave-data/test/elt_ck2.MYI
mysql-test/var/slave-data/test/emails.frm
mysql-test/var/slave-data/test/emails.MYD
mysql-test/var/slave-data/test/emails.MYI
mysql-test/var/slave-data/test/foo.frm
mysql-test/var/slave-data/test/foo.MYD
mysql-test/var/slave-data/test/foo.MYI
mysql-test/var/slave-data/test/test.frm
mysql-test/var/slave-data/test/test.MYD
mysql-test/var/slave-data/test/test.MYI
mysql-test/var/slave-data/test/t.frm
mysql-test/var/slave-data/test/t.MYD
mysql-test/var/slave-data/test/t.MYI
mysql-test/var/slave-data/test/words1.frm
mysql-test/var/slave-data/test/words1.MYD
mysql-test/var/slave-data/test/words1.MYI
mysql-test/var/slave-data/test/words.frm
mysql-test/var/slave-data/test/words.MYD
mysql-test/var/slave-data/test/words.MYI
mysql-test/var/slave-data/test/x.frm
mysql-test/var/slave-data/test/x.MYD
mysql-test/var/slave-data/test/x.MYI
PENDING/2000-11-17.01 PENDING/2000-11-17.01
BitKeeper/tmp/gone aclocal.m4
mysql-test/r/3.23/rpl client/.mysqladmin.c.swp
mysql-test/r/3.23/rpl.reject client/insert_test
mysql-test/var/lib/bar/bar.frm client/mysql
mysql-test/var/lib/bar/bar.MYD client/mysqladmin
mysql-test/var/lib/bar/bar.MYI client/mysqldump
mysql-test/var/lib/foo/foo.frm client/mysqlimport
mysql-test/var/lib/foo/foo.MYD client/mysqlshow
mysql-test/var/lib/foo/foo.MYI client/mysqltest
mysql-test/var/lib/test/bar.frm client/select_test
mysql-test/var/lib/test/bar.MYD client/thimble
mysql-test/var/lib/test/bar.MYI client/thread_test
mysql-test/var/lib/test/choo.frm config.cache
mysql-test/var/lib/test/choo.MYD config.h
mysql-test/var/lib/test/choo.MYI config.h.in
mysql-test/var/slave-data/bar/bar.frm config.log
mysql-test/var/slave-data/bar/bar.MYD config.status
mysql-test/var/slave-data/bar/bar.MYI configure
mysql-test/var/slave-data/foo/foo.frm core
mysql-test/var/slave-data/foo/foo.MYD extra/comp_err
mysql-test/var/slave-data/foo/foo.MYI extra/my_print_defaults
mysql-test/var/slave-data/test/bar.frm extra/perror
mysql-test/var/slave-data/test/bar.MYD extra/replace
mysql-test/var/slave-data/test/bar.MYI extra/resolveip
mysql-test/var/slave-data/test/choo.frm heap/hp_test1
mysql-test/var/slave-data/test/choo.MYD heap/hp_test2
mysql-test/var/slave-data/test/choo.MYI include/.my_sys.h.swp
mysql-test/var/tmp/README include/my_config.h
BitKeeper/tmp/bkOF1wtJ include/my_global.h
scripts/mysqldumpslow include/mysql_version.h
mysql-test/rpl000011.test isam/isamchk
mysql-test/var/lib/mysql-bin.007 isam/isamlog
sql/share/norwegian/errmsg.sys isam/pack_isam
sql/share/norwegian-ny/errmsg.sys isam/test1
mysql-test/r/3.23/rpl000001.b.result.reject isam/test2
mysql-test/r/3.23/rpl000012.result.reject isam/test3
libmysql/*.c
libmysql/.libs/libmysqlclient.lai
libmysql/conf_to_src
libmysql/my_static.h
libmysql/mysys_priv.h
libmysql_r/.libs/libmysqlclient_r.lai
libmysql_r/acconfig.h libmysql_r/acconfig.h
libmysql_r/array.c libmysql_r/array.c
libmysql_r/bchange.c libmysql_r/bchange.c
libmysql_r/bmove.c libmysql_r/bmove.c
libmysql_r/bmove_upp.c libmysql_r/bmove_upp.c
libmysql_r/charset.c libmysql_r/charset.c
libmysql_r/conf_to_src
libmysql_r/conf_to_src.c libmysql_r/conf_to_src.c
libmysql_r/ctype_autoconf.c
libmysql_r/ctype-big5.c libmysql_r/ctype-big5.c
libmysql_r/ctype.c
libmysql_r/ctype-czech.c libmysql_r/ctype-czech.c
libmysql_r/ctype-euc_kr.c libmysql_r/ctype-euc_kr.c
libmysql_r/ctype-gb2312.c libmysql_r/ctype-gb2312.c
...@@ -299,14 +98,17 @@ libmysql_r/ctype-gbk.c ...@@ -299,14 +98,17 @@ libmysql_r/ctype-gbk.c
libmysql_r/ctype-sjis.c libmysql_r/ctype-sjis.c
libmysql_r/ctype-tis620.c libmysql_r/ctype-tis620.c
libmysql_r/ctype-ujis.c libmysql_r/ctype-ujis.c
libmysql_r/ctype.c
libmysql_r/ctype_autoconf.c
libmysql_r/ctype_extra_sources.c
libmysql_r/dbug.c libmysql_r/dbug.c
libmysql_r/default.c libmysql_r/default.c
libmysql_r/dll.c libmysql_r/dll.c
libmysql_r/errmsg.c libmysql_r/errmsg.c
libmysql_r/errors.c libmysql_r/errors.c
libmysql_r/getopt1.c
libmysql_r/getopt.c
libmysql_r/get_password.c libmysql_r/get_password.c
libmysql_r/getopt.c
libmysql_r/getopt1.c
libmysql_r/getvar.c libmysql_r/getvar.c
libmysql_r/int2str.c libmysql_r/int2str.c
libmysql_r/is_prefix.c libmysql_r/is_prefix.c
...@@ -346,9 +148,9 @@ libmysql_r/my_read.c ...@@ -346,9 +148,9 @@ libmysql_r/my_read.c
libmysql_r/my_realloc.c libmysql_r/my_realloc.c
libmysql_r/my_static.c libmysql_r/my_static.c
libmysql_r/my_static.h libmysql_r/my_static.h
libmysql_r/mysys_priv.h
libmysql_r/my_thr_init.c libmysql_r/my_thr_init.c
libmysql_r/my_write.c libmysql_r/my_write.c
libmysql_r/mysys_priv.h
libmysql_r/net.c libmysql_r/net.c
libmysql_r/password.c libmysql_r/password.c
libmysql_r/safemalloc.c libmysql_r/safemalloc.c
...@@ -370,7 +172,210 @@ libmysql_r/strxmov.c ...@@ -370,7 +172,210 @@ libmysql_r/strxmov.c
libmysql_r/thr_mutex.c libmysql_r/thr_mutex.c
libmysql_r/typelib.c libmysql_r/typelib.c
libmysql_r/violite.c libmysql_r/violite.c
libtool
linked_client_sources
linked_include_sources
linked_libmysql_r_sources linked_libmysql_r_sources
client/thimble linked_libmysql_sources
linked_server_sources
myisam/ft_eval
myisam/ft_test1
myisam/mi_test1
myisam/mi_test2
myisam/mi_test3
myisam/mi_test_all
myisam/myisamchk
myisam/myisamlog
myisam/myisampack
mysql-test/r/3.23/rpl
mysql-test/r/3.23/rpl.reject
mysql-test/r/3.23/rpl000001.b.result.reject
mysql-test/r/3.23/rpl000012.result.reject
mysql-test/r/3.23/sel000004.result.reject
mysql-test/rpl000011.test
mysql-test/share/mysql
mysql-test/var/lib/bar/bar.MYD
mysql-test/var/lib/bar/bar.MYI
mysql-test/var/lib/bar/bar.frm
mysql-test/var/lib/foo/foo.MYD
mysql-test/var/lib/foo/foo.MYI
mysql-test/var/lib/foo/foo.frm
mysql-test/var/lib/log.txt
mysql-test/var/lib/mysql
mysql-test/var/lib/mysql-bin.001
mysql-test/var/lib/mysql-bin.002
mysql-test/var/lib/mysql-bin.003
mysql-test/var/lib/mysql-bin.004
mysql-test/var/lib/mysql-bin.005
mysql-test/var/lib/mysql-bin.006
mysql-test/var/lib/mysql-bin.007
mysql-test/var/lib/mysql-bin.index
mysql-test/var/lib/mysql-slow.log
mysql-test/var/lib/mysql/*
mysql-test/var/lib/test/bar.MYD
mysql-test/var/lib/test/bar.MYI
mysql-test/var/lib/test/bar.frm
mysql-test/var/lib/test/choo.MYD
mysql-test/var/lib/test/choo.MYI
mysql-test/var/lib/test/choo.frm
mysql-test/var/lib/test/domain.MYD
mysql-test/var/lib/test/domain.MYI
mysql-test/var/lib/test/domain.frm
mysql-test/var/lib/test/elt_ck1.MYD
mysql-test/var/lib/test/elt_ck1.MYI
mysql-test/var/lib/test/elt_ck1.frm
mysql-test/var/lib/test/elt_ck2.MYD
mysql-test/var/lib/test/elt_ck2.MYI
mysql-test/var/lib/test/elt_ck2.frm
mysql-test/var/lib/test/emails.MYD
mysql-test/var/lib/test/emails.MYI
mysql-test/var/lib/test/emails.frm
mysql-test/var/lib/test/foo.MYD
mysql-test/var/lib/test/foo.MYI
mysql-test/var/lib/test/foo.frm
mysql-test/var/lib/test/t.MYD
mysql-test/var/lib/test/t.MYI
mysql-test/var/lib/test/t.frm
mysql-test/var/lib/test/test.MYD
mysql-test/var/lib/test/test.MYI
mysql-test/var/lib/test/test.frm
mysql-test/var/lib/test/words.MYD
mysql-test/var/lib/test/words.MYI
mysql-test/var/lib/test/words.frm
mysql-test/var/lib/test/words1.MYD
mysql-test/var/lib/test/words1.MYI
mysql-test/var/lib/test/words1.frm
mysql-test/var/lib/test/x.MYD
mysql-test/var/lib/test/x.MYI
mysql-test/var/lib/test/x.frm
mysql-test/var/log/mysqld-slave.err
mysql-test/var/log/mysqld-slave.log
mysql-test/var/log/mysqld.err
mysql-test/var/log/mysqld.log
mysql-test/var/slave-data/bar/bar.MYD
mysql-test/var/slave-data/bar/bar.MYI
mysql-test/var/slave-data/bar/bar.frm
mysql-test/var/slave-data/foo/foo.MYD
mysql-test/var/slave-data/foo/foo.MYI
mysql-test/var/slave-data/foo/foo.frm
mysql-test/var/slave-data/master.info
mysql-test/var/slave-data/mysql/columns_priv.MYD
mysql-test/var/slave-data/mysql/columns_priv.MYI
mysql-test/var/slave-data/mysql/columns_priv.frm
mysql-test/var/slave-data/mysql/db.MYD
mysql-test/var/slave-data/mysql/db.MYI
mysql-test/var/slave-data/mysql/db.frm
mysql-test/var/slave-data/mysql/func.MYD
mysql-test/var/slave-data/mysql/func.MYI
mysql-test/var/slave-data/mysql/func.frm
mysql-test/var/slave-data/mysql/host.MYD
mysql-test/var/slave-data/mysql/host.MYI
mysql-test/var/slave-data/mysql/host.frm
mysql-test/var/slave-data/mysql/tables_priv.MYD
mysql-test/var/slave-data/mysql/tables_priv.MYI
mysql-test/var/slave-data/mysql/tables_priv.frm
mysql-test/var/slave-data/mysql/user.MYD
mysql-test/var/slave-data/mysql/user.MYI
mysql-test/var/slave-data/mysql/user.frm
mysql-test/var/slave-data/test/bar.MYD
mysql-test/var/slave-data/test/bar.MYI
mysql-test/var/slave-data/test/bar.frm
mysql-test/var/slave-data/test/choo.MYD
mysql-test/var/slave-data/test/choo.MYI
mysql-test/var/slave-data/test/choo.frm
mysql-test/var/slave-data/test/domain.MYD
mysql-test/var/slave-data/test/domain.MYI
mysql-test/var/slave-data/test/domain.frm
mysql-test/var/slave-data/test/elt_ck1.MYD
mysql-test/var/slave-data/test/elt_ck1.MYI
mysql-test/var/slave-data/test/elt_ck1.frm
mysql-test/var/slave-data/test/elt_ck2.MYD
mysql-test/var/slave-data/test/elt_ck2.MYI
mysql-test/var/slave-data/test/elt_ck2.frm
mysql-test/var/slave-data/test/emails.MYD
mysql-test/var/slave-data/test/emails.MYI
mysql-test/var/slave-data/test/emails.frm
mysql-test/var/slave-data/test/foo.MYD
mysql-test/var/slave-data/test/foo.MYI
mysql-test/var/slave-data/test/foo.frm
mysql-test/var/slave-data/test/t.MYD
mysql-test/var/slave-data/test/t.MYI
mysql-test/var/slave-data/test/t.frm
mysql-test/var/slave-data/test/test.MYD
mysql-test/var/slave-data/test/test.MYI
mysql-test/var/slave-data/test/test.frm
mysql-test/var/slave-data/test/words.MYD
mysql-test/var/slave-data/test/words.MYI
mysql-test/var/slave-data/test/words.frm
mysql-test/var/slave-data/test/words1.MYD
mysql-test/var/slave-data/test/words1.MYI
mysql-test/var/slave-data/test/words1.frm
mysql-test/var/slave-data/test/x.MYD
mysql-test/var/slave-data/test/x.MYI
mysql-test/var/slave-data/test/x.frm
mysql-test/var/tmp/README
mysys/test_charset
mysys/test_thr_alarm
mysys/test_thr_lock
mysys/testhash
regex/re
repl-tests/test-repl-ts/repl-timestamp.master.reject
repl-tests/test-repl/foo-dump-slave.master.
repl-tests/test-repl/sum-wlen-slave.master.
repl-tests/test-repl/sum-wlen-slave.master.re
repl-tests/test-repl/sum-wlen-slave.master.reje
scripts/make_binary_distribution
scripts/msql2mysql
scripts/mysql_config
scripts/mysql_convert_table_format
scripts/mysql_find_rows
scripts/mysql_fix_privilege_tables
scripts/mysql_install_db
scripts/mysql_setpermission
scripts/mysql_zap
scripts/mysqlaccess
scripts/mysqlbug
scripts/mysqldumpslow
scripts/mysqlhotcopy
scripts/safe_mysqld
sql-bench/bench-init.pl
sql-bench/compare-results
sql-bench/copy-db
sql-bench/crash-me
sql-bench/run-all-tests
sql-bench/server-cfg
sql-bench/test-ATIS
sql-bench/test-alter-table
sql-bench/test-big-tables
sql-bench/test-connect
sql-bench/test-create
sql-bench/test-insert
sql-bench/test-select
sql-bench/test-wisconsin
sql/.gdb_history
sql/gen_lex_hash
sql/lex_hash.h
sql/mini_client_errors.c
sql/mysqlbinlog
sql/mysqld
sql/share/norwegian-ny/errmsg.sys
sql/share/norwegian/errmsg.sys
sql/sql_yacc.cc
sql/sql_yacc.h
stamp-h
strings/conf_to_src
strings/ctype_autoconf.c
strings/ctype_extra_sources.c
support-files/binary-configure
support-files/my-huge.cnf
support-files/my-large.cnf
support-files/my-medium.cnf
support-files/my-small.cnf
support-files/mysql-3.23.25-beta.spec
support-files/mysql-3.23.26-beta.spec
support-files/mysql-3.23.27-beta.spec
support-files/mysql-3.23.28-gamma.spec
support-files/mysql-3.23.29-gamma.spec support-files/mysql-3.23.29-gamma.spec
Docs/manual.log support-files/mysql-log-rotate
support-files/mysql.server
support-files/mysql.spec
...@@ -17851,13 +17851,14 @@ This will create a @code{HEAP} table with 3 columns. Note that the table will ...@@ -17851,13 +17851,14 @@ This will create a @code{HEAP} table with 3 columns. Note that the table will
automatically be deleted if any errors occur while copying data automatically be deleted if any errors occur while copying data
into the table. into the table.
@item @item
The @code{RAID_TYPE} option will help you to break the 2G/4G limit on The @code{RAID_TYPE} option will help you to break the 2G/4G limit for
Operating Systems that don't support big files. You can get also more speed the MyISAM data file (not the index file) onOperating Systems that don't
from the I/O bottleneck by putting @code{RAID} directories on different support big files. You can get also more speed from the I/O bottleneck
physical disks. @code{RAID_TYPE} will work on any OS, as long as you have by putting @code{RAID} directories on different physical
configured @strong{MySQL} with @code{--with-raid}. For now the only allowed disks. @code{RAID_TYPE} will work on any OS, as long as you have
@code{RAID_TYPE} is @code{STRIPED} (@code{1} and @code{RAID0} are aliases configured @strong{MySQL} with @code{--with-raid}. For now the only
for this). allowed @code{RAID_TYPE} is @code{STRIPED} (@code{1} and @code{RAID0}
are aliases for this).
If you specify @code{RAID_TYPE=STRIPED} for a @code{MyISAM} table, If you specify @code{RAID_TYPE=STRIPED} for a @code{MyISAM} table,
@code{MyISAM} will create @code{RAID_CHUNKS} subdirectories named 00, @code{MyISAM} will create @code{RAID_CHUNKS} subdirectories named 00,
...@@ -17866,7 +17867,7 @@ If you specify @code{RAID_TYPE=STRIPED} for a @code{MyISAM} table, ...@@ -17866,7 +17867,7 @@ If you specify @code{RAID_TYPE=STRIPED} for a @code{MyISAM} table,
to the data file, the @code{RAID} handler will map the first to the data file, the @code{RAID} handler will map the first
@code{RAID_CHUNKSIZE} *1024 bytes to the first file, the next @code{RAID_CHUNKSIZE} *1024 bytes to the first file, the next
@code{RAID_CHUNKSIZE} *1024 bytes to the next file and so on. @code{RAID_CHUNKSIZE} *1024 bytes to the next file and so on.
@item
@code{UNION} is used when you want to use a collection of identical @code{UNION} is used when you want to use a collection of identical
tables as one. This only works with MERGE tables. @xref{MERGE}. tables as one. This only works with MERGE tables. @xref{MERGE}.
...@@ -21018,10 +21019,11 @@ LOCK TABLES tbl_name [AS alias] @{READ | [READ LOCAL] | [LOW_PRIORITY] WRITE@} ...@@ -21018,10 +21019,11 @@ LOCK TABLES tbl_name [AS alias] @{READ | [READ LOCAL] | [LOW_PRIORITY] WRITE@}
UNLOCK TABLES UNLOCK TABLES
@end example @end example
@code{LOCK TABLES} locks tables for the current thread. @code{UNLOCK TABLES} @code{LOCK TABLES} locks tables for the current thread. @code{UNLOCK
releases any locks held by the current thread. All tables that are locked by TABLES} releases any locks held by the current thread. All tables that
the current thread are automatically unlocked when the thread issues another are locked by the current thread are automatically unlocked when the
@code{LOCK TABLES}, or when the connection to the server is closed. thread issues another @code{LOCK TABLES}, or when the connection to the
server is closed.
If a thread obtains a @code{READ} lock on a table, that thread (and all other If a thread obtains a @code{READ} lock on a table, that thread (and all other
threads) can only read from the table. If a thread obtains a @code{WRITE} threads) can only read from the table. If a thread obtains a @code{WRITE}
...@@ -21048,10 +21050,11 @@ use @code{LOW_PRIORITY WRITE} locks if you are sure that there will ...@@ -21048,10 +21050,11 @@ use @code{LOW_PRIORITY WRITE} locks if you are sure that there will
eventually be a time when no threads will have a @code{READ} lock. eventually be a time when no threads will have a @code{READ} lock.
When you use @code{LOCK TABLES}, you must lock all tables that you are When you use @code{LOCK TABLES}, you must lock all tables that you are
going to use and you must use the same alias that you are going to use in going to use and you must use the same alias that you are going to use
your queries! If you are using a table multiple times in a query (with in your queries! If you are using a table multiple times in a query
aliases), you must get a lock for each alias! This policy ensures that (with aliases), you must get a lock for each alias! This policy ensures
table locking is deadlock free. that table locking is deadlock free andh makes the locking code smaller,
simpler and much faster.
Note that you should @strong{NOT} lock any tables that you are using with Note that you should @strong{NOT} lock any tables that you are using with
@code{INSERT DELAYED}. This is because that in this case the @code{INSERT} @code{INSERT DELAYED}. This is because that in this case the @code{INSERT}
...@@ -393,6 +393,7 @@ QUICK_SELECT::QUICK_SELECT(TABLE *table,uint key_nr,bool no_alloc) ...@@ -393,6 +393,7 @@ QUICK_SELECT::QUICK_SELECT(TABLE *table,uint key_nr,bool no_alloc)
else else
bzero((char*) &alloc,sizeof(alloc)); bzero((char*) &alloc,sizeof(alloc));
file=head->file; file=head->file;
error=file->index_init(index);
record=head->record[0]; record=head->record[0];
init(); init();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment