Merge mysql.com:/opt/local/work/mysql-4.1-root
into mysql.com:/opt/local/work/mysql-5.0-root
This commit is contained in:
commit
d2bba04183
283
.bzrignore
283
.bzrignore
@ -1,21 +1,39 @@
|
|||||||
*.a
|
*.a
|
||||||
*.bb
|
*.bb
|
||||||
*.bbg
|
*.bbg
|
||||||
|
*.bin
|
||||||
*.core
|
*.core
|
||||||
*.d
|
*.d
|
||||||
*.da
|
*.da
|
||||||
|
*.exe
|
||||||
*.gcov
|
*.gcov
|
||||||
|
*.idb
|
||||||
*.la
|
*.la
|
||||||
|
*.lib
|
||||||
*.lo
|
*.lo
|
||||||
|
*.map
|
||||||
*.o
|
*.o
|
||||||
|
*.obj
|
||||||
|
*.pch
|
||||||
|
*.pdb
|
||||||
*.reject
|
*.reject
|
||||||
|
*.res
|
||||||
|
*.sbr
|
||||||
*.so
|
*.so
|
||||||
*.spec
|
*.spec
|
||||||
*/*_pure_*warnings
|
*/*_pure_*warnings
|
||||||
*/.pure
|
*/.pure
|
||||||
*~
|
*~
|
||||||
.*.swp
|
.*.swp
|
||||||
|
./README.build-files
|
||||||
./config.h
|
./config.h
|
||||||
|
./copy_mysql_files.bat
|
||||||
|
./fix-project-files
|
||||||
|
./mysql*.ds?
|
||||||
|
./mysql.ncb
|
||||||
|
./mysql.sln
|
||||||
|
./mysql.suo
|
||||||
|
./prepare
|
||||||
.defs.mk
|
.defs.mk
|
||||||
.depend
|
.depend
|
||||||
.depend.mk
|
.depend.mk
|
||||||
@ -115,6 +133,8 @@ autom4te.cache/*
|
|||||||
autom4te.cache/output.0
|
autom4te.cache/output.0
|
||||||
autom4te.cache/requests
|
autom4te.cache/requests
|
||||||
autom4te.cache/traces.0
|
autom4te.cache/traces.0
|
||||||
|
bdb/*.ds?
|
||||||
|
bdb/*.vcproj
|
||||||
bdb/README
|
bdb/README
|
||||||
bdb/btree/btree_auto.c
|
bdb/btree/btree_auto.c
|
||||||
bdb/build_unix/*
|
bdb/build_unix/*
|
||||||
@ -256,6 +276,9 @@ bkpush.log
|
|||||||
bkpush.log*
|
bkpush.log*
|
||||||
build.log
|
build.log
|
||||||
build_tags.sh
|
build_tags.sh
|
||||||
|
client/*.ds?
|
||||||
|
client/*.vcproj
|
||||||
|
client/completion_hash.cpp
|
||||||
client/decimal.c
|
client/decimal.c
|
||||||
client/insert_test
|
client/insert_test
|
||||||
client/log_event.cc
|
client/log_event.cc
|
||||||
@ -264,10 +287,14 @@ client/mf_iocache.c
|
|||||||
client/mf_iocache.cc
|
client/mf_iocache.cc
|
||||||
client/my_decimal.cc
|
client/my_decimal.cc
|
||||||
client/my_decimal.h
|
client/my_decimal.h
|
||||||
|
client/my_user.c
|
||||||
client/mysql
|
client/mysql
|
||||||
|
client/mysql.cpp
|
||||||
client/mysqladmin
|
client/mysqladmin
|
||||||
client/mysqladmin.c
|
client/mysqladmin.c
|
||||||
|
client/mysqladmin.cpp
|
||||||
client/mysqlbinlog
|
client/mysqlbinlog
|
||||||
|
client/mysqlbinlog.cpp
|
||||||
client/mysqlcheck
|
client/mysqlcheck
|
||||||
client/mysqldump
|
client/mysqldump
|
||||||
client/mysqlimport
|
client/mysqlimport
|
||||||
@ -278,14 +305,20 @@ client/mysqltest
|
|||||||
client/mysqltestmanager-pwgen
|
client/mysqltestmanager-pwgen
|
||||||
client/mysqltestmanagerc
|
client/mysqltestmanagerc
|
||||||
client/mysys_priv.h
|
client/mysys_priv.h
|
||||||
|
client/readline.cpp
|
||||||
client/select_test
|
client/select_test
|
||||||
|
client/sql_string.cpp
|
||||||
client/ssl_test
|
client/ssl_test
|
||||||
client/thimble
|
client/thimble
|
||||||
client/thread_test
|
client/thread_test
|
||||||
|
client_debug/*
|
||||||
|
client_release/*
|
||||||
client_test
|
client_test
|
||||||
cmd-line-utils/libedit/common.h
|
cmd-line-utils/libedit/common.h
|
||||||
cmd-line-utils/libedit/makelist
|
cmd-line-utils/libedit/makelist
|
||||||
comon.h
|
comon.h
|
||||||
|
comp_err/*.ds?
|
||||||
|
comp_err/*.vcproj
|
||||||
config.cache
|
config.cache
|
||||||
config.guess
|
config.guess
|
||||||
config.h
|
config.h
|
||||||
@ -295,10 +328,14 @@ config.status
|
|||||||
config.sub
|
config.sub
|
||||||
configure
|
configure
|
||||||
configure.lineno
|
configure.lineno
|
||||||
|
contrib/*.ds?
|
||||||
|
contrib/*.vcproj
|
||||||
core
|
core
|
||||||
core.*
|
core.*
|
||||||
core.2430
|
core.2430
|
||||||
db-*.*.*
|
db-*.*.*
|
||||||
|
dbug/*.ds?
|
||||||
|
dbug/*.vcproj
|
||||||
dbug/dbug_analyze
|
dbug/dbug_analyze
|
||||||
dbug/example*.r
|
dbug/example*.r
|
||||||
dbug/factorial
|
dbug/factorial
|
||||||
@ -309,6 +346,9 @@ dbug/user.ps
|
|||||||
dbug/user.t
|
dbug/user.t
|
||||||
depcomp
|
depcomp
|
||||||
emacs.h
|
emacs.h
|
||||||
|
examples/*.ds?
|
||||||
|
examples/*.vcproj
|
||||||
|
examples/udf_example/udf_example.def
|
||||||
extra/charset2html
|
extra/charset2html
|
||||||
extra/comp_err
|
extra/comp_err
|
||||||
extra/created_include_files
|
extra/created_include_files
|
||||||
@ -330,6 +370,8 @@ fcns.h
|
|||||||
gdbinit
|
gdbinit
|
||||||
gmon.out
|
gmon.out
|
||||||
hardcopy.0
|
hardcopy.0
|
||||||
|
heap/*.ds?
|
||||||
|
heap/*.vcproj
|
||||||
heap/hp_test1
|
heap/hp_test1
|
||||||
heap/hp_test2
|
heap/hp_test2
|
||||||
help
|
help
|
||||||
@ -345,6 +387,8 @@ include/readline/*.h
|
|||||||
include/readline/readline.h
|
include/readline/readline.h
|
||||||
include/sql_state.h
|
include/sql_state.h
|
||||||
include/widec.h
|
include/widec.h
|
||||||
|
innobase/*.ds?
|
||||||
|
innobase/*.vcproj
|
||||||
innobase/autom4te-2.53.cache/*
|
innobase/autom4te-2.53.cache/*
|
||||||
innobase/autom4te-2.53.cache/output.0
|
innobase/autom4te-2.53.cache/output.0
|
||||||
innobase/autom4te-2.53.cache/requests
|
innobase/autom4te-2.53.cache/requests
|
||||||
@ -363,18 +407,29 @@ innobase/stamp-h1
|
|||||||
insert_test
|
insert_test
|
||||||
install
|
install
|
||||||
install-sh
|
install-sh
|
||||||
|
isam/*.ds?
|
||||||
|
isam/*.vcproj
|
||||||
isam/isamchk
|
isam/isamchk
|
||||||
isam/isamlog
|
isam/isamlog
|
||||||
isam/pack_isam
|
isam/pack_isam
|
||||||
isam/test1
|
isam/test1
|
||||||
isam/test2
|
isam/test2
|
||||||
isam/test3
|
isam/test3
|
||||||
|
isamchk/*.ds?
|
||||||
|
isamchk/*.vcproj
|
||||||
|
lib_debug/*
|
||||||
|
lib_release/*
|
||||||
libmysql/*.c
|
libmysql/*.c
|
||||||
|
libmysql/*.ds?
|
||||||
|
libmysql/*.vcproj
|
||||||
libmysql/conf_to_src
|
libmysql/conf_to_src
|
||||||
|
libmysql/debug/libmysql.exp
|
||||||
|
libmysql/libmysql.ver
|
||||||
libmysql/my_static.h
|
libmysql/my_static.h
|
||||||
libmysql/my_time.c
|
libmysql/my_time.c
|
||||||
libmysql/mysys_priv.h
|
libmysql/mysys_priv.h
|
||||||
libmysql/net.c
|
libmysql/net.c
|
||||||
|
libmysql/release/libmysql.exp
|
||||||
libmysql/vio_priv.h
|
libmysql/vio_priv.h
|
||||||
libmysql_r/*.c
|
libmysql_r/*.c
|
||||||
libmysql_r/acconfig.h
|
libmysql_r/acconfig.h
|
||||||
@ -382,12 +437,15 @@ libmysql_r/conf_to_src
|
|||||||
libmysql_r/my_static.h
|
libmysql_r/my_static.h
|
||||||
libmysql_r/mysys_priv.h
|
libmysql_r/mysys_priv.h
|
||||||
libmysql_r/vio_priv.h
|
libmysql_r/vio_priv.h
|
||||||
|
libmysqld/*.ds?
|
||||||
|
libmysqld/*.vcproj
|
||||||
libmysqld/backup_dir
|
libmysqld/backup_dir
|
||||||
libmysqld/client.c
|
libmysqld/client.c
|
||||||
libmysqld/client_settings.h
|
libmysqld/client_settings.h
|
||||||
libmysqld/convert.cc
|
libmysqld/convert.cc
|
||||||
libmysqld/derror.cc
|
libmysqld/derror.cc
|
||||||
libmysqld/discover.cc
|
libmysqld/discover.cc
|
||||||
|
libmysqld/emb_qcache.cpp
|
||||||
libmysqld/errmsg.c
|
libmysqld/errmsg.c
|
||||||
libmysqld/examples/client_test.c
|
libmysqld/examples/client_test.c
|
||||||
libmysqld/examples/client_test.cc
|
libmysqld/examples/client_test.cc
|
||||||
@ -413,6 +471,7 @@ libmysqld/get_password.c
|
|||||||
libmysqld/gstream.cc
|
libmysqld/gstream.cc
|
||||||
libmysqld/ha_archive.cc
|
libmysqld/ha_archive.cc
|
||||||
libmysqld/ha_berkeley.cc
|
libmysqld/ha_berkeley.cc
|
||||||
|
libmysqld/ha_blackhole.cc
|
||||||
libmysqld/ha_example.cc
|
libmysqld/ha_example.cc
|
||||||
libmysqld/ha_federated.cc
|
libmysqld/ha_federated.cc
|
||||||
libmysqld/ha_heap.cc
|
libmysqld/ha_heap.cc
|
||||||
@ -440,6 +499,7 @@ libmysqld/item_sum.cc
|
|||||||
libmysqld/item_timefunc.cc
|
libmysqld/item_timefunc.cc
|
||||||
libmysqld/item_uniq.cc
|
libmysqld/item_uniq.cc
|
||||||
libmysqld/key.cc
|
libmysqld/key.cc
|
||||||
|
libmysqld/lib_sql.cpp
|
||||||
libmysqld/libmysql.c
|
libmysqld/libmysql.c
|
||||||
libmysqld/lock.cc
|
libmysqld/lock.cc
|
||||||
libmysqld/log.cc
|
libmysqld/log.cc
|
||||||
@ -449,6 +509,7 @@ libmysqld/mf_iocache.cc
|
|||||||
libmysqld/mini_client.cc
|
libmysqld/mini_client.cc
|
||||||
libmysqld/my_decimal.cc
|
libmysqld/my_decimal.cc
|
||||||
libmysqld/my_time.c
|
libmysqld/my_time.c
|
||||||
|
libmysqld/my_user.c
|
||||||
libmysqld/net_pkg.cc
|
libmysqld/net_pkg.cc
|
||||||
libmysqld/net_serv.cc
|
libmysqld/net_serv.cc
|
||||||
libmysqld/opt_ft.cc
|
libmysqld/opt_ft.cc
|
||||||
@ -511,6 +572,8 @@ libmysqld/sql_unions.cc
|
|||||||
libmysqld/sql_update.cc
|
libmysqld/sql_update.cc
|
||||||
libmysqld/sql_view.cc
|
libmysqld/sql_view.cc
|
||||||
libmysqld/sql_yacc.cc
|
libmysqld/sql_yacc.cc
|
||||||
|
libmysqld/sql_yacc.cpp
|
||||||
|
libmysqld/sql_yacc.h
|
||||||
libmysqld/stacktrace.c
|
libmysqld/stacktrace.c
|
||||||
libmysqld/strfunc.cc
|
libmysqld/strfunc.cc
|
||||||
libmysqld/table.cc
|
libmysqld/table.cc
|
||||||
@ -519,6 +582,9 @@ libmysqld/time.cc
|
|||||||
libmysqld/tztime.cc
|
libmysqld/tztime.cc
|
||||||
libmysqld/uniques.cc
|
libmysqld/uniques.cc
|
||||||
libmysqld/unireg.cc
|
libmysqld/unireg.cc
|
||||||
|
libmysqltest/*.ds?
|
||||||
|
libmysqltest/*.vcproj
|
||||||
|
libmysqltest/mytest.c
|
||||||
libtool
|
libtool
|
||||||
linked_client_sources
|
linked_client_sources
|
||||||
linked_include_sources
|
linked_include_sources
|
||||||
@ -531,6 +597,8 @@ linked_tools_sources
|
|||||||
locked
|
locked
|
||||||
ltmain.sh
|
ltmain.sh
|
||||||
man/*.1
|
man/*.1
|
||||||
|
merge/*.ds?
|
||||||
|
merge/*.vcproj
|
||||||
missing
|
missing
|
||||||
mit-pthreads/config.flags
|
mit-pthreads/config.flags
|
||||||
mit-pthreads/include/bits
|
mit-pthreads/include/bits
|
||||||
@ -542,6 +610,10 @@ mit-pthreads/pg++
|
|||||||
mit-pthreads/pgcc
|
mit-pthreads/pgcc
|
||||||
mit-pthreads/syscall.S
|
mit-pthreads/syscall.S
|
||||||
mkinstalldirs
|
mkinstalldirs
|
||||||
|
my_print_defaults/*.ds?
|
||||||
|
my_print_defaults/*.vcproj
|
||||||
|
myisam/*.ds?
|
||||||
|
myisam/*.vcproj
|
||||||
myisam/FT1.MYD
|
myisam/FT1.MYD
|
||||||
myisam/FT1.MYI
|
myisam/FT1.MYI
|
||||||
myisam/ft_dump
|
myisam/ft_dump
|
||||||
@ -567,17 +639,31 @@ myisam/test1.MYD
|
|||||||
myisam/test1.MYI
|
myisam/test1.MYI
|
||||||
myisam/test2.MYD
|
myisam/test2.MYD
|
||||||
myisam/test2.MYI
|
myisam/test2.MYI
|
||||||
|
myisam_ftdump/*.ds?
|
||||||
|
myisam_ftdump/*.vcproj
|
||||||
|
myisamchk/*.ds?
|
||||||
|
myisamchk/*.vcproj
|
||||||
|
myisamlog/*.ds?
|
||||||
|
myisamlog/*.vcproj
|
||||||
|
myisammrg/*.ds?
|
||||||
|
myisammrg/*.vcproj
|
||||||
|
myisampack/*.ds?
|
||||||
|
myisampack/*.vcproj
|
||||||
mysql-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
|
mysql-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
|
||||||
mysql-4.0.2-alpha.tar.gz
|
mysql-4.0.2-alpha.tar.gz
|
||||||
mysql-4.1.8-win-src.zip
|
mysql-4.1.8-win-src.zip
|
||||||
mysql-5.0.2-alpha.tar.gz
|
mysql-5.0.2-alpha.tar.gz
|
||||||
mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
|
mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
|
||||||
|
mysql-test/*.ds?
|
||||||
|
mysql-test/*.vcproj
|
||||||
mysql-test/gmon.out
|
mysql-test/gmon.out
|
||||||
mysql-test/install_test_db
|
mysql-test/install_test_db
|
||||||
mysql-test/mysql-test-run
|
mysql-test/mysql-test-run
|
||||||
mysql-test/mysql-test-run.log
|
mysql-test/mysql-test-run.log
|
||||||
mysql-test/mysql_test_run_new
|
mysql-test/mysql_test_run_new
|
||||||
mysql-test/ndb/ndbcluster
|
mysql-test/ndb/ndbcluster
|
||||||
|
mysql-test/r/*.err
|
||||||
|
mysql-test/r/*.out
|
||||||
mysql-test/r/*.reject
|
mysql-test/r/*.reject
|
||||||
mysql-test/r/alter_table.err
|
mysql-test/r/alter_table.err
|
||||||
mysql-test/r/archive.err
|
mysql-test/r/archive.err
|
||||||
@ -649,13 +735,25 @@ mysql-test/var/*
|
|||||||
mysql.kdevprj
|
mysql.kdevprj
|
||||||
mysql.proj
|
mysql.proj
|
||||||
mysql_priv.h
|
mysql_priv.h
|
||||||
|
mysqlbinlog/*.ds?
|
||||||
|
mysqlbinlog/*.vcproj
|
||||||
|
mysqlcheck/*.ds?
|
||||||
|
mysqlcheck/*.vcproj
|
||||||
mysqld.S
|
mysqld.S
|
||||||
mysqld.sym
|
mysqld.sym
|
||||||
|
mysqldemb/*.ds?
|
||||||
|
mysqldemb/*.vcproj
|
||||||
|
mysqlserver/*.ds?
|
||||||
|
mysqlserver/*.vcproj
|
||||||
mysys/#mf_iocache.c#
|
mysys/#mf_iocache.c#
|
||||||
|
mysys/*.ds?
|
||||||
|
mysys/*.vcproj
|
||||||
mysys/charset2html
|
mysys/charset2html
|
||||||
mysys/getopt.c
|
mysys/getopt.c
|
||||||
mysys/getopt1.c
|
mysys/getopt1.c
|
||||||
mysys/main.cc
|
mysys/main.cc
|
||||||
|
mysys/my_new.cpp
|
||||||
|
mysys/raid.cpp
|
||||||
mysys/ste5KbMa
|
mysys/ste5KbMa
|
||||||
mysys/test_charset
|
mysys/test_charset
|
||||||
mysys/test_dir
|
mysys/test_dir
|
||||||
@ -919,13 +1017,20 @@ ndbcluster-1186/ndb_3.pid
|
|||||||
ndbcluster-1186/ndb_3_cluster.log
|
ndbcluster-1186/ndb_3_cluster.log
|
||||||
ndbcluster-1186/ndb_3_out.log
|
ndbcluster-1186/ndb_3_out.log
|
||||||
ndbcluster-1186/ndbcluster.pid
|
ndbcluster-1186/ndbcluster.pid
|
||||||
|
pack_isam/*.ds?
|
||||||
|
perror/*.ds?
|
||||||
|
perror/*.vcproj
|
||||||
pull.log
|
pull.log
|
||||||
|
regex/*.ds?
|
||||||
|
regex/*.vcproj
|
||||||
regex/re
|
regex/re
|
||||||
repl-tests/test-repl-ts/repl-timestamp.master.reject
|
repl-tests/test-repl-ts/repl-timestamp.master.reject
|
||||||
repl-tests/test-repl/foo-dump-slave.master.
|
repl-tests/test-repl/foo-dump-slave.master.
|
||||||
repl-tests/test-repl/sum-wlen-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.re
|
||||||
repl-tests/test-repl/sum-wlen-slave.master.reje
|
repl-tests/test-repl/sum-wlen-slave.master.reje
|
||||||
|
replace/*.ds?
|
||||||
|
replace/*.vcproj
|
||||||
scripts/fill_func_tables
|
scripts/fill_func_tables
|
||||||
scripts/fill_func_tables.sql
|
scripts/fill_func_tables.sql
|
||||||
scripts/fill_help_tables
|
scripts/fill_help_tables
|
||||||
@ -956,11 +1061,31 @@ scripts/mysqlhotcopy
|
|||||||
scripts/mysqlhotcopy.sh.rej
|
scripts/mysqlhotcopy.sh.rej
|
||||||
scripts/safe_mysqld
|
scripts/safe_mysqld
|
||||||
select_test
|
select_test
|
||||||
|
server-tools/instance-manager/buffer.cpp
|
||||||
server-tools/instance-manager/client.c
|
server-tools/instance-manager/client.c
|
||||||
server-tools/instance-manager/client_settings.h
|
server-tools/instance-manager/client_settings.h
|
||||||
|
server-tools/instance-manager/command.cpp
|
||||||
|
server-tools/instance-manager/commands.cpp
|
||||||
server-tools/instance-manager/errmsg.c
|
server-tools/instance-manager/errmsg.c
|
||||||
|
server-tools/instance-manager/guardian.cpp
|
||||||
|
server-tools/instance-manager/instance.cpp
|
||||||
|
server-tools/instance-manager/instance_map.cpp
|
||||||
|
server-tools/instance-manager/instance_options.cpp
|
||||||
|
server-tools/instance-manager/listener.cpp
|
||||||
|
server-tools/instance-manager/log.cpp
|
||||||
|
server-tools/instance-manager/manager.cpp
|
||||||
|
server-tools/instance-manager/messages.cpp
|
||||||
|
server-tools/instance-manager/mysql_connection.cpp
|
||||||
server-tools/instance-manager/mysqlmanager
|
server-tools/instance-manager/mysqlmanager
|
||||||
|
server-tools/instance-manager/mysqlmanager.cpp
|
||||||
|
server-tools/instance-manager/options.cpp
|
||||||
|
server-tools/instance-manager/parse.cpp
|
||||||
|
server-tools/instance-manager/parse_output.cpp
|
||||||
|
server-tools/instance-manager/priv.cpp
|
||||||
|
server-tools/instance-manager/protocol.cpp
|
||||||
server-tools/instance-manager/thr_alarm.c
|
server-tools/instance-manager/thr_alarm.c
|
||||||
|
server-tools/instance-manager/thread_registry.cpp
|
||||||
|
server-tools/instance-manager/user_map.cpp
|
||||||
sql-bench/Results-linux/ATIS-mysql_bdb-Linux_2.2.14_my_SMP_i686
|
sql-bench/Results-linux/ATIS-mysql_bdb-Linux_2.2.14_my_SMP_i686
|
||||||
sql-bench/bench-count-distinct
|
sql-bench/bench-count-distinct
|
||||||
sql-bench/bench-init.pl
|
sql-bench/bench-init.pl
|
||||||
@ -989,13 +1114,21 @@ sql-bench/test-insert
|
|||||||
sql-bench/test-select
|
sql-bench/test-select
|
||||||
sql-bench/test-transactions
|
sql-bench/test-transactions
|
||||||
sql-bench/test-wisconsin
|
sql-bench/test-wisconsin
|
||||||
|
sql/*.cpp
|
||||||
|
sql/*.ds?
|
||||||
|
sql/*.vcproj
|
||||||
sql/.gdbinit
|
sql/.gdbinit
|
||||||
sql/client.c
|
sql/client.c
|
||||||
sql/gen_lex_hash
|
sql/gen_lex_hash
|
||||||
sql/gmon.out
|
sql/gmon.out
|
||||||
sql/lex_hash.h
|
sql/lex_hash.h
|
||||||
|
sql/max/*
|
||||||
|
sql/message.h
|
||||||
|
sql/message.mc
|
||||||
|
sql/message.rc
|
||||||
sql/mini_client_errors.c
|
sql/mini_client_errors.c
|
||||||
sql/my_time.c
|
sql/my_time.c
|
||||||
|
sql/my_user.c
|
||||||
sql/mysql_tzinfo_to_sql
|
sql/mysql_tzinfo_to_sql
|
||||||
sql/mysql_tzinfo_to_sql.cc
|
sql/mysql_tzinfo_to_sql.cc
|
||||||
sql/mysql_tzinfo_to_sql_tztime.cc
|
sql/mysql_tzinfo_to_sql_tztime.cc
|
||||||
@ -1031,6 +1164,8 @@ stamp-h2.in
|
|||||||
stamp-h3
|
stamp-h3
|
||||||
stamp-h4
|
stamp-h4
|
||||||
start_mysqld.sh
|
start_mysqld.sh
|
||||||
|
strings/*.ds?
|
||||||
|
strings/*.vcproj
|
||||||
strings/conf_to_src
|
strings/conf_to_src
|
||||||
strings/ctype_autoconf.c
|
strings/ctype_autoconf.c
|
||||||
strings/ctype_extra_sources.c
|
strings/ctype_extra_sources.c
|
||||||
@ -1111,10 +1246,15 @@ test/tools/hugoScanUpdate
|
|||||||
test/tools/ndb_cpcc
|
test/tools/ndb_cpcc
|
||||||
test/tools/restart
|
test/tools/restart
|
||||||
test/tools/verify_index
|
test/tools/verify_index
|
||||||
|
test1/*
|
||||||
test_xml
|
test_xml
|
||||||
|
tests/*.ds?
|
||||||
|
tests/*.vcproj
|
||||||
tests/client_test
|
tests/client_test
|
||||||
tests/connect_test
|
tests/connect_test
|
||||||
tests/mysql_client_test
|
tests/mysql_client_test
|
||||||
|
thr_insert_test/*
|
||||||
|
thr_test/*
|
||||||
thread_test
|
thread_test
|
||||||
tmp/*
|
tmp/*
|
||||||
tools/my_vsnprintf.c
|
tools/my_vsnprintf.c
|
||||||
@ -1123,152 +1263,13 @@ tools/mysqlmngd
|
|||||||
tools/mysqltestmanager
|
tools/mysqltestmanager
|
||||||
tools/mysys_priv.h
|
tools/mysys_priv.h
|
||||||
vi.h
|
vi.h
|
||||||
|
vio/*.ds?
|
||||||
|
vio/*.vcproj
|
||||||
vio/test-ssl
|
vio/test-ssl
|
||||||
vio/test-sslclient
|
vio/test-sslclient
|
||||||
vio/test-sslserver
|
vio/test-sslserver
|
||||||
vio/viotest-ssl
|
vio/viotest-ssl
|
||||||
*.bin
|
|
||||||
*.exe
|
|
||||||
*.idb
|
|
||||||
*.lib
|
|
||||||
*.map
|
|
||||||
*.obj
|
|
||||||
*.pch
|
|
||||||
*.pdb
|
|
||||||
*.res
|
|
||||||
*.sbr
|
|
||||||
./copy_mysql_files.bat
|
|
||||||
./fix-project-files
|
|
||||||
./mysql*.ds?
|
|
||||||
./mysql.ncb
|
|
||||||
./mysql.sln
|
|
||||||
./mysql.suo
|
|
||||||
./prepare
|
|
||||||
./README.build-files
|
|
||||||
bdb/*.ds?
|
|
||||||
bdb/*.vcproj
|
|
||||||
client/*.ds?
|
|
||||||
client/*.vcproj
|
|
||||||
client/completion_hash.cpp
|
|
||||||
client/mysql.cpp
|
|
||||||
client/mysqladmin.cpp
|
|
||||||
client/mysqlbinlog.cpp
|
|
||||||
client/readline.cpp
|
|
||||||
client/sql_string.cpp
|
|
||||||
client_debug/*
|
|
||||||
client_release/*
|
|
||||||
comp_err/*.ds?
|
|
||||||
comp_err/*.vcproj
|
|
||||||
contrib/*.ds?
|
|
||||||
contrib/*.vcproj
|
|
||||||
dbug/*.ds?
|
|
||||||
dbug/*.vcproj
|
|
||||||
examples/*.ds?
|
|
||||||
examples/*.vcproj
|
|
||||||
examples/udf_example/udf_example.def
|
|
||||||
heap/*.ds?
|
|
||||||
heap/*.vcproj
|
|
||||||
innobase/*.ds?
|
|
||||||
innobase/*.vcproj
|
|
||||||
isam/*.ds?
|
|
||||||
isam/*.vcproj
|
|
||||||
isamchk/*.ds?
|
|
||||||
isamchk/*.vcproj
|
|
||||||
lib_debug/*
|
|
||||||
lib_release/*
|
|
||||||
libmysql/*.ds?
|
|
||||||
libmysql/*.vcproj
|
|
||||||
libmysql/debug/libmysql.exp
|
|
||||||
libmysql/release/libmysql.exp
|
|
||||||
libmysqld/*.ds?
|
|
||||||
libmysqld/*.vcproj
|
|
||||||
libmysqld/emb_qcache.cpp
|
|
||||||
libmysqld/lib_sql.cpp
|
|
||||||
libmysqld/sql_yacc.cpp
|
|
||||||
libmysqld/sql_yacc.h
|
|
||||||
libmysqltest/*.ds?
|
|
||||||
libmysqltest/*.vcproj
|
|
||||||
libmysqltest/mytest.c
|
|
||||||
merge/*.ds?
|
|
||||||
merge/*.vcproj
|
|
||||||
my_print_defaults/*.ds?
|
|
||||||
my_print_defaults/*.vcproj
|
|
||||||
myisam/*.ds?
|
|
||||||
myisam/*.vcproj
|
|
||||||
myisam_ftdump/*.ds?
|
|
||||||
myisam_ftdump/*.vcproj
|
|
||||||
myisamchk/*.ds?
|
|
||||||
myisamchk/*.vcproj
|
|
||||||
myisamlog/*.ds?
|
|
||||||
myisamlog/*.vcproj
|
|
||||||
myisammrg/*.ds?
|
|
||||||
myisammrg/*.vcproj
|
|
||||||
myisampack/*.ds?
|
|
||||||
myisampack/*.vcproj
|
|
||||||
mysql-test/*.ds?
|
|
||||||
mysql-test/*.vcproj
|
|
||||||
mysql-test/r/*.err
|
|
||||||
mysql-test/r/*.out
|
|
||||||
mysqlbinlog/*.ds?
|
|
||||||
mysqlbinlog/*.vcproj
|
|
||||||
mysqlcheck/*.ds?
|
|
||||||
mysqlcheck/*.vcproj
|
|
||||||
mysqldemb/*.ds?
|
|
||||||
mysqldemb/*.vcproj
|
|
||||||
mysqlserver/*.ds?
|
|
||||||
mysqlserver/*.vcproj
|
|
||||||
mysys/*.ds?
|
|
||||||
mysys/*.vcproj
|
|
||||||
mysys/my_new.cpp
|
|
||||||
mysys/raid.cpp
|
|
||||||
pack_isam/*.ds?
|
|
||||||
perror/*.ds?
|
|
||||||
perror/*.vcproj
|
|
||||||
regex/*.ds?
|
|
||||||
regex/*.vcproj
|
|
||||||
replace/*.ds?
|
|
||||||
replace/*.vcproj
|
|
||||||
server-tools/instance-manager/buffer.cpp
|
|
||||||
server-tools/instance-manager/command.cpp
|
|
||||||
server-tools/instance-manager/commands.cpp
|
|
||||||
server-tools/instance-manager/guardian.cpp
|
|
||||||
server-tools/instance-manager/instance.cpp
|
|
||||||
server-tools/instance-manager/instance_map.cpp
|
|
||||||
server-tools/instance-manager/instance_options.cpp
|
|
||||||
server-tools/instance-manager/listener.cpp
|
|
||||||
server-tools/instance-manager/log.cpp
|
|
||||||
server-tools/instance-manager/manager.cpp
|
|
||||||
server-tools/instance-manager/messages.cpp
|
|
||||||
server-tools/instance-manager/mysql_connection.cpp
|
|
||||||
server-tools/instance-manager/mysqlmanager.cpp
|
|
||||||
server-tools/instance-manager/options.cpp
|
|
||||||
server-tools/instance-manager/parse.cpp
|
|
||||||
server-tools/instance-manager/parse_output.cpp
|
|
||||||
server-tools/instance-manager/priv.cpp
|
|
||||||
server-tools/instance-manager/protocol.cpp
|
|
||||||
server-tools/instance-manager/thread_registry.cpp
|
|
||||||
server-tools/instance-manager/user_map.cpp
|
|
||||||
sql/*.cpp
|
|
||||||
sql/*.ds?
|
|
||||||
sql/*.vcproj
|
|
||||||
sql/max/*
|
|
||||||
sql/message.h
|
|
||||||
sql/message.mc
|
|
||||||
sql/message.rc
|
|
||||||
strings/*.ds?
|
|
||||||
strings/*.vcproj
|
|
||||||
test1/*
|
|
||||||
tests/*.ds?
|
|
||||||
tests/*.vcproj
|
|
||||||
thr_insert_test/*
|
|
||||||
thr_test/*
|
|
||||||
vio/*.ds?
|
|
||||||
vio/*.vcproj
|
|
||||||
vio/viotest-sslconnect.cpp
|
vio/viotest-sslconnect.cpp
|
||||||
vio/viotest.cpp
|
vio/viotest.cpp
|
||||||
zlib/*.ds?
|
zlib/*.ds?
|
||||||
zlib/*.vcproj
|
zlib/*.vcproj
|
||||||
libmysqld/ha_blackhole.cc
|
|
||||||
client/my_user.c
|
|
||||||
libmysqld/my_user.c
|
|
||||||
sql/my_user.c
|
|
||||||
|
11
configure.in
11
configure.in
@ -13,7 +13,8 @@ AM_CONFIG_HEADER(config.h)
|
|||||||
PROTOCOL_VERSION=10
|
PROTOCOL_VERSION=10
|
||||||
DOT_FRM_VERSION=6
|
DOT_FRM_VERSION=6
|
||||||
# See the libtool docs for information on how to do shared lib versions.
|
# See the libtool docs for information on how to do shared lib versions.
|
||||||
SHARED_LIB_VERSION=15:0:0
|
SHARED_LIB_MAJOR_VERSION=15
|
||||||
|
SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0
|
||||||
|
|
||||||
# ndb version
|
# ndb version
|
||||||
NDB_VERSION_MAJOR=5
|
NDB_VERSION_MAJOR=5
|
||||||
@ -69,6 +70,7 @@ AC_DEFINE_UNQUOTED([PROTOCOL_VERSION], [$PROTOCOL_VERSION],
|
|||||||
AC_SUBST(DOT_FRM_VERSION)
|
AC_SUBST(DOT_FRM_VERSION)
|
||||||
AC_DEFINE_UNQUOTED([DOT_FRM_VERSION], [$DOT_FRM_VERSION],
|
AC_DEFINE_UNQUOTED([DOT_FRM_VERSION], [$DOT_FRM_VERSION],
|
||||||
[Version of .frm files])
|
[Version of .frm files])
|
||||||
|
AC_SUBST(SHARED_LIB_MAJOR_VERSION)
|
||||||
AC_SUBST(SHARED_LIB_VERSION)
|
AC_SUBST(SHARED_LIB_VERSION)
|
||||||
AC_SUBST(AVAILABLE_LANGUAGES)
|
AC_SUBST(AVAILABLE_LANGUAGES)
|
||||||
|
|
||||||
@ -361,6 +363,13 @@ fi
|
|||||||
|
|
||||||
MYSQL_PROG_AR
|
MYSQL_PROG_AR
|
||||||
|
|
||||||
|
# libmysqlclient versioning when linked with GNU ld.
|
||||||
|
if $LD --version 2>/dev/null|grep -q GNU; then
|
||||||
|
LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libmysql/libmysql.ver"
|
||||||
|
AC_CONFIG_FILES(libmysql/libmysql.ver)
|
||||||
|
fi
|
||||||
|
AC_SUBST(LD_VERSION_SCRIPT)
|
||||||
|
|
||||||
# Avoid bug in fcntl on some versions of linux
|
# Avoid bug in fcntl on some versions of linux
|
||||||
AC_MSG_CHECKING("if we should use 'skip-locking' as default for $target_os")
|
AC_MSG_CHECKING("if we should use 'skip-locking' as default for $target_os")
|
||||||
# Any variation of Linux
|
# Any variation of Linux
|
||||||
|
@ -77,7 +77,7 @@ mysysobjects2 = my_lib.lo
|
|||||||
mysysobjects = $(mysysobjects1) $(mysysobjects2)
|
mysysobjects = $(mysysobjects1) $(mysysobjects2)
|
||||||
target_libadd = $(mysysobjects) $(mystringsobjects) $(dbugobjects) \
|
target_libadd = $(mysysobjects) $(mystringsobjects) $(dbugobjects) \
|
||||||
$(sql_cmn_objects) $(vio_objects) $(sqlobjects)
|
$(sql_cmn_objects) $(vio_objects) $(sqlobjects)
|
||||||
target_ldflags = -version-info @SHARED_LIB_VERSION@
|
target_ldflags = -version-info @SHARED_LIB_VERSION@ @LD_VERSION_SCRIPT@
|
||||||
vio_objects= vio.lo viosocket.lo viossl.lo viosslfactories.lo
|
vio_objects= vio.lo viosocket.lo viossl.lo viosslfactories.lo
|
||||||
CLEANFILES = $(target_libadd) $(SHLIBOBJS) \
|
CLEANFILES = $(target_libadd) $(SHLIBOBJS) \
|
||||||
$(target)
|
$(target)
|
||||||
|
@ -2817,7 +2817,7 @@ my_bool STDCALL mysql_stmt_attr_get(MYSQL_STMT *stmt,
|
|||||||
{
|
{
|
||||||
switch (attr_type) {
|
switch (attr_type) {
|
||||||
case STMT_ATTR_UPDATE_MAX_LENGTH:
|
case STMT_ATTR_UPDATE_MAX_LENGTH:
|
||||||
*(ulong*) value= stmt->update_max_length;
|
*(my_bool*) value= stmt->update_max_length;
|
||||||
break;
|
break;
|
||||||
case STMT_ATTR_CURSOR_TYPE:
|
case STMT_ATTR_CURSOR_TYPE:
|
||||||
*(ulong*) value= stmt->flags;
|
*(ulong*) value= stmt->flags;
|
||||||
|
1
libmysql/libmysql.ver.in
Normal file
1
libmysql/libmysql.ver.in
Normal file
@ -0,0 +1 @@
|
|||||||
|
libmysqlclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; };
|
@ -14624,6 +14624,24 @@ static void test_bug15510()
|
|||||||
myquery(rc);
|
myquery(rc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Bug #16144: mysql_stmt_attr_get type error */
|
||||||
|
|
||||||
|
static void test_bug16144()
|
||||||
|
{
|
||||||
|
const my_bool flag_orig= (my_bool) 0xde;
|
||||||
|
my_bool flag= flag_orig;
|
||||||
|
MYSQL_STMT *stmt;
|
||||||
|
myheader("test_bug16144");
|
||||||
|
|
||||||
|
/* Check that attr_get returns correct data on little and big endian CPUs */
|
||||||
|
stmt= mysql_stmt_init(mysql);
|
||||||
|
mysql_stmt_attr_set(stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (const void*) &flag);
|
||||||
|
mysql_stmt_attr_get(stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (void*) &flag);
|
||||||
|
DIE_UNLESS(flag == flag_orig);
|
||||||
|
|
||||||
|
mysql_stmt_close(stmt);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Read and parse arguments and MySQL options from my.cnf
|
Read and parse arguments and MySQL options from my.cnf
|
||||||
*/
|
*/
|
||||||
@ -14884,6 +14902,7 @@ static struct my_tests_st my_tests[]= {
|
|||||||
{ "test_bug13524", test_bug13524 },
|
{ "test_bug13524", test_bug13524 },
|
||||||
{ "test_bug14845", test_bug14845 },
|
{ "test_bug14845", test_bug14845 },
|
||||||
{ "test_bug15510", test_bug15510},
|
{ "test_bug15510", test_bug15510},
|
||||||
|
{ "test_bug16144", test_bug16144 },
|
||||||
{ 0, 0 }
|
{ 0, 0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user