Commit graph

78590 commits

Author SHA1 Message Date
Alexander Barkov
c51ed128b0 Merge from 5.3 2013-07-10 02:05:06 +04:00
Sergei Golubchik
e06cc1adce MDEV-4758 10.0-monty tree: ALTER TABLE CHANGE COLUMN doesn't drop EITS stats
add missing rename_column_in_stat_tables(), delete_statistics_for_column(),
delete_statistics_for_index(), rename_table_in_stat_tables() calls.
2013-07-09 22:36:53 +02:00
Sergei Golubchik
c3e3c78048 cmake: don't check for the compiler on every invocation of RESTRICT_SYMBOL_EXPORTS(),
do it only once
2013-07-09 22:30:04 +02:00
Vladislav Vaintroub
6bef652d91 MDEV-4409 - Fix deadlock in MySQL key cache code, that can happen if there is a key cache resize running in parallel with an update.
If there is a key cache resize,a  thread writing to key cache, will pause waiting  until resize finishes. However this thread is won't be woken, because resize does not  signaling waiters anymore. This is a regression introduced in WL#86(segmented MyISAM key cache)
The fix is to unconditionally release  threads waiting on resize_queue when resize  finishes, as in pre-WL#86 code.
2013-07-09 22:24:57 +02:00
Sergei Golubchik
f171d3ff79 commit_1innodb.test: update results from 5.6 2013-07-09 18:43:12 +02:00
Sergei Golubchik
67002a58ce fix mysql_client_test failure, sometimes we do warnings differently 2013-07-09 18:09:22 +02:00
unknown
8f56dc7203 Cought errors are not shown 2013-07-09 21:15:01 +03:00
Sergey Petrunya
3e740c259d 10.0-monty: trivial test result updates 2013-07-09 15:39:57 +04:00
Sergey Petrunya
7a9eae5803 Trivial test result updates. 2013-07-09 13:40:26 +04:00
Sergey Petrunya
56a6e71f9c Fix merge.test failure
- Problem: mysql_admin_table() calls open_temporary_tables(). This 
  causes assertion failure, because mysql_execute_command() has 
  already called open_temporary_tables()
- Solution: call close_thread_tables() at the start of 
  mysql_admin_table(), like mysql-5.6 does
2013-07-09 15:42:36 +04:00
Alexander Barkov
8a732d5a5e Merge from 5.2
modified:
  mysql-test/suite/plugins/r/fulltext_plugin.result
  mysql-test/suite/plugins/t/fulltext_plugin.test
  plugin/fulltext/plugin_example.c
  sql/sql_show.cc
pending merges:
  Alexander Barkov 2013-07-09 [merge] Merge from 5.1
    Sergei Golubchik 2013-07-06 Bug #69682 - mysqld crashes after uninst...
    Sergei Golubchik 2013-05-24 MDEV-4575 MySQL client doesn't strip off...
2013-07-09 11:02:56 +04:00
Alexander Barkov
762d3cb8ed Merge from 5.1
modified:
  mysql-test/suite/plugins/r/fulltext_plugin.result
  mysql-test/suite/plugins/t/fulltext_plugin.test
  plugin/fulltext/plugin_example.c
  sql/sql_show.cc
pending merges:
  Sergei Golubchik 2013-07-06 Bug #69682 - mysqld crashes after uninstall ...
    Sergei Golubchik 2013-05-24 MDEV-4575 MySQL client doesn't strip off...
2013-07-09 10:54:47 +04:00
Igor Babaev
c9ad326065 Merge 2013-07-08 22:06:04 -07:00
Igor Babaev
0977734cee Fixed all remaining failures in partition tests.
Commented out the test case for bug 50036 as it was done in mysql-5.6.10.
2013-07-08 18:35:44 -07:00
Igor Babaev
24b9c17506 Merge 2013-07-08 12:59:18 -07:00
Igor Babaev
f1848be746 Fixed a failure in partition_truncate.test. 2013-07-08 12:55:11 -07:00
Olivier Bertrand
b3ad9a97e9 - Suppress some ubuntu compiler warnings
modified:
  storage/connect/connect.cc
  storage/connect/ha_connect.cc
  storage/connect/mycat.cc
  storage/connect/odbconn.cpp
  storage/connect/osutil.c
  storage/connect/tabutil.cpp
