Sergei Golubchik
4a8938f6f5
remove the forgotten commented out piece of the old merge
2012-09-01 00:23:30 +02:00
Michael Widenius
1999be8d4e
Automatic merge with 5.5
2012-09-01 00:54:54 +03:00
Alexey Botchkov
589c62fefe
Bug #1043845 st_distance() results are incorrect depending on variable order.
...
Autointersections of an object were treated as nodes, so the wrong result.
per-file comments:
mysql-test/r/gis.result
Bug #1043845 st_distance() results are incorrect depending on variable order.
test result updated.
mysql-test/t/gis.test
Bug #1043845 st_distance() results are incorrect depending on variable order.
test case added.
sql/item.cc
small fix to make compilers happy.
sql/item_geofunc.cc
Bug #1043845 st_distance() results are incorrect depending on variable order.
Skip intersection points when calculate distance.
2012-08-31 19:50:45 +05:00
Sergei Golubchik
01ef1f0d79
fix the test to work with --lower-case-table-names=1
2012-08-31 16:48:02 +02:00
Sergei Golubchik
59408093d1
5.3 merge
2012-08-31 14:15:52 +02:00
Sergei Golubchik
a1fd37b1fd
MDEV-414 Depending on indexes or execution plans, a warning on incorrect or out of range values in WHERE condition is sometimes produced and sometimes not
...
use the same method that disables warnings in all relevant places, remove redundant function
2012-08-31 13:03:41 +02:00
Sergei Golubchik
51e14492e9
compilation warning
2012-08-31 12:01:52 +02:00
Sergei Golubchik
57694d52b4
MDEV-395 PR_SET_DUMPABLE set in unreachable code
2012-08-30 11:47:01 +02:00
unknown
10802c4d90
MDEV-381: fdatasync() does not correctly flush growing binlog file.
...
When we append data to the binlog file, we use fdatasync() to ensure
the data gets to disk so that crash recovery can work.
Unfortunately there seems to be a bug in ext3/ext4 on linux, so that
fdatasync() does not correctly sync all data when the size of a file
is increased. This causes crash recovery to not work correctly (it
loses transactions from the binlog).
As a work-around, use fsync() for the binlog, not fdatasync(). Since
we are increasing the file size, (correct) fdatasync() will most
likely not be faster than fsync() on any file system, and fsync()
does work correctly on ext3/ext4. This avoids the need to try to
detect if we are running on buggy ext3/ext4.
2012-08-30 10:53:49 +02:00
Sergei Golubchik
0536c506ff
MDEV-437 Microseconds: In time functions precision is calculated modulo 256
...
store the precision in uint, not uint8
2012-08-30 09:05:27 +02:00
Sergei Golubchik
2de4f09a75
MDEV-438 Microseconds: Precision is ignored in CURRENT_TIMESTAMP(N) when it is given as a default column value
...
The syntax for specifying precision in the DEFAULT clause is unintentional and unsupported.
Don't allow it anymore.
2012-08-29 18:36:57 +02:00
Sergei Golubchik
3444e8e925
MDEV-454 Addition of a time interval reduces the resulting value
...
1. Field_newdate::get_date should refuse to return a date with zeros when
TIME_NO_ZERO_IN_DATE is set, not when TIME_FUZZY_DATE is unset
2. Item_func_to_days and Item_date_add_interval can only work with valid dates,
no zeros allowed.
2012-08-29 17:55:59 +02:00
Sergei Golubchik
b45c551ee3
MDEV-448 Memory loss warnings in mysqldump when more than one schema is dumped
2012-08-29 15:19:17 +02:00
Sergei Golubchik
a44331ab34
MDEV-456 An out-of-range datetime value (with a 5-digit year) can be created and cause troubles
...
fix Item_func_add_time::get_date() to generate valid dates.
Move the validity check inside get_date_from_daynr()
instead of relying on callers
(5 that had it, and 2 that did not, but should've)
2012-08-29 10:59:51 +02:00
unknown
95ee3fbf30
MDEV-492: fixed incorrect error check.
2012-08-29 11:35:42 +03:00
Michael Widenius
7dad536337
Split ER_NO_SUCH_TABLE into ER_NO_SUCH_TABLE and ER_NO_SUCH_TABLE_IN_ENGINE to be able to distingus if a .frm file is missing or if the table is missing in the engine.
...
sql/handler.cc:
Added ER_NO_SUCH_TABLE_IN_ENGINE
sql/rpl_record.cc:
Fixed wrong printf
sql/share/errmsg-utf8.txt:
Added ER_NO_SUCH_TABLE_IN_ENGINE
sql/sp.cc:
Added ER_NO_SUCH_TABLE_IN_ENGINE
sql/sp_head.cc:
Added ER_NO_SUCH_TABLE_IN_ENGINE
sql/sql_admin.cc:
Added ER_NO_SUCH_TABLE_IN_ENGINE
sql/sql_base.cc:
Added ER_NO_SUCH_TABLE_IN_ENGINE
sql/sql_show.cc:
Added ER_NO_SUCH_TABLE_IN_ENGINE
sql/table.cc:
Fixed typo
2012-08-28 19:39:49 +03:00
Sergey Petrunya
b6eccf51c0
Update test results (checked)
2012-08-28 16:03:22 +04:00
Sergey Petrunya
97bd8d8909
MDEV-405: Server crashes in test_if_skip_sort_order on EXPLAIN with GROUP BY and HAVING in EXISTS subquery
...
- Testcase
2012-08-28 15:40:38 +04:00
Sergey Petrunya
78497dbf5a
Merge
2012-08-28 15:20:37 +04:00
Sergey Petrunya
2d99ea454f
MDEV-430: Server crashes in select_describe on EXPLAIN with materialization+semijoin, etc
...
- Don't do early cleanup of uncorrelated subqueries if we're running an EXPLAIN.
2012-08-28 15:15:05 +04:00
Alexey Botchkov
ac982b0a21
MDEV-471 update help tables.
...
the fill_help_table-5.5.sql file was copied into mariadb.
per-file comments:
scripts/fill_help_tables.sql
MDEV-471 update help tables.
2012-08-28 15:07:50 +05:00
Sergey Petrunya
da3a1c8156
Fix bugs in BatchedKeyAccess that show up when working with a
...
storage engine in HA_MRR_NO_ASSOCIATION mode.
(there is no testcase because we don't ship any such engines currently)
2012-08-28 13:51:01 +04:00
Sergei Golubchik
9a64d0794c
5.3 merge
2012-08-27 18:13:17 +02:00
Sergei Golubchik
e988c4dde6
MDEV-336 oqgraph 5.5 crashes in buildbot
...
force -fno-strict-aliasing for oqgraph
2012-08-24 23:43:18 +02:00
unknown
4d2b05b7d7
fix for MDEV-367
...
The problem was that was_null and null_value variables was reset in each reexecution of IN subquery, but engine rerun only for non-constant subqueries.
Fixed checking constant in Item_equal sort.
Fix constant reporting in Item_subselect.
2012-08-25 09:15:57 +03:00
unknown
b02ad35e94
Merge from 5.2
2012-08-24 19:13:34 +02:00
unknown
caea98a417
Merge from 5.1
2012-08-24 19:12:47 +02:00
unknown
f37610ecb4
Fix compiler warning
2012-08-24 19:11:54 +02:00
unknown
f090677383
Merge from 5.2.
2012-08-24 15:39:34 +02:00
unknown
c64afe8d94
Merge from 5.1.
2012-08-24 15:37:39 +02:00
unknown
077e453f9f
Fix compiler warnings
2012-08-24 15:32:44 +02:00
Vladislav Vaintroub
f024e0d5e9
MDEV-484 : allow compilation/packaging on Windows with newly released VS2012
2012-08-24 15:30:05 +02:00
unknown
ced3907c02
Merge from 5.3
2012-08-24 15:29:01 +02:00
unknown
4092d08bb8
Merge into latest 5.3
2012-08-24 14:26:23 +02:00
unknown
fc666a0df6
merge from 5.2
2012-08-24 14:02:32 +02:00
unknown
caa535eb9f
Merge from 5.3
2012-08-24 13:57:39 +02:00
unknown
e44a800d91
Merge from 5.2
2012-08-24 13:51:16 +02:00
unknown
89e4d23f3b
Merge into latest 5.2.
2012-08-24 12:57:19 +02:00
unknown
96703a63da
Merge from 5.1.
2012-08-24 12:32:46 +02:00
unknown
4997ddfa9e
Merge with latest 5.1.
2012-08-24 10:34:55 +02:00
unknown
cdeabcfd43
MDEV-382: Incorrect quoting
...
Various places in the server replication code was incorrectly quoting
strings, which could lead to incorrect SQL on the slave/mysqlbinlog.
2012-08-24 10:06:16 +02:00
Sergei Golubchik
6c3a756dd9
MDEV-439 cmake -DWITHOUT_SERVER does not work
...
fix mysys/waiting_threads.c to compile w/o performance schema
include clients. scripts and manpages in -DWITHOUT_SERVER
2012-08-23 15:36:38 +02:00
Sergei Golubchik
df5aabba12
MDEV-469 Debian/Ubuntu build dependencies for source package mariadb-5.5 does not includes "cmake"
...
only add cmake as a build dependency for distributions, where cmake is recent enough
2012-08-23 15:32:03 +02:00
Sergei Golubchik
ec263757b6
remove duplicate code from the factorial dbug example
2012-08-23 15:30:43 +02:00
Sergei Golubchik
4201939d57
remove mysql-5.1 assert that is already absent in mysql-5.5
2012-08-23 13:52:36 +02:00
Sergei Golubchik
ef7389be51
MDEV-469 Debian/Ubuntu build dependencies for source package mariadb-5.5 does not includes "cmake"
2012-08-22 23:33:45 +02:00
Sergei Golubchik
8d69a0feaa
MDEV-472 mysql-test-run --valgrind main.ps_2myisam gives warning about not initialized memory
...
Item::get_date() should return 1 unless the value is a valid date.
2012-08-22 18:40:27 +02:00
Michael Widenius
653492fb23
More DBUG_ENTER, to make it easier to find out where free_root(thd->mem_root) is called
2012-08-22 18:03:31 +03:00
Sergei Golubchik
f72a765997
5.2 merge.
...
two tests still fail:
main.innodb_icp and main.range_vs_index_merge_innodb
call records_in_range() with both range ends being open
(which triggers an assert)
2012-08-22 16:45:25 +02:00
Sergei Golubchik
1fd8150a5b
5.1 merge
...
increase xtradb verson from 13.0 to 13.01
2012-08-22 16:13:54 +02:00