BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/innobase/include/lock0lock.h:
Auto merged
storage/innobase/include/srv0srv.h:
Auto merged
storage/innobase/lock/lock0lock.c:
Auto merged
storage/innobase/srv/srv0srv.c:
Auto merged
storage/ndb/test/src/NDBT_ResultRow.cpp:
Auto merged
sql/slave.cc:
Due to refactoring, this needs to be checked before the call.
sql/sql_acl.cc:
Resolving conflicts due to bug fix and filter refactoring
configure. It was already changed not to support additional options, but now
it was trying to pass all of the options to ./configure. (Bug #8648)
BUILD/FINISH.sh:
Remove obsolete code that took arguments to the build scripts and passed
them to configure -- now the only options supported are those handled within
BUILD/SETUP.sh.
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/t/ndb_restore.test:
Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
Initial Metrowerks CodeWarrior compiler support
new file
support-files/MacOSX/mwar-wrapper:
Initial Metrowerks CodeWarrior compiler support
BUILD/compile-darwin-mwcc:
Initial Metrowerks CodeWarrior compiler support
support-files/MacOSX/mwcc-wrapper:
Initial Metrowerks CodeWarrior compiler support
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
storage/heap/hp_hash.c:
Auto merged
storage/innobase/dict/dict0dict.c:
Auto merged
storage/innobase/fil/fil0fil.c:
Auto merged
storage/innobase/include/dict0dict.h:
Auto merged
storage/myisam/Makefile.am:
Auto merged
storage/myisam/mi_key.c:
Auto merged
storage/myisam/myisampack.c:
Auto merged
storage/myisammrg/myrg_open.c:
Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
yaSSL-0.9.7 library bundled.
BUILD/Makefile.am:
compile-pentium-debug-yassl added to distribution.
Makefile.am:
Added yassl_dir to SUBDIRS. It contains path to yassl distribution if --with-yassl
specified. It is empty otherwise.
configure.in:
yaSSL CHECK-function call.
extra/Makefile.am:
yaSSL added to distribution.
include/violite.h:
YASSL_MYSQL_COMPATIBLE macro must be defined to make yassl headers compatible.
client/mysql.cc:
Auto merged
include/my_pthread.h:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/examples/ha_archive.h:
Auto merged
BUILD/SETUP.sh:
Manual merge of conflicts
-DBIG_TABLES removed set by configure using --with-big-tables
configure.in:
manual merge
mysql-test/r/archive.result:
Manual merge
mysql-test/t/archive.test:
Manual merge
- Made a script that selects the best compiler optimizations for the current cpu.
- Use the script from BUILD/SETUP.sh
BUILD/SETUP.sh:
Run check-cpu and use the compiler optimization flags it outputs
configure.in:
No change here - functionality was moved to 'config/ac-macros/character_sets.m4'
mysys/charset-def.c:
Auto-merged.
strings/ctype-utf8.c:
Auto-merged.
configure.in:
Normally, 'configure' does only support "case-insensitive" collations for UTF-8 character sets.
However, a certain customer requires builds with a "case-sensitive" collation: 'utf8_general_cs'.
In order to do custom builds without manual patches, this value gets special handling in 'configure'.
Also, when it is given, the CPP symbol enabling the additional code is set.
mysys/charset-def.c:
Rename the CPP symbol needed for "UTF8-case-sensitive" collation from customer name to function.
strings/ctype-utf8.c:
Rename the CPP symbol needed for "UTF8-case-sensitive" collation from customer name to function.
The patch implements the idea suggested by Olaf van der Spek in
thread "Client: many small reads?" (internals@lists.mysql.com).
Now small reads performed by the client library are buffered.
The buffering gives up to 2 times speedup when retrieving
one-column tables.
BUILD/SETUP.sh:
Remove --with-vio option which no longer exist.
BUILD/compile-pentium64-valgrind-max:
Remove --with-vio option which no longer exist.
config/ac-macros/misc.m4:
Removed --with-vio configure switch: we always use VIO. The switch,
in fact, only saved us one pointer dereferencing per call in case we had
only one transport type in VIO enabled.
config/ac-macros/openssl.m4:
Removed HAVE_VIO.
include/config-win.h:
Removed HAVE_VIO (not needed anymore)
Added HAVE_VIO_READ_BUFF (define buffered client reads for Windows clients).
include/violite.h:
Removed HAVE_VIO, as currently VIO is always in use.
Added declaration for vio_read_buff and related members in struct VIO.
sql-common/client.c:
Use flags to set up vio read buffering in mysql_real_connect.
sql/mysqld.cc:
Use flags to disable vio read buffering when creating a server
connection.
vio/vio.c:
Optionally set up vio read buffer when creating a new VIO structure.
vio/viosocket.c:
Implementation of client-side buffered reads in VIO: the idea
is to buffer small reads in a client buffer to save amount of
syscalls per retrieved result set. The implementation relies
on the fact that read/recv will return as soon as there is
some data in the kernel buffer, no matter how big the given
user's buffer is. To be able to disable it in case recv/read don't
have such semantics, the new calls are guarded
with #define HAVE_VIO_READ_BUFF. Currently buffered reading is
switched on only for BSD sockets and named pipes, both on Windows
and UNIXes.
Recommited, as I made a typo in the previous patch myself =)
BUILD/SETUP.sh:
Fix a typo caused bdb to be skipped when building with BUILD/compile-*-max
Cleanup during reviews of new pushed code
BUILD/compile-pentium-debug-max:
Use --debug=full as default
BUILD/compile-pentium-debug:
Use --debug=full as default
mysys/my_alloc.c:
More debugging
sql/item_func.cc:
Cleanup new code
Don't call insert_id() for last_insert_id(value) to avoid side effects
sql/item_subselect.cc:
Fixed DBUG output
sql/sp_head.cc:
Simple cleanup
sql/sql_lex.cc:
Moved usage of arguments first in lex_start to make their usage clearer
Remove sl->expr_list.deleete_elements() becasue:
- It didn't do anything (delete_elements on a list of list is a no-op operation)
- The deleted for loop used SELECT_LEX elements that was allocated in mysql_new_select() in sp-head, but freed
when sphead->mem_root was freed. (delete sphead doesn't remove used SELECT_LEX elements from the global all_selects_list)
sql/sql_parse.cc:
More DBUG entries
into mysql.com:/home/mydev/mysql-5.0-5000
BUILD/SETUP.sh:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/lowercase_table2.result:
Auto merged
mysql-test/r/order_by.result:
Auto merged
mysql-test/t/order_by.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
Archive fix by Ingo.
Innodb compile fix by Monty.
configure.in:
Auto merged
innobase/include/univ.i:
Auto merged
BUILD/SETUP.sh:
Auto merged
mysql-test/t/archive.test:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/examples/ha_archive.h:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_select.cc:
Auto merged
innobase/fil/fil0fil.c:
Merged Montys fix.
(Simpler fix than last commit -- no need to mess with base_cxxflags.)
BUILD/compile-amd64-max:
use $max_cflags
BUILD/compile-pentium-debug-max:
use $max_cflags
BUILD/compile-pentium-debug-max-no-embedded:
use $max_cflags
BUILD/compile-pentium-max:
use $max_cflags
BUILD/compile-pentium-valgrind-max:
use $max_cflags
BUILD/compile-ppc-debug-max:
use $max_cflags
BUILD/compile-ppc-max:
use $max_cflags
BUILD/compile-amd64-debug-max:
use $max_cflags, remove unnecessary base_cxxflags stuff
BUILD/compile-solaris-sparc-purify:
Cleanup (Changes from Kent)
include/m_string.h:
New interface for my_strtod()
mysql-test/mysql-test-run.sh:
Added option --use-old-data to allow one to run a test case on an existing table
(Good for debugging)
mysql-test/r/strict.result:
Updated results
mysql-test/r/type_float.result:
More tests
mysql-test/t/strict.test:
Safety fix
mysql-test/t/type_float.test:
More tests
mysys/mf_iocache.c:
Change flush_io_cache() to my_b_flush_io_cache()
More debugging
mysys/thr_lock.c:
Added comment
sql/field.cc:
Use new my_strntod()
sql/filesort.cc:
Indentation fixes
sql/item.cc:
Use new my_strntod()
sql/item_strfunc.cc:
Use new my_strntod()
sql/item_sum.cc:
Use new my_strntod()
strings/ctype-cp932.c:
strnncollsp was missing one argument
strings/ctype-simple.c:
Use new my_strntod()
strings/ctype-ucs2.c:
Use new my_strntod()
strings/strtod.c:
Changed interface:
- Force user to supply pointer to end of string (eliminates the need for an end \0)
- More strict error checking (depend less off if INF is set), which makes this more portable
- Better handling of numbers of type 0.000000....E+...
- Return pointer to + in case of '+.'
The above should fix a that strict.test failed on Solaris-sparc.
all architectures, and in sync with the flags used to build the MySQL Max
packages. Also back-port AMD64 build scripts from 5.0.
BUILD/SETUP.sh:
Add $max_configs (and variants) and amd64_*
BUILD/compile-pentium-debug-max:
Use $max_configs
BUILD/compile-pentium-debug-max-no-embedded:
Use $max_no_es_configs
BUILD/compile-pentium-max:
Use $max_configs
BUILD/compile-pentium-valgrind-max:
Use $max_leave_isam_configs
BUILD/compile-ppc-debug-max:
Use $max_configs
BUILD/compile-ppc-max:
Use $max_configs
BitKeeper/etc/ignore:
auto-union
include/my_pthread.h:
Auto merged
innobase/os/os0file.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql-common/client.c:
merged manually
build (to make the test suite pass)
BUILD/compile-dist:
- enable "with-extra-charsets=complex" for the distribution build
(to make the test suite pass)
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
ndb/include/Makefile.am:
Auto merged
ndb/include/ndb_global.h.in:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/ha_ndbcluster.cc:
SCCS merged
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
Makefile.am:
Auto merged
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
innobase/log/log0recv.c:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/r/cast.result:
Auto merged
mysql-test/r/drop.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/t/drop.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
ndb/include/ndb_global.h.in:
Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_repl.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql-common/my_time.c:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/time.cc:
Auto merged
innobase/row/row0upd.c:
Trivial merge
mysql-test/t/func_concat.test:
Keep local code
mysql-test/t/multi_update.test:
auto merge
sql/ha_ndbcluster.cc:
manual merge
sql/item_timefunc.cc:
manual merge
sql/mysql_priv.h:
manual merge
sql/sql_class.h:
manual merge
sql/sql_delete.cc:
manual merge
sql/sql_insert.cc:
manual merge
sql/sql_lex.cc:
manual merge
sql/sql_lex.h:
manual merge
sql/sql_load.cc:
manual merge
sql/sql_parse.cc:
manual merge
sql/sql_table.cc:
manual merge
sql/sql_update.cc:
manual merge