2013-07-08 19:03:15 +02:00
Sergey Petrunya
eb288af54d Automatic merge 2013-07-08 20:45:02 +04:00
Sergey Petrunya
c3e70a0104 Fix assert failures in main.merge test (line 234) and main.merge_mmap (line 44)
- After the merge from mysql-5.6, open_tables() did not call
  open_and_process_table() for temporary table. The logic was that temporary
  tables were already opened when mysql_execute_command() has called 
  open_temporary_tables().
  This worked for the most part, except for temporary tables of type MERGE. for
  which open_and_process_table() must call 
    table->file->extra(HA_EXTRA_ADD_CHILDREN_LIST).
  Failure to make this call resulted in crash further in execution.

  tables->table->file->extra(HA_EXTRA_ADD_CHILDREN_LIST)
2013-07-08 20:21:27 +04:00
Sergey Petrunya
09e2501f0d More trivial test result updates 2013-07-08 18:29:52 +04:00
Sergey Petrunya
66f1a848f4 Automatic merge 2013-07-08 18:15:50 +04:00
unknown
d82b512535 fixed result. 2013-07-08 19:11:57 +03:00
Sergey Petrunya
964d42631c Fix test failure in myisam.test:
- Put back the code tht produces the warning about 
  "Table storage engine %s does not support the create option 'TRANSACTIONAL=1'"
2013-07-08 18:14:24 +04:00
Alexander Barkov
7adf46f662 Re-enabling connect tests in 10.0-connect
(still disabled in 10.0 due to valgrind failures)

modified:
  mysql-test/mysql-test-run.pl
2013-07-08 17:26:27 +04:00
Alexander Barkov
17f3ae267f Merging from 10.0-connect
added:
  storage/connect/mysql-test/connect/r/mul.result
  storage/connect/mysql-test/connect/t/mul.test
modified:
  storage/connect/domdoc.h
  storage/connect/filamfix.cpp
  storage/connect/filamtxt.cpp
  storage/connect/filamvct.cpp
  storage/connect/fmdlex.c
  storage/connect/global.h
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
  storage/connect/inihandl.c
  storage/connect/inihandl.h
  storage/connect/libdoc.cpp
  storage/connect/libdoc.h
  storage/connect/mycat.cc
  storage/connect/myconn.cpp
  storage/connect/mysql-test/connect/r/dbf.result
  storage/connect/mysql-test/connect/t/odbc_sqlite3.test
  storage/connect/myutil.cpp
  storage/connect/odbconn.cpp
  storage/connect/osutil.c
  storage/connect/plgdbsem.h
  storage/connect/plgdbutl.cpp
  storage/connect/plgxml.h
  storage/connect/plugutil.c
  storage/connect/tabdos.cpp
  storage/connect/tabfix.cpp
  storage/connect/tabmul.cpp*
  storage/connect/tabmysql.cpp
  storage/connect/tabmysql.h
  storage/connect/taboccur.cpp
  storage/connect/taboccur.h
  storage/connect/tabodbc.cpp
  storage/connect/tabpivot.h
  storage/connect/tabsys.cpp
  storage/connect/tabtbl.cpp
  storage/connect/tabtbl.h
  storage/connect/tabvct.cpp
  storage/connect/tabxml.cpp
  storage/connect/valblk.cpp
  storage/connect/value.cpp
  storage/connect/xindex.cpp
