List:Commits« Previous MessageNext Message »
From:konstantin Date:January 18 2006 12:15pm
Subject:bk commit into 5.0 tree (konstantin:1.2030)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2030 06/01/18 15:15:09 konstantin@stripped +5 -0
  Merge mysql.com:/opt/local/work/mysql-4.1-root
  into  mysql.com:/opt/local/work/mysql-5.0-root

  tests/mysql_client_test.c
    1.168 06/01/18 15:14:58 konstantin@stripped +19 -20
    Manual merge.

  libmysql/libmysql.c
    1.232 06/01/18 15:14:58 konstantin@stripped +0 -1
    Manual merge.

  configure.in
    1.373 06/01/18 15:14:58 konstantin@stripped +8 -11
    Manual merge.

  libmysql/Makefile.shared
    1.66 06/01/18 15:09:42 konstantin@stripped +0 -0
    Auto merged

  BitKeeper/etc/ignore
    1.214 06/01/18 15:09:22 konstantin@stripped +142 -142
    auto-union

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	konstantin
# Host:	dragonfly.local
# Root:	/opt/local/work/mysql-5.0-root/RESYNC

--- 1.372/configure.in	2005-12-21 20:50:00 +03:00
+++ 1.373/configure.in	2006-01-18 15:14:58 +03:00
@@ -13,7 +13,8 @@
 PROTOCOL_VERSION=10
 DOT_FRM_VERSION=6
 # 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_MAJOR=5
@@ -69,6 +70,7 @@
 AC_SUBST(DOT_FRM_VERSION)
 AC_DEFINE_UNQUOTED([DOT_FRM_VERSION], [$DOT_FRM_VERSION],
                    [Version of .frm files])
+AC_SUBST(SHARED_LIB_MAJOR_VERSION)
 AC_SUBST(SHARED_LIB_VERSION)
 AC_SUBST(AVAILABLE_LANGUAGES)
 
@@ -360,6 +362,13 @@
 fi
 
 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
 AC_MSG_CHECKING("if we should use 'skip-locking' as default for $target_os")

