and VERSION() to be uppercase in e.g. "select pi()"
mysql-test/r/func_math.result:
result updated
mysql-test/r/select_found.result:
result updated
mysql-test/r/union.result:
result updated
Backport from 4.0: Fix a major bug in InnoDB query estimator for queries of type SELECT ... WHERE col < x and SELECT ... WHERE col > x; MySQL could pick a table scan though the result set was only a few rows in a big table
innobase/btr/btr0cur.c:
Backport from 4.0: Fix a major bug in InnoDB query estimator for queries of type SELECT ... WHERE col < x and SELECT ... WHERE col > x; MySQL could pick a table scan though the result set was only a few rows in a big table
Fix a major bug in InnoDB query estimator for queries of type SELECT ... WHERE col < x and SELECT ... WHERE col > x; MySQL could pick a table scan though the result set was only a few rows in a big table
innobase/btr/btr0cur.c:
Fix a major bug in InnoDB query estimator for queries of type SELECT ... WHERE col < x and SELECT ... WHERE col > x; MySQL could pick a table scan though the result set was only a few rows in a big table
now maintained in a separate "mysqldoc" BK source tree) - it will be
replaced with the correct manual.texi when building the official
source distribution
- fixed automake error about reservedwords.texi by moving it to EXTRA_DIST
instead
Docs/Makefile.am:
- moved reservedwords.texi from info_TEXINFOS to EXTRA_DIST since it is
not a full-featured texi file and automake would complain about
"missing @setfilename"
Docs/manual.texi:
- replaced manual.texi with a dummy placeholder file (manual.texi is
now maintained in a separate "mysqldoc" BK source tree) - it will be
replaced with the correct manual.texi when building the official
source distribution
so it's part of the distribution (manual.texi includes this file)
It will be replaced with the correct one from the mysqldoc tree before
building the distribution
- removed generation and inclusion of MIRRORS file, since the mirror list
is no longer part of manual.texi anyway
- replaced YFLAGS with AM_YFLAGS in sql/Makefile.am to make automake happy
- Redirect standard error when checking for dpkg-architecture in ltconfig
to avoid error message showing during configuration
Docs/Makefile.am:
- added reservedwords.texi (which gets included by manual.texi)
- removed MIRRORS (mirror list is not part of the manual anymore)
Docs/reservedwords.texi:
- Updated wording a bit after adding it to the tree
Makefile.am:
- removed MIRRORS from EXTRA_DIST (it's not part of the manual anymore)
ltconfig:
- Redirect standard error when checking for dpkg-architecture
to avoid error message showing during configuration (thanks to
John Wythe for the patch)
sql/Makefile.am:
- replaced YFLAGS with AM_YFLAGS to make automake happy
BitKeeper/deleted/.del-net.c~ef21d6402bb882f9:
Auto merged
innobase/os/os0file.c:
Auto merged
libmysql/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Build-tools/Do-compile:
Use local version
Makefile.am:
remove double libmysql_r
configure.in:
Use local
libmysql/libmysql.c:
Dont abort connection if too big packet error
sql/ha_innodb.cc:
use local
sql/net_serv.cc:
use local
sql/sql_parse.cc:
Merge with 3.23.55 (fix double free of user)
Fixed comparision of log-binary name to handle comparison when file name extension wraps from .999 to .1000
Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
mysql-test/r/rpl000009.result:
Fixed replication test after fixing replication of DROP/CREATE DATABASE
mysql-test/t/rpl000009.test:
Fixed replication test after fixing replication of DROP/CREATE DATABASE
sql/item_create.cc:
Added timeout for wait_for_master_pos
sql/item_create.h:
Added timeout for wait_for_master_pos
sql/item_func.cc:
Added timeout for wait_for_master_pos
sql/item_func.h:
Added timeout for wait_for_master_pos
sql/lex.h:
Added timeout for wait_for_master_pos
sql/slave.h:
Added timeout for wait_for_master_pos
Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
sql/sql_parse.cc:
Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
sql/sql_repl.cc:
Fixed comparision of log-binary name to handle comparison when file name extension wraps from .999 to .1000
sql-bench/crash-me.sh:
rectify mimer section
sql-bench/server-cfg.sh:
- Add parameter time_format_inresult
- add parameters time_format_ISO, time_format_EUR, time_format_USA,
time_format_HHMMSS, time_format_HHHHMMSS
- changed sub version() for mysql in the server-cfg, that version shows if
client connects with SSL
- made --verbose by default
- paramters func_extra_time_to_sec, ..sec_to_time, ..addtime, ..subtime,
..timediff, ..maketime, ..time, func_odbc_hour, ..hour_time, ...minute,
...second now uses time formats, that understandable for DBMS
sql-bench/test-insert.sh:
some changes for mimer compability
sql-bench/test-select.sh:
some changes for mimer compability
- renamed MySQL.rpm to MySQL-server.rpm
scripts/make_binary_distribution.sh:
- added mysql_waitpid to binary distribution (required for mysql-test-run)
support-files/mysql.spec.sh:
- renamed package "MySQL" to "MySQL-server"
- fixed Copyright tag
- added mysql_waitpid to "client" subpackage (required for mysql-test-run)
- use "gnutar" on Mac OS X to build the binary distribution
Build-tools/Do-compile:
- merged relevevant changes from 4.0 (Options no-mysqltest, no-benchmark,
log_timestamp function)
scripts/make_binary_distribution.sh:
- make sure to use "gnutar" (on Mac OS X) to pack up the binary distribution
(Mac OS X "tar" seems to be buggy - the resulting tarballs appear to be
corrupted, e.g. when opening them with Midnight Commander. GNU tar seems
to extract them correctly, though)
twice, if --enabable-thread-safe-client is enabled, which broke RPM
building)
Makefile.am:
- reverted previous patch and removed libmysql_r from SUBDIRS again
(it will automatically be added when --enable-thread-safe-client is
used)
The problem yesterday in ERROR_LOCK_VIOLATION was not InnoDB Hot Backup, but some file system backup tool: add to file writes 100 retries with 1 second waits
innobase/os/os0file.c:
The problem yesterday in ERROR_LOCK_VIOLATION was not InnoDB Hot Backup, but some file system backup tool: add to file writes 100 retries with 1 second waits
Backport from 4.0: convert TL_READ_NO_INSERT to TL_READ to allow concurrent inserts to the table in INSERT INTO ... SELECT ... FROM table
sql/ha_innobase.cc:
Backport from 4.0: convert TL_READ_NO_INSERT to TL_READ to allow concurrent inserts to the table in INSERT INTO ... SELECT ... FROM table
Convert TL_READ_NO_INSERT to TL_READ to allow concurrent inserts to the table in INSERT INTO ... SELECT ... FROM table
sql/ha_innodb.cc:
Convert TL_READ_NO_INSERT to TL_READ to allow concurrent inserts to the table in INSERT INTO ... SELECT ... FROM table
Fix an assertion about ERROR_LOCK_VIOLATION 33 in file write if InnoDB Hot Backup is run concurrently with mysqld in Windows
innobase/os/os0file.c:
Fix an assertion about ERROR_LOCK_VIOLATION 33 in file write if InnoDB Hot Backup is run concurrently with mysqld in Windows
This fixes a problem with SHOW PROCESSLIST
sql/log_event.cc:
Fixes cases where thd->query was not protected
sql/sql_acl.cc:
Table privileges was not reset on FLUSH PRIVILEGES if tables_priv was empty
sql/sql_db.cc:
Fixes cases where thd->query was not protected
myisam/mi_create.c:
Auto merged
sql/log.cc:
Auto merged
innobase/btr/btr0sea.c:
Merge with 3.23 (use local file)
sql/slave.cc:
merge with 3.23
sql/sql_db.cc:
Merge with 3.23
sql/sql_parse.cc:
Merge with 3.23
This fixes a possible core dump problem in SHOW PROCESSLIST
sql/slave.cc:
Only set thd->query to 0 if LOCK_thread_count is hold
sql/sql_db.cc:
Only set thd->query to 0 if LOCK_thread_count is hold
Also first set query_length, then query
sql/sql_parse.cc:
Indentation changes