pending merges:
  Olivier Bertrand 2013-07-08 - Suppressing wrong code (INI tables are not...
    Alexander Barkov 2013-07-08 Adding instructions on how to install sq...
    Alexander Barkov 2013-07-08 Fixing some of the memory leaks in ODBCC...
    Alexander Barkov 2013-07-08 Fixing a warning:
    Alexander Barkov 2013-07-08 Fixing warnings:
    Alexander Barkov 2013-07-08 Fixing a warning:
    Alexander Barkov 2013-07-08 Fixing warnings:
    Alexander Barkov 2013-07-08 Fixing a warning:
    Alexander Barkov 2013-07-08 Fixing warnings:
    Alexander Barkov 2013-07-08 Fixing warnings:
    Alexander Barkov 2013-07-08 fixing warnings:
    Alexander Barkov 2013-07-08 Fixing a typo in the previous push
    Alexander Barkov 2013-07-08 fixing warnings:
    Alexander Barkov 2013-07-08 Fixing the "no previous declaration for ...
    Alexander Barkov 2013-07-08 Fixing numerous "variable is set but nev...
    Olivier Bertrand 2013-07-06 - Remove unuseful option causing valgrin...
    Olivier Bertrand 2013-07-05 - Try to fix a uninitialised valgrind wa...
    Olivier Bertrand 2013-07-04 - Make sure Remark is initialised
    Olivier Bertrand 2013-07-04 - Make sure Remark is initialised in ha_...
    Olivier Bertrand 2013-07-03 - Makes memory check conditionally
    Olivier Bertrand 2013-07-03 - Make sure result are ordered the same ...
    Olivier Bertrand 2013-07-02 - Fix memory leak in libdoc.cpp in LIBXM...
    Olivier Bertrand 2013-06-30 - Working on eliminating valgrind warnin...
    Olivier Bertrand 2013-06-30 - Trying to get rid of some valgrind war...
    Olivier Bertrand 2013-06-29 - Release storage allocated by flex
    Olivier Bertrand 2013-06-29 - Add the PROFILE_End function in inihan...
    Olivier Bertrand 2013-06-28 - Release memory allocated by inihandl i...
    Olivier Bertrand 2013-06-26 - Trying to remove those warnings about ...
    Olivier Bertrand 2013-06-26 - In connect_assisted_discovery the test...
    Olivier Bertrand 2013-06-26 - Fix potential bug in MYSQLCOL::WriteCo...
    Olivier Bertrand 2013-06-16 - Implemented: The use of Federated serv...
    Olivier Bertrand 2013-06-14 - Add a test case for multiple tables
    Olivier Bertrand 2013-06-14 - Fix regression error for multiple 2 ta...
    Olivier Bertrand 2013-06-12 - To avoid crashing in debug mode, the e...
    Olivier Bertrand 2013-06-12 - Suballocate filename in TDBMUL::InitFi...
    Olivier Bertrand 2013-06-12 - Add trace in TDBMUL::GetMaxSize.
    Olivier Bertrand 2013-06-12 - Fix MDEV-4638
    Olivier Bertrand 2013-06-08 [merge] - Commit merged changes
    Alexander Barkov 2013-06-08 Enabling Connect tests
    Olivier Bertrand 2013-06-08 - Set timeout values in MYSQLC::Open
2013-07-08 17:21:47 +04:00
Alexander Barkov
1f3ec9800c Merging from 5.3
modified:
  include/my_time.h
  libmysql/libmysql.c
  mysql-test/r/adddate_454.result
  mysql-test/r/cast.result
  mysql-test/r/date_formats.result
  mysql-test/r/func_sapdb.result
  mysql-test/r/func_time.result
  mysql-test/r/mdev316.result
  mysql-test/r/parser.result
  mysql-test/r/partition_datatype.result
  mysql-test/r/partition_pruning.result
  mysql-test/r/type_date.result
  mysql-test/r/type_datetime.result
  mysql-test/suite/vcol/r/vcol_misc.result
  mysql-test/t/cast.test
  sql-common/my_time.c
  sql/field.cc
  sql/field_conv.cc
  sql/filesort.cc
  sql/item.cc
  sql/item.h
  sql/item_cmpfunc.cc
  sql/item_func.cc
  sql/item_strfunc.cc
  sql/item_timefunc.cc
  sql/sql_time.cc
pending merges:
  Sergei Golubchik 2013-07-03 MDEV-4667 DATE('string') incompability betwe...
2013-07-08 16:49:42 +04:00
Olivier Bertrand
f3078f01b2 - Suppressing wrong code (INI tables are not indexables)
modified:
  storage/connect/tabsys.cpp
2013-07-08 12:20:12 +02:00
Alexander Barkov
ba0abd7717 Adding instructions on how to install sqlite3 ODBC driver
for test purposes.

modified:
  storage/connect/mysql-test/connect/t/odbc_sqlite3.test
2013-07-08 13:39:45 +04:00
Alexander Barkov
d7283bc59a Fixing some of the memory leaks in ODBCColumns().
modified:
  storage/connect/odbconn.cpp
2013-07-08 13:11:40 +04:00
Sergey Petrunya
97d125084d Automatic merge 2013-07-08 12:59:50 +04:00
unknown
54999b2863 Merge performance schema test cases from MySQL 5.6.10
Merged the majority of the PFS test cases.
There are still 19 failing test cases that need more attention.
2013-07-08 15:19:50 +03:00
Sergey Petrunya
50dda403b7 Fix test errors like:
-Note 1031 Table storage engine for 't1' doesn't have this option
+Note 1031 Table storage engine for 'InnoDB' doesn't have this option

They were caused by a change in MariaDB which changed ER_ILLEGAL_HA message 
text to be like:
"Storage engine InnoDB of the table `test`.`t1` doesn't have this option"

Some the error calls were changed to pass new parameters, but some were left
to be old. Also the error text in errmsg-ut8.txt was not changed.
2013-07-08 12:57:58 +04:00
Alexander Barkov
a8fb8e141e Fixing a warning:
- cast to pointer from integer of different size 

modified:
  storage/connect/odbconn.cpp
2013-07-08 11:43:45 +04:00
Alexander Barkov
309f59a5c8 Fixing warnings:
- no previous declaration for ‘const char* PLGtoMYSQLtype
- no previous declaration for ‘int MYSQLtoPLG(int)’
- no previous declaration for ‘char* MyDateFmt(int)’
- no previous declaration for ‘char* MyDateFmt(char*)’
- no previous declaration for ‘int MYSQLtoPLG(char*)’
- no previous declaration for ‘enum_field_types PLGtoMYSQL

modified:
  storage/connect/myutil.cpp
2013-07-08 11:28:07 +04:00
Alexander Barkov
6dbc562b5d Fixing a warning:
- no previous declaration for ‘void* ThreadOpen(void*)’


modified:
  storage/connect/tabtbl.h
2013-07-08 11:26:24 +04:00
Alexander Barkov
a3c4f8729d Fixing warnings:
- no previous declaration for ‘bool OcrSrcCol'
- no previous declaration for ‘bool OcrColumns'
- no previous declaration for ‘_qryres* PivotColumns'

modified:
  storage/connect/ha_connect.cc
  storage/connect/taboccur.h
  storage/connect/tabpivot.h
2013-07-08 11:22:32 +04:00
Alexander Barkov
c5b631cefa Fixing a warning:
- no previous declaration for ‘int PrepareColist

modified:
  storage/connect/taboccur.cpp
2013-07-08 11:16:16 +04:00
Sergey Petrunya
30e34252f4 More test result updates:
- Update test results for tests using SPs: SPs no longer
  emit warnings/errors that were caught and handled inside SP
2013-07-08 11:16:11 +04:00
Sergey Petrunya
4f22919f5c More trivial test results updates 2013-07-08 13:42:38 +04:00
Alexander Barkov
63522ed38e Fixing warnings:
- no previous declaration for ‘char* GetIni(int)’
- no previous declaration for ‘void SetTrc()’

modified:
  storage/connect/plgdbsem.h
  storage/connect/plgdbutl.cpp
2013-07-08 11:11:53 +04:00
Alexander Barkov
e46f8f3d0a Fixing warnings:
- no previous declaration for ‘void XmlCleanupParserLib()’
- no previous declaration for ‘void CloseXML2File’
- no previous declaration for ‘void XmlInitParserLib()’

modified:
  storage/connect/ha_connect.cc
  storage/connect/libdoc.cpp
  storage/connect/libdoc.h
  storage/connect/plgdbutl.cpp
2013-07-08 11:05:59 +04:00
Alexander Barkov
f9ba807354 fixing warnings:
- no previous declaration for ‘ddwrap’
- implicit declaration of function ‘ddwrap’

modified:
  storage/connect/fmdlex.c
2013-07-08 10:52:20 +04:00
unknown
928b21a93c The compiler warning about ';' fix. 2013-07-08 09:50:18 +03:00
Alexander Barkov
f2d2c1ea32 Fixing a typo in the previous push
modified:
  storage/connect/fmdlex.c
2013-07-08 10:49:50 +04:00
Alexander Barkov
269fd01bc1 fixing warnings:
- no previous declaration for ‘_isatty’
- implicit declaration of function ‘_isatty’

modified:
  storage/connect/fmdlex.c
  storage/connect/osutil.c
2013-07-08 10:46:15 +04:00
Alexander Barkov
e2461d47cb Fixing the "no previous declaration for ‘_strerror'" warning.
modified:
  storage/connect/filamvct.cpp
  storage/connect/osutil.c
  storage/connect/tabvct.cpp
2013-07-08 10:37:09 +04:00
Alexander Barkov
66c1665e89 Fixing numerous "variable is set but never used" warnings.
modified:
  storage/connect/filamfix.cpp
  storage/connect/filamtxt.cpp
  storage/connect/filamvct.cpp
  storage/connect/odbconn.cpp
  storage/connect/tabodbc.cpp
  storage/connect/xindex.cpp
2013-07-08 10:20:53 +04:00
Sergey Petrunya
72c33d24d0 Update test results to fix trivial test failures in parts testsuite
- New error message text
- PARTITION is now a reserved word in SQL, so it should be quoted
2013-07-07 14:09:52 +04:00
Sergei Golubchik
48b403cd65 Bug #69682 - mysqld crashes after uninstall of plugin with "first" status var 2013-07-06 15:28:11 +02:00
Olivier Bertrand
6344644043 - Remove unuseful option causing valgrind error or warning
modified:
  storage/connect/myconn.cpp
2013-07-06 10:58:22 +02:00