Commit graph

78543 commits

Author SHA1 Message Date
Michael Widenius
a9d1d76e5e Fixed issues with partitions and create temporary table SELECT ...
Merged all ddl_logging code.
Merged sql_partition.cc
innodb_mysql_lock2.test and partition_cache.test now works.
Changed interface to strconvert() to make it easier to use with not \0 terminated strings.

sql/sql_partition.cc:
  Full merge with 5.6
sql/sql_table.cc:
  Merged all ddl_logging code
sql/strfunc.cc:
  Added from_length argument to strconvert() to make it possible to use without end terminated strings.
sql/strfunc.h:
  Added from_length argument to strconvert() to make it possible to use without end terminated strings.
2013-07-03 22:50:34 +03:00
Sergey Petrunya
f335c36e27 Fix a number of trivial test failures by updating error message:
"Unknown table tbl" is now "Unknown table database.tbl"
2013-07-03 20:02:48 +04:00
Sergey Petrunya
e98bb64cbe MDEV-4750: (patch#2): undo previous attempts to stabilize
persistent table statistics with ANALYZE TABLE commands
2013-07-03 19:42:05 +04:00
Sergey Petrunya
6baf3e1304 Merge 2013-07-03 19:40:40 +04:00
unknown
9c1285ba6c MDEV-4058
MySQL 5.6.10 performance schema: merge of the test files for the host_cache table

With this patch, all tests perfschema.hostcache_* pass.
There are still some additional unmerged minor changes to these tests
in mysql 5.6.10.
2013-07-03 22:34:12 +03:00
Sergey Petrunya
4e89ec6692 MDEV-4750: Fix a number of test failures in EXPLAIN outputs
caused by weird behavior in innodb's persistent stats
- Run the testsuite without innodb persistent stats
2013-07-03 19:32:58 +04:00
Sergey Petrunya
9e5828f13f Fix test failure in mysql-test/t/type_bit_innodb.test
- Run ANALYZE TABLE after insert, like mysql-5.6 does.
2013-07-03 14:42:48 +04:00
Sergey Petrunya
bff40f3e0d Fix test failure for join_outer_innodb.test:
reuse the approach from vasil.dimov@oracle.com-20120521133620-glj6l0ntcsrz0wbl
run ANALYZE TABLE.
2013-07-03 14:24:56 +04:00
Olivier Bertrand
59b3833c41 - Make sure result are ordered the same on all platforms
modified:
  storage/connect/mysql-test/connect/r/mul.result
  storage/connect/mysql-test/connect/t/mul.test
2013-07-03 12:06:49 +02:00
unknown
5f0d489da8 MDEV-4058
MySQL 5.6.10 performance schema: merge of the test files for the host_cache table
2013-07-03 12:19:03 +03:00
Sergei Golubchik
78cc6db44a MDEV-4667 DATE('string') incompability between mysql and mariadb
Cleanup: remove TIME_FUZZY_DATE.

Introduce TIME_FUZZY_DATES which means "very fuzzy, the resulting
value is only used for comparison. It can be invalid date, fine, as long as it can be
compared".

Updated many tests results (they're better now).
2013-07-03 09:46:20 +02:00
unknown
68262ba648 ps_ddl1.test fix 2013-07-03 10:22:19 +03:00
unknown
eed698e975 ps.test fixed 2013-07-03 10:19:47 +03:00
unknown
68daeda521 ps_1general fixed. 2013-07-03 10:18:22 +03:00
Michael Widenius
82a0b8ae30 strict.test now works. 2013-07-02 22:11:12 +03:00
Michael Widenius
99aae21ed2 mdl_sync now works.
mysql-test/r/mdl_sync.result:
  Full merge with 5.6
mysql-test/t/mdl_sync.test:
  Full merge with 5.6
sql/debug_sync.cc:
  Full merge with 5.6
sql/debug_sync.h:
  Full merge with 5.6
sql/mdl.cc:
  Full merge with 5.6
sql/sql_base.cc:
  Removed code not in 5.6 anymore
2013-07-02 20:43:35 +03:00
unknown
b7b2a7ce81 Pull of revision 3313 (Pre-requisite patch for Bug#11763162 (55843 - Handled condition
appears as not handled) fixed.
2013-07-02 16:44:53 +03:00
Olivier Bertrand
37fce46f66 - Fix memory leak in libdoc.cpp in LIBXMLDOC::GetNodeList replacing
xmlXPathFreeNodeSetList(Xop);         // Caused memory leak, by
  xmlXPathFreeObject(Xop);

modified:
  storage/connect/libdoc.cpp
2013-07-02 00:07:48 +02:00
Sergei Golubchik
6fb53d3013 MDEV-4718 Test "outfile_loaddata" fails on bigendian arches (ppc64)
for field terminators, uchar was compared with char
2013-07-01 17:54:24 +02:00
Sergei Golubchik
9675ddc9a2 MDEV-4670 THD::awake bug with my_sleep call 2013-07-01 12:03:10 +02:00
Sergei Golubchik
03c71ff2ba MDEV-4683 query start_time not reset when going to sleep 2013-07-01 12:02:44 +02:00
unknown
2fac162f39 correct result of the ps.tset 2013-07-01 11:31:18 +03:00
Olivier Bertrand
29f10f0ff1 - Working on eliminating valgrind warning/errors
modified:
  storage/connect/tabdos.cpp
  storage/connect/tabfix.cpp
  storage/connect/value.cpp
2013-06-30 19:08:09 +02:00
Olivier Bertrand
b98360a42f - Trying to get rid of some valgrind warnings
modified:
  storage/connect/mycat.cc
  storage/connect/valblk.cpp
  storage/connect/value.cpp
2013-06-30 12:43:30 +02:00
Olivier Bertrand
639ce0650c - Release storage allocated by flex
modified:
  storage/connect/fmdlex.c
2013-06-29 22:53:21 +02:00
Olivier Bertrand
b8d6f97380 - Add the PROFILE_End function in inihandl. Called by connect_done_func
to release the cache memory allocated by the PROFILE perocessing.
  (also add some break at the end of switch's to avoid warnings)

modified:
  storage/connect/filamvct.cpp
  storage/connect/ha_connect.cc
  storage/connect/inihandl.c
  storage/connect/inihandl.h
2013-06-29 01:10:31 +02:00
Alexander Barkov
a924e9004c Merge
pending merges:
  Alexander Barkov 2013-06-28 A clean-up for MDEV-4634
2013-06-28 16:27:22 +04:00
Alexander Barkov
cfae3065d7 A clean-up for MDEV-4634
modified:
  sql/time.cc
2013-06-28 16:25:06 +04:00
Olivier Bertrand
9508e913e7 - Release memory allocated by inihandl in connect_done_func.
modified:
  storage/connect/ha_connect.cc

- Remove unuseful last change

modified:
  storage/connect/block.h
2013-06-28 14:22:32 +02:00
Alexander Barkov
f13236be86 Merge from 5.3
modified:
  mysql-test/r/type_date.result
  mysql-test/r/type_datetime.result
  mysql-test/r/type_time.result
  mysql-test/t/type_date.test
  mysql-test/t/type_datetime.test
  mysql-test/t/type_time.test
  sql/item_func.cc
  sql/item_timefunc.cc
  sql/sql_time.cc
  sql/sql_time.h
pending merges:
  Alexander Barkov 2013-06-28 MDEV-4634 Crash in CONVERT_TZ
2013-06-28 15:20:40 +04:00
Alexander Barkov
0e44faf27f MDEV-4634 Crash in CONVERT_TZ
Item_func_min_max::get_date() did not check the
returned value against the fuzzy_date flags, so
it could return a bad value to the caller that
expects a good date (e.h. CONVERT_TZ).


modified:
  mysql-test/r/type_date.result
  mysql-test/r/type_datetime.result
  mysql-test/r/type_time.result
  mysql-test/t/type_date.test
  mysql-test/t/type_datetime.test
  mysql-test/t/type_time.test
  sql/item_func.cc
  sql/item_timefunc.cc
  sql/mysql_priv.h
  sql/time.cc
2013-06-28 12:00:25 +04:00
Michael Widenius
ecf9b1b754 Fixed some wrong format strings.
Fixed OPTIMIZE with innodb


include/my_sys.h:
  Removed ATTRIBUTE_FORMAT() as it gave warnings for %'s
sql/log_event.cc:
  Optimization: 
  use my_b_write() and my_b_write_byte() instead of my_b_printf()
  use strmake() instead of my_snprintf()
sql/sql_admin.cc:
  Fixed bug in admin_recreate_table()
  Fixed OPTIMIZE with innodb
sql/sql_table.cc:
  Indentation fixes
strings/my_vsnprintf.c:
  Changed fprintf() to fputs()
2013-06-28 01:53:41 +03:00
unknown
70092601bc merge of 2876.430.11 & 2876.430.1
CF_PREOPEN_TMP_TABLES & CF_HA_CLOSE & Patch for Bug#11746602 (27480: Extend CREATE TEMPORARY TABLES 
  privilege to allow temp table operations).
2013-06-27 17:42:18 +03:00
Vladislav Vaintroub
d058863d8e MDEV-4720 : fix my_context.h for use with x32 ABI.
Do not use x64  assembler implementation in  x32.
2013-06-27 14:19:04 +02:00
Sergey Vojtovich
0b116de7c5 MDEV-4438 - Spider storage engine 2013-06-27 15:18:48 +04:00
Michael Widenius
94d722b6a4 ha_partition.cc and ha_partition.h are now completely merged
Added sql_mode_t to simplify merges
2013-06-27 14:01:03 +03:00
unknown
ecbf36a914 MDEV-4058
MySQL 5.6.10 performance schema: merge of host_cache table
2013-06-27 12:51:34 +03:00
Olivier Bertrand
2662ae4b2b - Trying to remove those warnings about non virtual destructor
modified:
  storage/connect/block.h
2013-06-26 20:00:15 +02:00
Olivier Bertrand
d662c48a68 - In connect_assisted_discovery the test on topt->quoted must
be done on its signed value

modified:
  storage/connect/ha_connect.cc
2013-06-26 19:52:38 +02:00
Olivier Bertrand
c6c1a6e2e8 - Fix potential bug in MYSQLCOL::WriteColumn: ShowValue was call with
*Bind->length instead of Bind->buffer_length

modified:
  storage/connect/tabmysql.cpp
2013-06-26 19:42:28 +02:00
unknown
e7606294b2 A fix of unions with duplicate rows and returning bug fix for lp:732124 union + limit returns wrong result 2013-06-26 13:17:27 +03:00
Igor Babaev
68929e8e3f Some corrections of the merge for the partition code. 2013-06-25 18:55:12 -07:00
Sergei Golubchik
639baee61b cleanup: remove LF_REQUIRE_PINS, use compile_time_assert() instead of reimplementing it 2013-06-24 20:56:55 +02:00
Sergei Golubchik
31a1934c9c MDEV-4660 SHUTDOWN command
Based on James Briggs contribution.
2013-06-24 20:56:49 +02:00
Sergei Golubchik
e8ab897fca MDEV-4617 PLUGINS - Show internal Locales in I_S
INFORMATION_SCHEMA.LOCALES plugin.
Contribution by Roberto Spadim
2013-06-24 20:56:30 +02:00
Elena Stepanova
850c77b72c Added calls for BINLOG_GTID_POS() function to the basic GTID test case 2013-06-25 12:05:52 +04:00
unknown
748e8a35c9 Fix sporadic failure of test rpl.rpl_gtid_startpos
The test did RESET MASTER and then tried to use --sync_with_master
to wait for GTID-based replication to catch up. This though has
a race, there is a small window where the _old_ pre-RESET MASTER
position on the slave is higher than the new pos-RESET MASTER
position, causing the --sync_with_master to be a no-op.

Fix by using include/wait_condition.inc instead.
2013-06-24 16:33:31 +02:00
Michael Widenius
4aa9b285bb Added option to avoid warnings from innodb 2013-06-23 12:15:43 +03:00
Michael Widenius
5f4e0e8767 Don't update table and index statics for temporary tables
Fixed type and testing of last_update type for innodb_table_stats

mysql-test/r/connect.result:
  Removed tables which are not created anymore
sql/item_sum.h:
  Fixed typo
sql/sql_base.cc:
  Don't update table and index statics for temporary tables
sql/sys_vars.cc:
  Merge
storage/innobase/dict/dict0stats.cc:
  Fixed type last_update to TIMESTAMP.
2013-06-22 18:47:12 +03:00
Sergei Golubchik
7c61679c4e MDEV-4685 Compile error on LFS
fix the code to compile w/o perfomance schema
2013-06-22 14:02:03 +02:00