--- 1.231/libmysql/libmysql.c	2006-01-03 19:54:33 +03:00
+++ 1.232/libmysql/libmysql.c	2006-01-18 15:14:58 +03:00
@@ -2817,7 +2817,7 @@
 {
   switch (attr_type) {
   case STMT_ATTR_UPDATE_MAX_LENGTH:
-    *(ulong*) value= stmt->update_max_length;
+    *(my_bool*) value= stmt->update_max_length;
     break;
   case STMT_ATTR_CURSOR_TYPE:
     *(ulong*) value= stmt->flags;

--- 1.213/BitKeeper/etc/ignore	2006-01-11 02:05:07 +03:00
+++ 1.214/BitKeeper/etc/ignore	2006-01-18 15:09:22 +03:00
@@ -1,21 +1,39 @@
 *.a
 *.bb
 *.bbg
+*.bin
 *.core
 *.d
 *.da
+*.exe
 *.gcov
+*.idb
 *.la
+*.lib
 *.lo
+*.map
 *.o
+*.obj
+*.pch
+*.pdb
 *.reject
+*.res
+*.sbr
 *.so
 *.spec
 */*_pure_*warnings
 */.pure
 *~
 .*.swp
+./README.build-files
 ./config.h
+./copy_mysql_files.bat
+./fix-project-files
+./mysql*.ds?
+./mysql.ncb
+./mysql.sln
+./mysql.suo
+./prepare
 .defs.mk
 .depend
 .depend.mk
@@ -115,6 +133,8 @@
 autom4te.cache/output.0
 autom4te.cache/requests
 autom4te.cache/traces.0
+bdb/*.ds?
+bdb/*.vcproj
 bdb/README
 bdb/btree/btree_auto.c
 bdb/build_unix/*
@@ -256,6 +276,9 @@
 bkpush.log*
 build.log
 build_tags.sh
+client/*.ds?
+client/*.vcproj
+client/completion_hash.cpp
 client/decimal.c
 client/insert_test
 client/log_event.cc
@@ -264,10 +287,14 @@
 client/mf_iocache.cc
 client/my_decimal.cc
 client/my_decimal.h
+client/my_user.c
 client/mysql
+client/mysql.cpp
 client/mysqladmin
 client/mysqladmin.c
+client/mysqladmin.cpp
 client/mysqlbinlog
+client/mysqlbinlog.cpp
 client/mysqlcheck
 client/mysqldump
 client/mysqlimport
@@ -278,14 +305,20 @@
 client/mysqltestmanager-pwgen
 client/mysqltestmanagerc
 client/mysys_priv.h
+client/readline.cpp
 client/select_test
+client/sql_string.cpp
 client/ssl_test
 client/thimble
 client/thread_test
+client_debug/*
+client_release/*
 client_test
 cmd-line-utils/libedit/common.h
 cmd-line-utils/libedit/makelist
 comon.h
+comp_err/*.ds?
+comp_err/*.vcproj
 config.cache
 config.guess
 config.h
@@ -295,10 +328,14 @@
 config.sub
 configure
 configure.lineno
+contrib/*.ds?
+contrib/*.vcproj
 core
 core.*
 core.2430
 db-*.*.*
+dbug/*.ds?
+dbug/*.vcproj
 dbug/dbug_analyze
 dbug/example*.r
 dbug/factorial
@@ -309,6 +346,9 @@
 dbug/user.t
 depcomp
 emacs.h
+examples/*.ds?
+examples/*.vcproj
+examples/udf_example/udf_example.def
 extra/charset2html
 extra/comp_err
 extra/created_include_files
@@ -330,6 +370,8 @@
 gdbinit
 gmon.out
 hardcopy.0
+heap/*.ds?
+heap/*.vcproj
 heap/hp_test1
 heap/hp_test2
 help
@@ -345,6 +387,8 @@
 include/readline/readline.h
 include/sql_state.h
 include/widec.h
+innobase/*.ds?
+innobase/*.vcproj
 innobase/autom4te-2.53.cache/*
 innobase/autom4te-2.53.cache/output.0
 innobase/autom4te-2.53.cache/requests
@@ -363,18 +407,29 @@
 insert_test
 install
 install-sh
+isam/*.ds?
+isam/*.vcproj
 isam/isamchk
 isam/isamlog
 isam/pack_isam
 isam/test1
 isam/test2
 isam/test3
+isamchk/*.ds?
+isamchk/*.vcproj
+lib_debug/*
+lib_release/*
 libmysql/*.c
+libmysql/*.ds?
+libmysql/*.vcproj
 libmysql/conf_to_src
+libmysql/debug/libmysql.exp
+libmysql/libmysql.ver
 libmysql/my_static.h
 libmysql/my_time.c
 libmysql/mysys_priv.h
 libmysql/net.c
+libmysql/release/libmysql.exp
 libmysql/vio_priv.h
 libmysql_r/*.c
 libmysql_r/acconfig.h
@@ -382,12 +437,15 @@
 libmysql_r/my_static.h
 libmysql_r/mysys_priv.h
 libmysql_r/vio_priv.h
+libmysqld/*.ds?
+libmysqld/*.vcproj
 libmysqld/backup_dir
 libmysqld/client.c
 libmysqld/client_settings.h
 libmysqld/convert.cc
 libmysqld/derror.cc
 libmysqld/discover.cc
+libmysqld/emb_qcache.cpp
 libmysqld/errmsg.c
 libmysqld/examples/client_test.c
 libmysqld/examples/client_test.cc
@@ -413,6 +471,7 @@
 libmysqld/gstream.cc
 libmysqld/ha_archive.cc
 libmysqld/ha_berkeley.cc
+libmysqld/ha_blackhole.cc
 libmysqld/ha_example.cc
 libmysqld/ha_federated.cc
 libmysqld/ha_heap.cc
@@ -440,6 +499,7 @@
 libmysqld/item_timefunc.cc
 libmysqld/item_uniq.cc
 libmysqld/key.cc
+libmysqld/lib_sql.cpp
 libmysqld/libmysql.c
 libmysqld/lock.cc
 libmysqld/log.cc
@@ -449,6 +509,7 @@
 libmysqld/mini_client.cc
 libmysqld/my_decimal.cc
 libmysqld/my_time.c
+libmysqld/my_user.c
 libmysqld/net_pkg.cc
 libmysqld/net_serv.cc
 libmysqld/opt_ft.cc
@@ -511,6 +572,8 @@
 libmysqld/sql_update.cc
 libmysqld/sql_view.cc
 libmysqld/sql_yacc.cc
+libmysqld/sql_yacc.cpp
+libmysqld/sql_yacc.h
 libmysqld/stacktrace.c
 libmysqld/strfunc.cc
 libmysqld/table.cc
@@ -519,6 +582,9 @@
 libmysqld/tztime.cc
 libmysqld/uniques.cc
 libmysqld/unireg.cc
+libmysqltest/*.ds?
+libmysqltest/*.vcproj
+libmysqltest/mytest.c
 libtool
 linked_client_sources
 linked_include_sources
@@ -531,6 +597,8 @@
 locked
 ltmain.sh
 man/*.1
+merge/*.ds?
+merge/*.vcproj
 missing
 mit-pthreads/config.flags
 mit-pthreads/include/bits
@@ -542,6 +610,10 @@
 mit-pthreads/pgcc
 mit-pthreads/syscall.S
 mkinstalldirs
+my_print_defaults/*.ds?
+my_print_defaults/*.vcproj
+myisam/*.ds?
+myisam/*.vcproj
 myisam/FT1.MYD
 myisam/FT1.MYI
 myisam/ft_dump
@@ -567,17 +639,31 @@
 myisam/test1.MYI
 myisam/test2.MYD
 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.tar.gz
 mysql-4.1.8-win-src.zip
 mysql-5.0.2-alpha.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/install_test_db
 mysql-test/mysql-test-run
 mysql-test/mysql-test-run.log
 mysql-test/mysql_test_run_new
 mysql-test/ndb/ndbcluster
+mysql-test/r/*.err
+mysql-test/r/*.out
 mysql-test/r/*.reject
 mysql-test/r/alter_table.err
 mysql-test/r/archive.err
@@ -649,13 +735,25 @@
 mysql.kdevprj
 mysql.proj
 mysql_priv.h
+mysqlbinlog/*.ds?
+mysqlbinlog/*.vcproj
+mysqlcheck/*.ds?
+mysqlcheck/*.vcproj
 mysqld.S
 mysqld.sym
+mysqldemb/*.ds?
+mysqldemb/*.vcproj
+mysqlserver/*.ds?
+mysqlserver/*.vcproj
 mysys/#mf_iocache.c#
+mysys/*.ds?
+mysys/*.vcproj
 mysys/charset2html
 mysys/getopt.c
 mysys/getopt1.c
 mysys/main.cc
+mysys/my_new.cpp
+mysys/raid.cpp
 mysys/ste5KbMa
 mysys/test_charset
 mysys/test_dir
@@ -919,13 +1017,20 @@
 ndbcluster-1186/ndb_3_cluster.log
 ndbcluster-1186/ndb_3_out.log
 ndbcluster-1186/ndbcluster.pid
+pack_isam/*.ds?
+perror/*.ds?
+perror/*.vcproj
 pull.log
+regex/*.ds?
+regex/*.vcproj
 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
+replace/*.ds?
+replace/*.vcproj
 scripts/fill_func_tables
 scripts/fill_func_tables.sql
 scripts/fill_help_tables
@@ -956,11 +1061,31 @@
 scripts/mysqlhotcopy.sh.rej
 scripts/safe_mysqld
 select_test
+server-tools/instance-manager/buffer.cpp
 server-tools/instance-manager/client.c
 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/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.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/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/bench-count-distinct
 sql-bench/bench-init.pl
@@ -989,13 +1114,21 @@
 sql-bench/test-select
 sql-bench/test-transactions
 sql-bench/test-wisconsin
+sql/*.cpp
+sql/*.ds?
+sql/*.vcproj
 sql/.gdbinit
 sql/client.c
 sql/gen_lex_hash
 sql/gmon.out
 sql/lex_hash.h
+sql/max/*
+sql/message.h
+sql/message.mc
+sql/message.rc
 sql/mini_client_errors.c
 sql/my_time.c
+sql/my_user.c
 sql/mysql_tzinfo_to_sql
 sql/mysql_tzinfo_to_sql.cc
 sql/mysql_tzinfo_to_sql_tztime.cc
@@ -1031,6 +1164,8 @@
 stamp-h3
 stamp-h4
 start_mysqld.sh
+strings/*.ds?
+strings/*.vcproj
 strings/conf_to_src
 strings/ctype_autoconf.c
 strings/ctype_extra_sources.c
@@ -1111,10 +1246,15 @@
 test/tools/ndb_cpcc
 test/tools/restart
 test/tools/verify_index
+test1/*
 test_xml
+tests/*.ds?
+tests/*.vcproj
 tests/client_test
 tests/connect_test
 tests/mysql_client_test
+thr_insert_test/*
+thr_test/*
 thread_test
 tmp/*
 tools/my_vsnprintf.c
@@ -1123,152 +1263,13 @@
 tools/mysqltestmanager
 tools/mysys_priv.h
 vi.h
+vio/*.ds?
+vio/*.vcproj
 vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 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.cpp
 zlib/*.ds?
 zlib/*.vcproj
-libmysqld/ha_blackhole.cc
-client/my_user.c
-libmysqld/my_user.c
-sql/my_user.c

--- 1.65/libmysql/Makefile.shared	2005-08-03 03:19:47 +04:00
+++ 1.66/libmysql/Makefile.shared	2006-01-18 15:09:42 +03:00
@@ -77,7 +77,7 @@
 mysysobjects =		$(mysysobjects1) $(mysysobjects2)
 target_libadd =		$(mysysobjects) $(mystringsobjects) $(dbugobjects) \
  $(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
 CLEANFILES =		$(target_libadd) $(SHLIBOBJS) \
 			$(target)

--- 1.167/tests/mysql_client_test.c	2005-12-08 09:55:54 +03:00
+++ 1.168/tests/mysql_client_test.c	2006-01-18 15:14:58 +03:00
@@ -14624,6 +14624,24 @@
   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
 */
@@ -14884,6 +14902,7 @@
   { "test_bug13524", test_bug13524 },
   { "test_bug14845", test_bug14845 },
   { "test_bug15510", test_bug15510},
+  { "test_bug16144", test_bug16144 },
   { 0, 0 }
 };
 
Thread
bk commit into 5.0 tree (konstantin:1.2030)konstantin18 Jan