Commit graph

7488 commits

Author SHA1 Message Date
Michael Widenius
668306640e Fixed MDEV-4291: Assertion `trid >= info->s->state.create_trid' failure or data corruption (key points to record
outside datafile) on INSERT into an Aria table.

The isssue was that the check if a table was moved between systems didn't take into account that create_trid could be bigger than the current max trid on the new system.
This could only happen if one tried to move a table that one had just done a 'REPAIR TABLE' on.
Tables that one had run 'aria_chk --zerofill' on worked.

Fixed this by assuming that if create_trid is too big then the table has been moved from one system to another and we have to do an automatic zerofill.

Other fixed:

- Added a check to detect a wrong create_trid in 'check table'.
- aria_chk -dvv will now write out also the create_trid (to make future error finding easier)
- aria_chk --zerofill doesn't anymore require a aria_control_file
- Removed some warnings from safemalloc when using aria_chk, ma_test1 and ma_test2.


include/myisamchk.h:
  Removed wrong 'QQ' flags (the flags are used by myisamchk and aria_chk)
storage/maria/ha_maria.cc:
  maria_chk_status() can now also return an error.
storage/maria/ma_check.c:
  In maria_chk_status() check if create_trid value is too big.
storage/maria/ma_open.c:
  Changed check if table is moved so that we can detect wrong create_trid values.
  Don't set STATE_NOT_MOVABLE flag if we are doing repair/check. This was done so that aria_chk can print out the movable flag.
storage/maria/ma_test1.c:
  Added code to suppress memory leaks from safemalloc
storage/maria/ma_test2.c:
  Added code to suppress memory leaks from safemalloc
storage/maria/maria_chk.c:
  Added code to suppress memory leaks from safemalloc.
  Make help text a bit better for --HELP and --zerofill.
  Incresed version number.
  Don't require a control file if we are only doing --zerofill
  Print out 'create_trid' when doing --describe --verbose
storage/maria/unittest/ma_test_recovery.expected:
  Updated result file
2013-05-13 00:43:46 +03:00
Olivier Bertrand
5ac8c8bea6 - Changing mode from +x to -x
modified:
  storage/connect/mysql-test/connect/r/pivot.result*
  storage/connect/mysql-test/connect/t/pivot.test*
  storage/connect/tabpivot.cpp*
  storage/connect/tabpivot.h*
2013-05-12 18:37:53 +02:00
Olivier Bertrand
8c9ce17359 - Code cleaning.
modified:
  storage/connect/connect.cc
  storage/connect/tabutil.h

- Fix closing invalid tdbp in External_lock.
modified:
  storage/connect/ha_connect.cc

- Fix closing null Tdbp
modified:
  storage/connect/tabpivot.cpp*

- Fix regression error in table type TBL no more accepting missing
  columns in sub-tables even when Accept was set to TRUE.
modified:
  storage/connect/tabtbl.cpp
2013-05-12 18:14:03 +02:00
Michael Widenius
3bd6e4b8ee MDEV-3999: Valgrind errors 'invalid write' or assorted server crashes on concurrent flow with partitioned Aria tables
MDEV-3989: Server crashes on import from MariaDB mysqldump export with partitioned Aria table.

Problem was that bulk insert in aria was not properly protected against concurrent selects.


storage/maria/ha_maria.cc:
  Move settings of file->state to _ma_block_start_trans() to ensure that lock_key_trees is not changed by a concurrent bulk_insert.
storage/maria/ma_check.c:
  Added DBUG_ASSERT()
storage/maria/ma_open.c:
  Set start_trans to ma_start_trans for default behaviour.
storage/maria/ma_pagecrc.c:
  Removed test for 'non_transactional' as a now_transactinal could be reset while a flush was happening.
storage/maria/ma_state.c:
  Moved setting of info->state from external_lock to start_trans to protect against concurrent running bulk inserts.
  This works as the other threads will wait in thr_lock() until bulk_insert is done and keys are re-generated.
storage/maria/ma_state.h:
  Added _ma_start_trans()
2013-05-12 11:29:16 +03:00
Olivier Bertrand
44cb1ce8a2 - Fix tabpivot compile errors on Linux.
- Fix Tabpivot not closing the source table.
- Fix pivot.test error on Linux by specifying ENDING=2 for the expenses table.

modified:
  storage/connect/mysql-test/connect/r/pivot.result
  storage/connect/mysql-test/connect/t/pivot.test
  storage/connect/tabpivot.cpp
  storage/connect/tabpivot.h
2013-05-11 17:00:36 +02:00
Michael Widenius
4e9bf37f1f MDEV-4280: Assertion `empty_size == empty_size_on_page' failure in ma_blockrec.c or ER_NOT_KEYFILE on query with DISTINCT and GROUP BY
This could happen when using Aria for internal temporary files (default case) and using DISTINCT.
_ma_scan_restore_block_record() didn't work correctly if there was rows inserted, updated or deleted on the handler
between calls to _ma_scan_remember_block_record() and _ma_scan_restore_block_record().
The effect was that some DISTINCT queries that used remove_dup_with_compare() could fail.

.bzrignore:
  Ignore sql_yacc.hh
mysql-test/suite/maria/r/distinct.result:
  Test case for MDEV-4280
mysql-test/suite/maria/t/distinct.test:
  Test case for MDEV-4280
mysql-test/t/mysql.test:
  Fixed test suite (we could get error -1 in some cases)
sql/sql_select.cc:
  Break loop if restart_rnd_next() gives an error
storage/maria/ha_maria.cc:
  scan_restore_pos() can return disk fault error.
storage/maria/ma_blockrec.c:
  _ma_scan_remember_block_record() did incorrectly update scan.dir instead of scan_save.dir .
  _ma_scan_restore_block_record() didn't work correctly if there was rows inserted,updated or deleted on the handler
  between calls to _ma_scan_remember_block_record() and _ma_scan_restore_block_record().
  Fixed by adding counters for row changes and reading the current scan page if changes had been made.
storage/maria/ma_blockrec.h:
  scan_restore_pos() can return disk fault error.
storage/maria/ma_delete.c:
  Increment row_changes
storage/maria/ma_scan.c:
  scan_restore_pos() can return disk fault error.
storage/maria/ma_update.c:
  Increment row_changes
storage/maria/ma_write.c:
  Increment row_changes
storage/maria/maria_def.h:
  scan_restore_pos() can return disk fault error.
2013-05-11 15:55:11 +03:00
Olivier Bertrand
5657660ab0 - Added a test case for PIVOT tables
added:
  storage/connect/mysql-test/connect/r/pivot.result
  storage/connect/mysql-test/connect/std_data/expenses.txt
  storage/connect/mysql-test/connect/t/pivot.test
2013-05-11 13:21:15 +02:00
Michael Widenius
5b31f87858 MDEV-4231: Possible bug in function _ma_apply_undo_row_insert()
Added comment to clearify the code.


storage/maria/ma_blockrec.c:
  Added comment to clearify the code
  In case of out of memory or disk error, mark pages with LSN_IMPOSSIBLE to make it easier to know which pages have wrong information.
2013-05-11 12:20:21 +03:00
Olivier Bertrand
2cd63afe35 - Add pivot table files and support
modified:
  storage/connect/CMakeLists.txt
2013-05-10 23:05:16 +02:00
Olivier Bertrand
99d95c8a2f - Added table type PIVOT
modified:
  storage/connect/filamdbf.cpp
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
  storage/connect/mycat.cc
  storage/connect/myconn.cpp
  storage/connect/odbconn.cpp
  storage/connect/plgcnx.h
  storage/connect/plgdbsem.h
  storage/connect/plgdbutl.cpp
  storage/connect/tabfmt.cpp
  storage/connect/tabpivot.cpp
  storage/connect/tabpivot.h
  storage/connect/tabutil.cpp
  storage/connect/tabwmi.cpp
  storage/connect/tabxcl.cpp
  storage/connect/value.cpp
  storage/connect/value.h
2013-05-10 20:22:21 +02:00
Michael Widenius
53d44ad18b Added some fixes that should make MyISAM & Aria REPAIR work with more than 4G records
- If one specifies --force twice to myisamchk and aria_chk, then we will try to finnish the repair even if sort_buffer would be too small.
  This was done by dynamically allocate buffer handler objects as long as memory lasts.
- New option for myisamchk and aria_chk: create-missing-keys
- Changed default size of myisam_sort_buffer_size from 8M to 128M.
- Changed default size of sort_buffer_size in aria_chk from 128M to 256M.
- Increased information in error message about 'sort_buffer_size' beeing to small.
- Print also to 'show warnings' if repair was retried.
- Increased size of internal sort-buffer-readers from 16K to 128K
- Changed printing of 'number of records' to use %ll instead of casting to long
- Changed buffer sizes for myisam and aria to use MY_ALIGN_DOWN() to get same number of bytes allocated on different machines.





include/my_global.h:
  Added MY_ALIGN_DOWN() to get previous alignment (for big memory areas)
include/myisam.h:
  Increased size of types to be able to handle more records
include/myisamchk.h:
  Increased size of types to be able to handle more records
  Added T_FORCE_SORT_MEMORY to force repair to work even if sort_buffer would not be big enough
mysql-test/r/myisam.result:
  Updated result
mysql-test/r/mysqld--help.result:
  Updated result
mysql-test/r/repair.result:
  Updated result
mysql-test/suite/maria/maria.result:
  Added test cases for some fixed bugs in MyISAM to verify that Aria doesn't have them too.
mysql-test/suite/maria/maria.test:
  Added test cases for some fixed bugs in MyISAM to verify that Aria doesn't have them too.
mysql-test/suite/maria/maria3.result:
  Updated result after sort buffer size increase
mysql-test/suite/sys_vars/r/aria_sort_buffer_size_basic.result:
  Updated result after sort buffer size increase
mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic.result:
  Updated result after sort buffer size increase
mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic.test:
  Updated result after sort buffer size increase
mysql-test/t/myisam.test:
  Fixed error messages to not print system specific data
mysql-test/t/repair.test:
  Fixed error messages to not print system specific data
storage/maria/ha_maria.cc:
  Print also to 'show warnings' if repair was retried
  Changed default size of sort_buffer_size from 128M to 256M (same as in mysqld)
storage/maria/ma_check.c:
  Renamed USE_BUFFER_INIT -> PAGE_BUFFER_INIT
storage/maria/ma_sort.c:
  Increased size of internal sort-buffer-readers from 16K to 128K
  Increased size of types to be able to handle more records
  Added support for T_FORCE_SORT_MEMORY
  Don't allocate too many extra BUFFPEK at a time (they are probably not needed)
  Improved error message for "sort_buffer_size is too small"
  Changed printing of 'number of records' to use %ll instead of casting to long
  Fixed bug where maria_update_key_parts() was called too early.
  Fixed bug in detecting result from read_to_buffer().
  Added 'out of memory' checking when calling 'alloc_dynamic()'.
storage/maria/maria_chk.c:
  Added --create-missing-keys
  If one specifies --force twice then we will try to finnish the repair even if sort_buffer would be too small.
  check_param.sort_buffer_length varialble was used with wrong type.
storage/maria/maria_def.h:
  Increased size of types to be able to handle more records
  Use MY_ALIGN_DOWN() to get same number of bytes allocated on different machines
  Renamed USE_BUFFER_INIT -> PAGE_BUFFER_INIT
storage/maria/maria_ftdump.c:
  Renamed USE_BUFFER_INIT -> PAGE_BUFFER_INIT
storage/maria/maria_read_log.c:
  Use PAGE_BUFFER_INIT for page cache
storage/myisam/ha_myisam.cc:
  Changed default size of myisam_sort_buffer_size from 8M to 128M
storage/myisam/mi_check.c:
  Renamed USE_BUFFER_INIT -> KEY_BUFFER_INIT
storage/myisam/myisam_ftdump.c:
  Renamed USE_BUFFER_INIT -> KEY_BUFFER_INIT
storage/myisam/myisamchk.c:
  Added --create-missing-keys
  If one specifies --force twice then we will try to finnish the repair even if sort_buffer would be too small.
  check_param.sort_buffer_length varialble was used with wrong type.
  Renamed USE_BUFFER_INIT -> KEY_BUFFER_INIT
storage/myisam/myisamdef.h:
  Increased SORT_BUFFER_INIT to 64M
  (speeds up repair a lot and most machines have nowadays a lot of memory)
  Use MY_ALIGN_DOWN() to get same number of bytes allocated on different machines
  Renamed USE_BUFFER_INIT -> KEY_BUFFER_INIT
storage/myisam/sort.c:
  Increased size of internal sort-buffer-readers from 16K to 128K
  Increased size of types to be able to handle more records
  Added support for T_FORCE_SORT_MEMORY
  Don't allocate too many extra BUFFPEK at a time (they are probably not needed)
  Improved error message for "sort_buffer_size is too small"
  Changed printing of 'number of records' to use %ll instead of casting to long
  Fixed bug in detecting result from read_to_buffer().
  Added 'out of memory' checking when calling 'alloc_dynamic()'.
2013-05-10 12:32:34 +03:00
Vladislav Vaintroub
3b944843d2 Fix compile error 2013-05-09 23:25:57 +02:00
Olivier Bertrand
be268bed3d - Fix inverted test on am in MYSQLDEF::DefineAM
modified:
  storage/connect/tabmysql.cpp
2013-05-09 16:16:45 +02:00
Sergei Golubchik
da846a153b Merge with XtraDB as of Percona-Server-5.5.30-rel30.2 2013-05-08 10:12:21 +02:00
Sergei Golubchik
e0a08c567a Compilation warnings.
openssl compilation problem.
2013-05-07 18:26:22 +02:00
Sergei Golubchik
b381cf843c mysql-5.5.31 merge 2013-05-07 13:05:09 +02:00
Annamalai Gurusami
2c551d0e9c Bug #16722314 FOREIGN KEY ID MODIFIED DURING EXPORT
Bug #16754901 PARS_INFO_FREE NOT CALLED IN DICT_CREATE_ADD_FOREIGN_TO_DICTIONARY

Merging the fix from mysql-5.5 to mysql-5.5.32-release.
2013-05-06 20:31:26 +05:30
Michael Widenius
5333dafa84 Fixed errors and compiler warnings found by buildbot
Solaris fixes:
- Fixed that wait_timeout_func and wait_timeout tests works on solaris
- We have to compile without NO_ALARM on Solaris as Solaris doesn't support timeouts on sockets with setsockopt(.. SO_RCVTIMEO).
- Fixed that compile-solaris-amd64-debug works (before that we got a wrong ELF class: ELFCLASS64 on linkage)
- Added missing sync_with_master
Other bug fixes:
- Free memory for rpl_global_gtid_binlog_state before exit() to avoid 'accessing uninitalized mutex' error.



BUILD/FINISH.sh:
  Fixed issues on Solaris with ksh
BUILD/compile-solaris-amd64-debug:
  Added missing -m64 flag
configure.cmake:
  We have to compile without NO_ALARM on Solaris as Solaris doesn't support timeouts on sockets with setsockopt(.. SO_RCVTIMEO)
mysql-test/suite/rpl/t/rpl_gtid_mdev4473.test:
  - Added missing sync_with_master (fix by knielsen)
sql-common/client.c:
  Added () to get rid of compiler warning
sql/item_strfunc.cc:
  Fixed compiler warning
sql/log.cc:
  Free memory for static variable rpl_global_gtid_binlog_state before exit()
  - If we are compiling with safemalloc, we would try to call sf_free() for some members after sf_terminate() was called, which would result of trying to access the uninitalized mutex 'sf_mutex'
sql/multi_range_read.cc:
  Fixed compiler warnings of converting double to ulong.
sql/opt_range.cc:
  Fixed compiler warnings of converting double to ulong or uint
  - Better to have all variables that can be number of rows as 'ha_rows'
sql/rpl_gtid.cc:
  Added rpl_binlog_state::free() to be able to free memory for static objects before exit()
sql/rpl_gtid.h:
  Added rpl_binlog_state::free() to be able to free memory for static objects before exit()
sql/set_var.cc:
  Fixed compiler warning
sql/sql_join_cache.cc:
  Fixed compiler warnings of converting double to uint
sql/sql_show.cc:
  Added cast to get rid of compiler warning
sql/sql_statistics.cc:
  Remove code that didn't do anything.
  (store_record() with record[0] is a no-op)
storage/xtradb/os/os0file.c:
  Added  __attribute__ ((unused))
support-files/compiler_warnings.supp:
  Ignore warnings from atomic_add_64_nv
  (was not able to fix this with a cast as the macro is a bit different between systems)
vio/viosocket.c:
  Added more DBUG_PRINT
2013-05-05 21:39:31 +03:00
Olivier Bertrand
4959811411 - General code cleaning, eliminating a few potential bugs
modified:
  storage/connect/catalog.h
  storage/connect/mycat.cc
  storage/connect/taboccur.cpp
  storage/connect/taboccur.h
  storage/connect/tabutil.cpp
  storage/connect/tabutil.h
  storage/connect/tabxcl.cpp
  storage/connect/tabxcl.h
2013-05-05 12:45:26 +02:00
Olivier Bertrand
5fc19f8db8 - Add test for XCOL and OCCUR tables
- Fix a bug causing a crash when doing an ALTER TABLE
  (because create_info->alias is NULL)

added:
  storage/connect/mysql-test/connect/r/occur.result
  storage/connect/mysql-test/connect/r/xcol.result
  storage/connect/mysql-test/connect/t/occur.test
  storage/connect/mysql-test/connect/t/xcol.test
modified:
  storage/connect/ha_connect.cc
2013-05-04 00:47:55 +02:00
Olivier Bertrand
f3e944099e - Adding a loop test to prevent PROXY based table to loop when repointing on itself.
- Fix bug causing PROXY on non CONNECT tables to sometimes use the wrong DB.
- Making some more tests in create that were in pre_create not called anymore
  when columns are defined.
- Updating some test results to reflect new warnings.

modified:
  storage/connect/ha_connect.cc
  storage/connect/mysql-test/connect/r/tbl.result
  storage/connect/mysql-test/connect/r/upd.result
  storage/connect/tabcol.h
  storage/connect/tabmysql.cpp
  storage/connect/taboccur.cpp
  storage/connect/taboccur.h
  storage/connect/tabtbl.cpp
  storage/connect/tabtbl.h
  storage/connect/tabutil.cpp
  storage/connect/tabutil.h
  storage/connect/tabxcl.cpp
  storage/connect/tabxcl.h
2013-05-02 16:33:15 +02:00
unknown
714d9bc5ce merge from mysql-5.1 2013-04-30 20:40:38 +02:00
unknown
92989fdeed Bug#16405422 - RECOVERY FAILURE, ASSERT !RECV_NO_LOG_WRITE
eliminate a race condition over recv_sys->n_addrs which might result in a database corruption
in recovery, without reporting a recovery error.

recv_recover_page_func(): move the code segment that decrements recv_sys->n_addrs
  to the end of the function, after the call to mtr_commit()

rb://2282 approved by Inaam
2013-04-30 20:39:12 +02:00
Olivier Bertrand
3d4adc3fdf - Change in connect_assisted_discovery the default value for port from MYSQL_PORT
to 0. So it can be later set to mysqld_port if necessary. Doing so, it is no
  more required to specify port when using the current port and the current port
  is not equal to MYSQL_PORT (3306)

modified:
  storage/connect/ha_connect.cc
2013-04-30 17:48:18 +02:00
Olivier Bertrand
7461d8e30c - Allow PROXY based tables to specify MySQL access parameters when the
object table is not a CONNECT table. This was the case in previous
  versions but was no more possible with recent changes.

modified:
  storage/connect/mycat.cc
  storage/connect/tabmysql.cpp
  storage/connect/tabutil.cpp
2013-04-30 16:16:32 +02:00
Marko Mäkelä
3d264bb1e9 Bug#16720368 INNODB IGNORES *.IBD FILE BREAKAGE AT STARTUP
After a clean shutdown, InnoDB will not check the *.ibd file headers,
for maximum performance. This is unchanged before and after this
patch.

What this fix addresses is the case when crash recovery is
needed. Previously, InnoDB could load a corrupted tablespace file.

buf_page_is_corrupted(): Add the parameter check_lsn.

fil_check_first_page(): New function, to perform a consistency check
on the first page of a file. This can be overridden by setting
innodb_force_recovery.

fil_read_first_page(), fil_open_single_table_tablespace(),
fil_load_single_table_tablespace(): Invoke fil_check_first_page().

open_or_create_data_files(): Check the status of
fil_open_single_table_tablespace().

rb#2352 approved by Jimmy Yang
2013-04-30 13:39:50 +03:00
Olivier Bertrand
2a37f3e030 - Fix a bug causing a crash when using OEM tables based on BIN tables.
modified:
  storage/connect/reldef.cpp
2013-04-29 17:47:23 +02:00
Olivier Bertrand
4fd74200dd - Adding 3 new table types:
PROXY table base on another table. Used by several other types.
  XCOL  proxy on a table having a colummn containing a list of values
  OCCUR proxy on a table having several columns containing the same type
        of values that can be put in a unique column and several rows.
  TBL   Not new but now internally using the PROXY table class.
- Fix 2 bugs in add_field:
        Change '=' to ' ' after the COMMENT keyword.
        Quote column names between '`' in the SQL string.
- Update xml test result to the CONNECT version

added:
  storage/connect/taboccur.cpp
  storage/connect/taboccur.h
  storage/connect/tabutil.cpp
  storage/connect/tabutil.h
  storage/connect/tabxcl.cpp
  storage/connect/tabxcl.h
modified:
  storage/connect/CMakeLists.txt
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
  storage/connect/mycat.cc
  storage/connect/myconn.cpp
  storage/connect/mysql-test/connect/r/xml.result
  storage/connect/plgdbsem.h
  storage/connect/tabmysql.cpp
  storage/connect/tabtbl.cpp
  storage/connect/tabtbl.h
  storage/connect/valblk.cpp
  storage/connect/valblk.h
2013-04-29 13:50:20 +02:00
Alexander Barkov
2d33547475 Fixing that ODBC detection always failed on Linux because
set(CMAKE_REQUIRED_INCLUDES ${ODBC_INCLUDE_DIR})

was missing before the recently added CHECK_CXX_SOURCE_COMPILES()

modified:
  storage/connect/CMakeLists.txt
2013-04-28 10:18:31 +04:00
Alexander Barkov
bc80fb07de ha_cassandra.so and ha_oqgraph.so can be build only if boost is installed
on the build machine. So put them into the deb packages optionally.
     
Additionally, fixing cassandra/CMakeLists.txt to work with thrift
installed in /opt/local and /opt. It was supposed to work, but did
not work actually. Only thrift installed in /usr or /usr/local worked.


renamed:
  debian/dist/Debian/mariadb-server-10.0.files => debian/dist/Debian/mariadb-server-10.0.files.in
  debian/dist/Ubuntu/mariadb-server-10.0.files => debian/dist/Ubuntu/mariadb-server-10.0.files.in
modified:
  .bzrignore
  CMakeLists.txt
  storage/cassandra/CMakeLists.txt
  storage/cassandra/cassandra_se.cc
  storage/cassandra/gen-cpp/Cassandra.h
  storage/cassandra/gen-cpp/cassandra_types.h
  storage/oqgraph/CMakeLists.txt
  debian/dist/Debian/mariadb-server-10.0.files.in
  debian/dist/Ubuntu/mariadb-server-10.0.files.in
2013-04-25 17:12:52 +04:00
Annamalai Gurusami
19f93f6bd8 Bug #15973904 INNODB PARTITION CODE HOLDS LOCK_OPEN AND SLEEPS WHILE
OPENING MISSING PARTITION

In the ha_innobase::open() call, for normal tables, there is no retry logic.
But for partitioned tables, there is a retry logic introduced as fix for:

http://bugs.mysql.com/bug.php?id=33349  
https://support.mysql.com/view.php?id=21080

The Bug#33349, does not provide sufficient information to analyze the original
problem.  The original problem reported by bug#33349 is also minor (just an
annoyance and no loss of functionality).  Most importantly, the retry logic
has been introduced without any associated test case.

So we are removing the retry logic for partitioned tables.  When the original
problem occurs, a different solution will be explored.
2013-04-24 08:47:30 +02:00
Annamalai Gurusami
1b892c7759 Merge from mysql-5.1 to mysql-5.5 2013-04-24 08:42:59 +02:00
Alexander Barkov
1de77ee1ad Packaging clean-ups for the cassandra and connect engines.
modified:
  @ storage/cassandra/CMakeLists.txt
    Renaming the package "CassandraSE" to "cassandra-engine",
    as agreed during Lisbon meeting.

  @ storage/connect/CMakeLists.txt
    Removing an unused line
2013-04-21 22:15:33 +04:00
Sergei Golubchik
88b89aaa82 fixes for buildbot.
increase the version.
2013-04-21 09:38:54 -07:00
Alexander Barkov
b44f11c994 Fixing compilation failure in Solaris/OpenSolaris
error: too many initializers for `tm'

modified:
  storage/connect/ha_connect.cc
2013-04-21 18:38:08 +04:00
Alexander Barkov
7329f85379 Removing -Wfatal-errors, as it does not present in the older gcc versions.
(e.g. sol10-64 in build bot).

modified:
  storage/connect/CMakeLists.txt
2013-04-21 09:17:24 +04:00
Igor Babaev
6edcd45ebf Merge 10.0-base -> 10.0 2013-04-20 12:30:40 -07:00
Alexander Barkov
30651fd2f6 Recoding new results
(the format changed during Sergei's merge of the connect engine and discovery)

modified:
  storage/connect/mysql-test/connect/r/odbc_xls.result
2013-04-20 21:10:58 +04:00
Alexander Barkov
a6a4fa1d6f Fixing a few problems found by Build Bot after merging the CONNECT engine.
modified:
  @ mysql-test/r/mysqld--help.result
  @ mysql-test/t/mysqld--help.test
  Supressing information about "--connect" in "mysqld --help" output,
  as it depends on the build parameters.
  As a side effect information about --connect-timeout is now also suppressed :(

  @ storage/connect/CMakeLists.txt
  Removing gcc warning switches that do not exists in some older gcc versions.

  @ storage/connect/ha_connect.cc
  Adding a quick fix: cast from "const char *" to "char *".
  Olivier should do a better fix eventually.
2013-04-20 19:23:33 +04:00
Alexander Barkov
548399f6d0 After-fix for Sergei's merge of the connect engine.
odbc_sqlite3 failed. Fixed.

modified:
  storage/connect/ha_connect.cc
  storage/connect/mysql-test/connect/r/odbc_sqlite3.result
  storage/connect/mysql-test/connect/t/odbc_sqlite3.test
2013-04-20 00:24:05 +04:00
Sergei Golubchik
f7e95c8efa merge with maria-10.0-connect 2013-04-19 20:43:35 +02:00
Sergei Golubchik
6bd49441b5 CONNECT engine fixes after 10.0 merge.
Adaptation to new API, small simplifications and bug fixes
2013-04-19 20:35:43 +02:00
Sergei Golubchik
45912599ca 10.0 merge 2013-04-19 20:35:04 +02:00
Vladislav Vaintroub
016bef6ea0 MDEV-4356 - Do not try to unlock an already unlocked mutex. 2013-04-19 19:52:18 +02:00
Vladislav Vaintroub
0b034c1b2c Fix to handle CMake component names with dash in the name, when producing MSI package.
Rename connect_engine component back to connect-engine.
2013-04-19 18:45:54 +02:00
Olivier Bertrand
32669e4c15 - Committing merged changes
added:
  storage/connect/connect.cnf
modified:
  mysql-test/suite/connect/r/dir.result
  mysql-test/suite/connect/t/dir.test
  sql/sql_parse.cc
  sql/sql_parse.h
  storage/connect/CMakeLists.txt
  win/packaging/CPackWixConfig.cmake
2013-04-19 15:18:42 +02:00
Vladislav Vaintroub
305e3dea0d MDEV-4398 - remove incorrect fix, replace with correct one - change default to OFF for innodb_use_fallocate 2013-04-19 14:52:05 +02:00
Vladislav Vaintroub
4d78392be5 MDEV-4398 -
Change default for innodb_use_fallocate to FALSE, due to bugs in older Linux kernels (posix_fallocate() does not always guarantee that file size is like one specified)
2013-04-19 12:08:55 +02:00
Sergei Golubchik
53375573e3 small mtr cleanup
and move the connect suite into storage/connect/
2013-04-19 07:07:06 +02:00
Sergei Golubchik
f9dcd5b540 10.0-base merge 2013-04-18 21:54:13 +02:00
Michael Widenius
8b714e507f Changed the client library to only mark memory as THREAD_SPECIFIC if one has called
mysql_options() with MYSQL_OPT_USE_THREAD_SPECIFIC_MEMORY

include/mysql.h:
  Added MYSQL_OPT_USE_THREAD_SPECIFIC_MEMORY
include/mysql.h.pp:
  Updated file
sql-common/client.c:
  Marked client memory as THREAD_SPECIFIC
sql/event_db_repository.cc:
  Fixed compiler warning
sql/slave.cc:
  Marked client memory as THREAD_SPECIFIC
storage/federatedx/federatedx_io_mysql.cc:
  Marked client memory as THREAD_SPECIFIC
storage/federatedx/ha_federatedx.cc:
  Marked client memory as THREAD_SPECIFIC
storage/sphinx/ha_sphinx.cc:
  Marked client memory as THREAD_SPECIFIC
2013-04-17 23:37:06 +03:00
Michael Widenius
8e52698580 Fixed compiler warnings and a not critical memory leak
sql/keycaches.cc:
  Added free_all_rpl_filters() to be able to free all filters at cleanup
sql/keycaches.h:
  Added prototype
sql/rpl_rli.cc:
  Fixed compiler warning
sql/slave.cc:
  Free all rpl_filters at cleanup
sql/sp.cc:
  Fixed compiler warning when not all struct elements was initialized
sql/sql_acl.cc:
  Fixed compiler warning when not all struct elements was initialized
storage/perfschema/table_events_waits.cc:
  Fixed compiler warning when not all struct elements was initialized
storage/perfschema/table_events_waits_summary.cc:
  Fixed compiler warning when not all struct elements was initialized
storage/perfschema/table_ews_global_by_event_name.cc:
  Fixed compiler warning when not all struct elements was initialized
storage/perfschema/table_file_instances.cc:
  Fixed compiler warning when not all struct elements was initialized
storage/perfschema/table_file_summary.cc:
  Fixed compiler warning when not all struct elements was initialized
storage/perfschema/table_performance_timers.cc:
  Fixed compiler warning when not all struct elements was initialized
storage/perfschema/table_setup_consumers.cc:
  Fixed compiler warning when not all struct elements was initialized
storage/perfschema/table_setup_instruments.cc:
  Fixed compiler warning when not all struct elements was initialized
storage/perfschema/table_setup_timers.cc:
  Fixed compiler warning when not all struct elements was initialized
storage/perfschema/table_sync_instances.cc:
  Fixed compiler warning when not all struct elements was initialized
storage/perfschema/table_threads.cc:
  Fixed compiler warning when not all struct elements was initialized
storage/xtradb/os/os0file.c:
  Fixed compiler warning when not all struct elements was initialized
2013-04-17 22:33:33 +03:00
Sergei Golubchik
07315d3603 strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1)
with a bit of lame protection against abuse.
2013-04-17 19:42:34 +02:00
Igor Babaev
a1cd28e2e5 Merge 10.0-base -> 10.0 2013-04-17 10:18:04 -07:00
Alexander Barkov
89bafdf452 Dashed name did not work on Windows.
Renaming dashed name to underscored name:

connect-engine -> connect_engine
2013-04-17 19:36:57 +04:00
Vladislav Vaintroub
4a3e22c430 Fix MSI package creation for connect engine.
Also, do not use /MP option when compiling CONNECT (incompatible with COM #import directive)
Also, fix ODBC_LIBRARY to be a list on Windows, not string with spaces inside.
2013-04-17 07:44:49 -07:00
unknown
0e7410a154 Merge 10.0-base -> 10.0 (GTID). 2013-04-17 15:17:01 +02:00
unknown
585d7bbfb4 Merge 5.5->10.0-base 2013-04-17 09:39:40 +02:00
unknown
0508f766b4 Fixes for stuff seen in buildbot:
- Fix embedded build

 - Backport disable of fallocate, it creates too short ibdata1
   when used with O_DIRECT on old kernels

 - Do not disable innodb during .deb install, we need it for
   mysql.rpl_slave_state table.
2013-04-16 17:36:40 +02:00
unknown
eb95ebf917 Fix race in test case. 2013-04-16 17:33:47 +02:00
Alexander Barkov
2a20ab7889 Adding RPM related definitions to create a separate RPM package
(e.g. MariaDB-10.0.1-fc18-x86_64-connect-engine.rpm) with
automatic installation of libxml2 and unixODBC as dependencies.

added:
  storage/connect/connect.cnf
modified:
  storage/connect/CMakeLists.txt
2013-04-16 16:54:44 +04:00
Olivier Bertrand
ebc6fc7f72 - Bug: When trace is ON the variable c was used uninitialized in CSORT::Istc
modified:
  storage/connect/csort.cpp
2013-04-15 15:59:47 +02:00
Sergei Golubchik
a9035be5b7 10.0-base merge 2013-04-15 15:09:22 +02:00
unknown
665a31af2b MDEV-26: Global transaction ID. First alpha release.
Merge of 10.0-mdev26 feature tree into 10.0-base.

Global transaction ID is prepended to each event group in the binlog.

Slave connect can request to start from GTID position instead of specifying
file name/offset of master binlog. This facilitates easy switch to a new
master.

Slave GTID state is stored in a table mysql.rpl_slave_state, which can be
InnoDB to get crash-safe slave state.

GTID includes a replication domain ID, allowing to keep track of distinct
positions for each of multiple masters.
2013-04-15 10:55:27 +02:00
Sergei Golubchik
fc17efc297 compiler warnings 2013-04-14 16:48:16 +02:00
Sergei Golubchik
f57ecb7786 5.5 merge 2013-04-14 10:04:07 +02:00
Olivier Bertrand
96f55d4684 - Fix use of s->db_plugin in GetSubTable for release versions
modified:
  storage/connect/tabtbl.cpp
2013-04-13 00:37:24 +02:00
Olivier Bertrand
8cf33505f1 - Extend the TBL type to support sub-tables of any engines. Not CONNECT
sub-tables are accessed via the MySQL API like the MYSQL CONNECT tables.

modified:
  mysql-test/suite/connect/r/tbl.result
  mysql-test/suite/connect/t/tbl.test
  storage/connect/catalog.h
  storage/connect/ha_connect.cc
  storage/connect/mycat.cc
  storage/connect/mycat.h
  storage/connect/tabmysql.h
  storage/connect/tabtbl.cpp
2013-04-12 18:30:15 +02:00
unknown
d20ec0f5ba Bug :#16005310 FIx bug - INNODB_ROW_LOCK_TIME_MAX SEEMS TO HAVE AN OVERFLOW
Solution:Set diff_time to 0 if finish_time < start_time
2013-04-11 10:50:50 +08:00
Olivier Bertrand
1357bffbf3 - Add support of NULLs for file table columns.
Update CONNECT version number and date.

modified:
  mysql-test/suite/connect/r/null.result
  mysql-test/suite/connect/r/xml.result
  mysql-test/suite/connect/t/null.test
  storage/connect/ha_connect.cc
  storage/connect/mycat.cc
  storage/connect/tabdos.cpp
  storage/connect/tabfix.cpp
  storage/connect/tabfmt.cpp
  storage/connect/tabtbl.cpp
  storage/connect/tabvct.cpp
2013-04-10 23:38:27 +02:00
Olivier Bertrand
9b790248c5 - Add routine to test index equality
modified:
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
  storage/connect/xindex.h
2013-04-10 14:24:28 +02:00
Sergei Golubchik
3ed6b24d82 Linking problem on Windows 2013-04-10 07:25:13 +02:00
Sergei Golubchik
775e82638b put status variables in the proper pluginname_ scope
(but support the scopeless mysql style too).
always output status/system variables in the correct lettercase
2013-04-09 23:27:33 +02:00
Sergei Golubchik
5f293dd694 MDEV-4022 table attributes with sysvar as a default value 2013-04-09 23:27:24 +02:00
Sergei Golubchik
3ad01d00f2 error messages: name the storage engine explicitly,
instead of "used storage engine" and similar changes.
2013-04-09 23:27:07 +02:00
Olivier Bertrand
6be6b4ab76 - All the processing of creating, dropping, modifying indexes was redesigned.
The code was a legacy from the first versions of the XDB engine dating 2004
  and was not working anymore with recent versions of MySQL/MariaDB. A patch
  in create had been added but is was unsatisfying, recreating all indexes on
  any alter statement and sometimes doing nothing when it should have.
  This is a major update to be tested for stability. It was in most important
  cases et all current tests pass with this new version

modified:
  storage/connect/global.h
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
  storage/connect/mycat.cc
  storage/connect/plugutil.c
  storage/connect/tabdos.cpp
  storage/connect/user_connect.cc
  storage/connect/user_connect.h
  storage/connect/xindex.h
2013-04-09 23:14:45 +02:00
Sergei Golubchik
ffbd15eb32 post-review comments and other minor edits 2013-04-09 16:20:59 +02:00
Sergei Golubchik
3a8e1a2205 mysql-test fixes 2013-04-09 16:19:22 +02:00
Sergei Golubchik
ee92b2114d assisted discovery in federatedx 2013-04-09 16:19:18 +02:00
Sergei Golubchik
60aed41222 fix internal plugin names 2013-04-09 16:19:10 +02:00
Sergei Golubchik
9c089b04b3 TABLE_SHARE::free_frm_image() method to free the memory
allocated by the same allocator as in TABLE_SHARE::read_frm_image()
2013-04-09 16:18:51 +02:00
Sergei Golubchik
02c712aa54 * frm extra2 segment.
* persistent table versions in the extra2
* ha_archive::frm_compare using TABLE_SHARE::tabledef_version
* distinguish between "important" and "optional" extra2 frm values
* write engine-defined attributes (aka "table options") to extra2, not to extra,
  but still read from the old location, if they're found there.
2013-04-09 16:18:33 +02:00
Sergei Golubchik
13b7bcd5d4 sequence engine 2013-04-09 16:17:16 +02:00
Sergei Golubchik
2d788ff5ca test_sql_discovery storage engine
use it to test main test cases with need_full_discover_for_existence > 0
2013-04-09 16:07:35 +02:00
Sergei Golubchik
4853c7192d discovery using sql CREATE TABLE statement 2013-04-09 16:07:17 +02:00
Sergei Golubchik
e06cb31719 CREATE TABLE and frm-less discovering engines.
Now CREATE TABLE does not write the frm file on disk,
if the engine can discover it
2013-04-09 15:57:09 +02:00
Sergei Golubchik
f597a6a694 HA_ERR_TABLE_DEF_CHANGED support in ha_archive 2013-04-09 15:50:55 +02:00
Sergei Golubchik
2481db063f move writing of the frm into init_from_binary_frm_image() 2013-04-09 15:49:21 +02:00
Sergei Golubchik
5d364e53cb handlerton::discover_table_names() can not discover only
"unknown" tables. Duplicates are possible - deal with them.
2013-04-09 15:49:00 +02:00
Sergei Golubchik
e5a323e107 single table discovery: handlerton::discover_table() method.
fixes for need_full_discover_for_existence mode
2013-04-09 15:45:31 +02:00
Sergei Golubchik
163882665e * don't use 1-8 numbers for open_table_error codes, use an enum.
* print "table doesn't exist in engine" when a table doesn't exist in the engine,
  instead of "file not found" (if no file was involved)
* print a complete filename that cannot be found ('t1.MYI', not 't1')
* it's not an error for a DROP if a table doesn't exist in the engine (or some table
  files cannot be found) - if the DROP succeeded regardless
2013-04-09 15:34:17 +02:00
Sergei Golubchik
03dfb2c121 file-based table discovery for discovering storage engines
also:
* move few tests from archive/archive.test to archive/discover.test
* fix (unintentionally) bug#34104, updated result files
2013-04-09 15:31:29 +02:00
Sergei Golubchik
69ba585a1e remove #if MYSQL_VERSION_ID
there is no "upstream" OQGraph version that needs to stay compatible
with different MariaDB releases.
2013-04-07 17:09:05 +02:00
Sergei Golubchik
58e62d701e * move bas_ext from the handler to the handlerton
* provide a default bas_ext value of the empty list
2013-04-07 17:08:49 +02:00
Sergei Golubchik
ccc9238335 s/st_ha_create_information/HA_CREATE_INFO/ 2013-04-07 15:35:39 +02:00
Sergei Golubchik
bbbd7cedf5 my_dir() cleanup
* replace pointer acrobatics with a struct
* make sorting explicit: MY_DONT_SORT -> MY_WANT_SORT
(if you want something to be done - say it. fixes all places where
my_dir() was used without thinking)
* typo s/number_off_files/number_of_files/
* directory_file_name() doesn't need to be extern
* remove #ifdef __BORLANDC__
* ignore '.' and '..' entries
2013-04-07 15:19:45 +02:00
Sergei Golubchik
e56cad4b15 small cleanup 2013-04-07 14:03:43 +02:00
Sergei Golubchik
4ec6fe10e5 remove ULL() and LL(), because they're totally unnecessary
and sometimes harmful (used with expressions)
2013-04-07 14:00:16 +02:00
Olivier Bertrand
b3b0210467 - Prepar using indexes in MAP mode (not used yet)
modified:
  storage/connect/tabdos.cpp
  storage/connect/xindex.cpp
  storage/connect/xindex.h
2013-04-07 11:43:35 +02:00
Olivier Bertrand
f60b56723d - Bug fix: Variable rc could used uninitialized when tracing is on.
modified:
  storage/connect/filamvct.cpp
2013-04-06 12:51:45 +02:00
Vladislav Vaintroub
ed949df15a MDEV-4338 - Support FusionIO/directFS atomic writes 2013-04-06 00:36:10 +02:00
Vladislav Vaintroub
0aa607a01a MDEV-4338 - Support FusionIO/directFS atomic writes 2013-04-06 00:35:45 +02:00
Olivier Bertrand
806ca8ddb5 - Do not check columns name length of dbf catalog tables. They return info
on a dbf table but are not dbf tables.

modified:
  storage/connect/ha_connect.cc
2013-04-05 23:57:30 +02:00
Olivier Bertrand
4adb4256cc - Update some DBUG_PRINT to avois warning on Linux
modified:
  storage/connect/connect.cc
  storage/connect/ha_connect.cc
2013-04-04 23:27:54 +02:00
Olivier Bertrand
7e0f591f6a - Do not accept creating XML2 tables when libxml2 is not available
modified:
  storage/connect/ha_connect.cc
2013-04-04 15:36:42 +02:00
Alexander Barkov
d12e1c92a1 Adding security tests for "ALTER TABLE t1 FILE_NAME='xxx'"
modified:
  mysql-test/suite/connect/r/bin.result
  mysql-test/suite/connect/r/csv.result
  mysql-test/suite/connect/r/dbf.result
  mysql-test/suite/connect/r/fix.result
  mysql-test/suite/connect/r/vec.result
  mysql-test/suite/connect/r/xml.result
  mysql-test/suite/connect/t/grant.inc
  storage/connect/ha_connect.cc
2013-04-04 11:31:20 +04:00
Olivier Bertrand
b0e07ff5b7 - Commit added test on TBL tables
+ update dbf.result

added:
  mysql-test/suite/connect/r/tbl.result
  mysql-test/suite/connect/t/tbl.test
modified:
  mysql-test/suite/connect/r/dbf.result

- Fix bug on generating default file name for TBL sub-tables

modified:
  storage/connect/ha_connect.cc
2013-04-04 01:14:26 +02:00
Olivier Bertrand
7e7d3ce558 - Block creating tables with auto_incremented colummns (not supported)
+ allow nullable columns for TBL tables

modified:
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
  storage/connect/mycat.cc
  storage/connect/mycat.h
2013-04-03 21:54:02 +02:00
Alexander Barkov
115a373b88 Fixed a problem in index.test failures when run in a non-Paris time zone.
This fix also revealed wrong result recorded in fix.result.
            
modified:
  mysql-test/suite/connect/r/fix.result
  storage/connect/value.cpp

modified:
  mysql-test/suite/connect/r/bin.result
  mysql-test/suite/connect/r/fix.result
  mysql-test/suite/connect/t/bin.test
  storage/connect/value.cpp
2013-04-03 04:54:02 -07:00
Olivier Bertrand
84ab3e896c - Fix making default file name with lower case type
modified:
  storage/connect/mycat.cc
2013-04-02 13:58:44 +02:00
Olivier Bertrand
b1031b2359 - Fold type name to lowercase when used for default file type
modified:
  storage/connect/ha_connect.cc
2013-04-02 12:54:57 +02:00
Olivier Bertrand
3389e81dd1 - Commit pulled changes
added:
  mysql-test/suite/connect/r/secure_file_priv.result
  mysql-test/suite/connect/t/secure_file_priv-master.opt
  mysql-test/suite/connect/t/secure_file_priv.test
modified:
  storage/connect/ha_connect.cc
2013-04-02 11:35:38 +02:00
Olivier Bertrand
0f5c5a29f9 - Comment out the last commited change
modified:
  storage/connect/ha_connect.cc
2013-04-02 11:31:46 +02:00
Alexander Barkov
4bba25543d Respect the --secure-file-priv server option when working with
tables having the FILE_NAME='xxx' table option.

added:
  mysql-test/suite/connect/r/secure_file_priv.result
  mysql-test/suite/connect/t/secure_file_priv-master.opt
  mysql-test/suite/connect/t/secure_file_priv.test
modified:
  storage/connect/ha_connect.cc
2013-04-02 13:10:42 +04:00
Olivier Bertrand
42e5bfacc8 - Commit merged changes
modified:
  mysql-test/suite/connect/r/ini.result
  mysql-test/suite/connect/r/vec.result
  mysql-test/suite/connect/t/ini.test
  mysql-test/suite/connect/t/vec.test
  storage/connect/ha_connect.cc
2013-04-02 11:06:19 +02:00
Olivier Bertrand
af08a68fbe - Commit change pulled from Linux virtual machine (fixing typo in Win32 part)
modified:
  storage/connect/filamvct.cpp*
2013-04-02 10:57:27 +02:00
Olivier Bertrand
ca012682b6 - Fix huge vec tables bug. This was not yet completely implemented for Unix.
modified:
  storage/connect/filamvct.cpp
2013-04-02 10:41:16 +02:00
Olivier Bertrand
d805690564 - Fix bugs with VEC tables header and empty file making for HUGE tables.
Adding tests of MAPPED and HUGE tables in upd.test

modified:
  mysql-test/suite/connect/r/upd.result
  mysql-test/suite/connect/t/upd.test
  storage/connect/filamvct.cpp
  storage/connect/tabvct.cpp
2013-04-01 11:45:27 +02:00
Alexander Barkov
86eeb04a93 Fixing a crash in the latest push from Olivier.
modified:
  storage/connect/ha_connect.cc
2013-04-01 09:34:39 +04:00
Olivier Bertrand
879be566e0 - Add some warnings to Create Table process
modified:
  storage/connect/filamvct.cpp
  storage/connect/ha_connect.cc
2013-03-30 22:06:35 +01:00
Annamalai Gurusami
036787a919 Merge from mysql-5.1 to mysql-5.5 2013-03-29 22:11:33 +05:30
Annamalai Gurusami
27277df73b Bug #16244691 SERVER GONE AWAY ERROR OCCURS DEPENDING ON THE NUMBER OF
TABLE/KEY RELATIONS

The DICT_FK_MAX_RECURSIVE_LOAD was reduced from 250 to 33 in rb#2058.
But in optimized build, this recursive depth is still too deep and
resulted in stack overflow.  So reducing this depth to 20 now.
2013-03-29 22:01:10 +05:30
Alexander Barkov
73d39bba95 Merge from the latest mariadb-10.0.
added:
  include/mysql/service_kill_statement.h
  libmysql/libmysql_rpm_version.in
  libmysql/rpm_support.cc
  libservices/kill_statement_service.c
  mysql-test/include/ctype_heap.inc
  mysql-test/include/ctype_strtoll10.inc
  mysql-test/r/change_user_notembedded.result
  mysql-test/r/create_delayed.result
  mysql-test/r/ctype_utf16le.result
  mysql-test/r/failed_auth_3909.result
  mysql-test/r/gis2.result
  mysql-test/r/grant_lowercase.result
  mysql-test/r/group_by_innodb.result
  mysql-test/r/information_schema2.result
  mysql-test/suite/innodb/r/innodb_bug14704286.result
  mysql-test/suite/innodb/t/innodb_bug14704286.test
  mysql-test/suite/plugins/r/audit_null_debug.result
  mysql-test/suite/plugins/r/cassandra.result
  mysql-test/suite/plugins/r/cassandra_qcache.result
  mysql-test/suite/plugins/t/audit_null_debug.test
  mysql-test/suite/plugins/t/cassandra.opt
  mysql-test/suite/plugins/t/cassandra.test
  mysql-test/suite/plugins/t/cassandra_qcache.opt
  mysql-test/suite/plugins/t/cassandra_qcache.test
  mysql-test/suite/rpl/r/rpl_password_boundaries.result
  mysql-test/suite/rpl/t/rpl_password_boundaries.test
  mysql-test/suite/sys_vars/r/innodb_locking_fake_changes_basic.result
  mysql-test/suite/sys_vars/r/innodb_max_bitmap_file_size_basic.result
  mysql-test/suite/sys_vars/t/innodb_locking_fake_changes_basic.test
  mysql-test/suite/sys_vars/t/innodb_max_bitmap_file_size_basic.test
  mysql-test/t/change_user_notembedded.test
  mysql-test/t/create_delayed.test
  mysql-test/t/ctype_utf16le.test
  mysql-test/t/failed_auth_3909.test
  mysql-test/t/gis2.test
  mysql-test/t/grant_lowercase.opt
  mysql-test/t/grant_lowercase.test
  mysql-test/t/group_by_innodb.test
  mysql-test/t/information_schema2.test
  packaging/rpm-uln/
  packaging/rpm-uln/CMakeLists.txt
  packaging/rpm-uln/README-ULN
  packaging/rpm-uln/README.mysql-docs
  packaging/rpm-uln/filter-requires-mysql.sh
  packaging/rpm-uln/generate-tarball.sh
  packaging/rpm-uln/my.cnf
  packaging/rpm-uln/my_config.h
  packaging/rpm-uln/mysql-5.5-errno.patch
  packaging/rpm-uln/mysql-5.5-fix-tests.patch
  packaging/rpm-uln/mysql-5.5-libdir.patch
  packaging/rpm-uln/mysql-5.5-mtr1.patch
  packaging/rpm-uln/mysql-5.5-stack-guard.patch
  packaging/rpm-uln/mysql-5.5-testing.patch
  packaging/rpm-uln/mysql-chain-certs.patch
  packaging/rpm-uln/mysql-embedded-check.c
  packaging/rpm-uln/mysql-expired-certs.patch
  packaging/rpm-uln/mysql-install-test.patch
  packaging/rpm-uln/mysql-strmov.patch
  packaging/rpm-uln/mysql.init
  packaging/rpm-uln/mysql.spec.sh
  packaging/rpm-uln/scriptstub.c
  scripts/mysql_performance_tables.sql
  storage/cassandra/
  storage/cassandra/CMakeLists.txt
  storage/cassandra/cassandra.cnf
  storage/cassandra/cassandra_se.cc
  storage/cassandra/cassandra_se.h
  storage/cassandra/gen-cpp/
  storage/cassandra/gen-cpp/Cassandra.cpp
  storage/cassandra/gen-cpp/Cassandra.h
  storage/cassandra/gen-cpp/Cassandra_server.skeleton.cpp
  storage/cassandra/gen-cpp/cassandra_constants.cpp
  storage/cassandra/gen-cpp/cassandra_constants.h
  storage/cassandra/gen-cpp/cassandra_types.cpp
  storage/cassandra/gen-cpp/cassandra_types.h
  storage/cassandra/ha_cassandra.cc
  storage/cassandra/ha_cassandra.h
  storage/innobase/mysql-test/storage_engine/alter_tablespace.rdiff
renamed:
  mysql-test/include/mysqlbinlog_row_engine.inc => mysql-test/extra/binlog_tests/mysqlbinlog_row_engine.inc
  mysql-test/r/mysqlbinlog-cp932.result => mysql-test/suite/binlog/r/binlog_mysqlbinlog-cp932.result
  mysql-test/r/mysqlbinlog2.result => mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result
  mysql-test/r/mysqlbinlog_base64.result => mysql-test/suite/binlog/r/binlog_mysqlbinlog_base64.result
  mysql-test/r/mysqlbinlog_row.result => mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result
  mysql-test/r/mysqlbinlog_row_innodb.result => mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result
  mysql-test/r/mysqlbinlog_row_myisam.result => mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result
  mysql-test/r/mysqlbinlog_row_trans.result => mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result
  mysql-test/suite/innodb/t/innodb-autoinc-master.opt => mysql-test/suite/innodb/t/innodb-autoinc.opt
  mysql-test/t/mysqlbinlog-cp932-master.opt => mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932-master.opt
  mysql-test/t/mysqlbinlog-cp932.test => mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932.test
  mysql-test/t/mysqlbinlog2-master.opt => mysql-test/suite/binlog/t/binlog_mysqlbinlog2-master.opt
  mysql-test/t/mysqlbinlog2.test => mysql-test/suite/binlog/t/binlog_mysqlbinlog2.test
  mysql-test/t/mysqlbinlog_base64.test => mysql-test/suite/binlog/t/binlog_mysqlbinlog_base64.test
  mysql-test/t/mysqlbinlog_row-master.opt => mysql-test/suite/binlog/t/binlog_mysqlbinlog_row-master.opt
  mysql-test/t/mysqlbinlog_row.test => mysql-test/suite/binlog/t/binlog_mysqlbinlog_row.test
  mysql-test/t/mysqlbinlog_row_innodb-master.opt => mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_innodb-master.opt
  mysql-test/t/mysqlbinlog_row_innodb.test => mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_innodb.test
  mysql-test/t/mysqlbinlog_row_myisam-master.opt => mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_myisam-master.opt
  mysql-test/t/mysqlbinlog_row_myisam.test => mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_myisam.test
  mysql-test/t/mysqlbinlog_row_trans-master.opt => mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_trans-master.opt
  mysql-test/t/mysqlbinlog_row_trans.test => mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_trans.test
  mysql-test/t/plugin_load_option-master.opt => mysql-test/t/plugin_load_option.opt
modified:
  BUILD/FINISH.sh
  BUILD/SETUP.sh
  CMakeLists.txt
  TODO
  VERSION
  client/completion_hash.cc
  client/mysql.cc
  client/mysql_upgrade.c
  client/mysqlbinlog.cc
  client/mysqlcheck.c
  client/mysqldump.c
  client/mysqltest.cc
  cmake/build_configurations/mysql_release.cmake
  cmake/character_sets.cmake
  cmake/configure.pl
  cmake/cpack_rpm.cmake
  cmake/create_initial_db.cmake.in
  cmake/info_macros.cmake.in
  cmake/install_layout.cmake
  cmake/mysql_version.cmake
  cmake/package_name.cmake
  cmake/plugin.cmake
  debian/dist/Debian/mariadb-server-10.0.files
  debian/dist/Debian/rules
  debian/dist/Ubuntu/mariadb-server-10.0.files
  debian/dist/Ubuntu/rules
  debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch
  extra/comp_err.c
  extra/replace.c
  extra/resolve_stack_dump.c
  include/hash.h
  include/heap.h
  include/m_ctype.h
  include/ma_dyncol.h
  include/my_dir.h
  include/my_global.h
  include/my_pthread.h
  include/my_sys.h
  include/my_tree.h
  include/myisamchk.h
  include/mysql.h.pp
  include/mysql/plugin.h
  include/mysql/plugin_audit.h.pp
  include/mysql/plugin_auth.h.pp
  include/mysql/plugin_ftparser.h.pp
  include/mysql/service_thd_wait.h
  include/mysql/services.h
  include/mysql_com.h
  include/service_versions.h
  include/violite.h
  libmysql/CMakeLists.txt
  libmysql/libmysql.c
  libmysqld/CMakeLists.txt
  libmysqld/emb_qcache.cc
  libmysqld/lib_sql.cc
  libservices/CMakeLists.txt
  mysql-test/extra/binlog_tests/binlog.test
  mysql-test/include/have_dbi_dbd-mysql.inc
  mysql-test/include/plugin.defs
  mysql-test/include/rpl_start_server.inc
  mysql-test/lib/v1/mysql-test-run.pl
  mysql-test/mysql-test-run.pl
  mysql-test/r/alias.result
  mysql-test/r/contributors.result
  mysql-test/r/create.result
  mysql-test/r/ctype_ucs.result
  mysql-test/r/ctype_utf16.result
  mysql-test/r/ctype_utf32.result
  mysql-test/r/ctype_utf8.result
  mysql-test/r/datetime_456.result
  mysql-test/r/derived_view.result
  mysql-test/r/distinct.result
  mysql-test/r/dyncol.result
  mysql-test/r/func_encrypt_ucs2.result
  mysql-test/r/func_gconcat.result
  mysql-test/r/func_misc.result
  mysql-test/r/func_time.result
  mysql-test/r/group_by.result
  mysql-test/r/group_min_max.result
  mysql-test/r/handlersocket.result
  mysql-test/r/loaddata.result
  mysql-test/r/mysql.result
  mysql-test/r/mysqltest.result
  mysql-test/r/plugin.result
  mysql-test/r/plugin_auth.result
  mysql-test/r/show_check.result
  mysql-test/r/show_explain.result
  mysql-test/r/sp.result
  mysql-test/r/sp_notembedded.result
  mysql-test/r/stat_tables_par.result
  mysql-test/r/stat_tables_par_innodb.result
  mysql-test/r/subselect.result
  mysql-test/r/subselect3.result
  mysql-test/r/subselect3_jcl6.result
  mysql-test/r/subselect4.result
  mysql-test/r/subselect_innodb.result
  mysql-test/r/subselect_mat_cost.result
  mysql-test/r/subselect_no_mat.result
  mysql-test/r/subselect_no_opts.result
  mysql-test/r/subselect_no_scache.result
  mysql-test/r/subselect_sj.result
  mysql-test/r/subselect_sj_jcl6.result
  mysql-test/r/sum_distinct-big.result
  mysql-test/r/type_year.result
  mysql-test/r/user_var.result
  mysql-test/r/view.result
  mysql-test/suite.pm
  mysql-test/suite/binlog/r/binlog_database.result
  mysql-test/suite/binlog/r/binlog_row_annotate.result
  mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result
  mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_verbose.result
  mysql-test/suite/engines/funcs/r/tc_rename_error.result
  mysql-test/suite/engines/iuds/r/insert_time.result
  mysql-test/suite/funcs_1/datadict/processlist_priv.inc
  mysql-test/suite/funcs_1/datadict/processlist_val.inc
  mysql-test/suite/funcs_1/r/innodb_func_view.result
  mysql-test/suite/funcs_1/r/is_columns_is.result
  mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
  mysql-test/suite/funcs_1/r/memory_func_view.result
  mysql-test/suite/funcs_1/r/myisam_func_view.result
  mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
  mysql-test/suite/funcs_1/r/processlist_priv_ps.result
  mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
  mysql-test/suite/funcs_1/r/processlist_val_ps.result
  mysql-test/suite/innodb/r/binlog_consistent.result
  mysql-test/suite/innodb/r/innodb-autoinc.result
  mysql-test/suite/innodb/r/innodb-zip.result
  mysql-test/suite/innodb/r/innodb.result
  mysql-test/suite/innodb/r/innodb_bug53591.result
  mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result
  mysql-test/suite/innodb/t/innodb-autoinc.test
  mysql-test/suite/innodb/t/innodb-zip.test
  mysql-test/suite/innodb/t/innodb.test
  mysql-test/suite/innodb/t/innodb_bug53591.test
  mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test
  mysql-test/suite/maria/truncate.result
  mysql-test/suite/maria/truncate.test
  mysql-test/suite/multi_source/multisource.result
  mysql-test/suite/multi_source/multisource.test
  mysql-test/suite/perfschema/include/upgrade_check.inc
  mysql-test/suite/perfschema/r/digest_table_full.result
  mysql-test/suite/perfschema/r/func_file_io.result
  mysql-test/suite/perfschema/r/func_mutex.result
  mysql-test/suite/perfschema/r/pfs_upgrade.result
  mysql-test/suite/perfschema/r/statement_digest.result
  mysql-test/suite/perfschema/r/statement_digest_consumers.result
  mysql-test/suite/perfschema/r/statement_digest_long_query.result
  mysql-test/suite/perfschema/t/func_file_io.test
  mysql-test/suite/perfschema/t/func_mutex.test
  mysql-test/suite/plugins/suite.pm
  mysql-test/suite/rpl/r/rpl_semi_sync.result
  mysql-test/suite/rpl/t/rpl_semi_sync.test
  mysql-test/suite/sphinx/sphinx.result
  mysql-test/suite/storage_engine/misc.result
  mysql-test/suite/sys_vars/r/character_set_client_basic.result
  mysql-test/suite/sys_vars/r/character_set_connection_basic.result
  mysql-test/suite/sys_vars/r/character_set_database_basic.result
  mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result
  mysql-test/suite/sys_vars/r/character_set_results_basic.result
  mysql-test/suite/sys_vars/r/innodb_change_buffering_debug_basic.result
  mysql-test/suite/sys_vars/r/innodb_changed_pages_limit_basic.result
  mysql-test/suite/sys_vars/r/pseudo_thread_id_basic.result
  mysql-test/suite/sys_vars/t/innodb_change_buffering_debug_basic.test
  mysql-test/suite/sys_vars/t/innodb_changed_pages_limit_basic.test
  mysql-test/suite/sys_vars/t/pseudo_thread_id_basic.test
  mysql-test/suite/vcol/r/vcol_misc.result
  mysql-test/suite/vcol/t/vcol_misc.test
  mysql-test/t/alias.test
  mysql-test/t/ctype_ucs.test
  mysql-test/t/ctype_utf16.test
  mysql-test/t/ctype_utf32.test
  mysql-test/t/ctype_utf8.test
  mysql-test/t/derived_view.test
  mysql-test/t/distinct.test
  mysql-test/t/dyncol.test
  mysql-test/t/file_contents.test
  mysql-test/t/func_gconcat.test
  mysql-test/t/func_misc.test
  mysql-test/t/group_by.test
  mysql-test/t/group_min_max.test
  mysql-test/t/loaddata.test
  mysql-test/t/mysql.test
  mysql-test/t/plugin.test
  mysql-test/t/plugin_auth.test
  mysql-test/t/show_check.test
  mysql-test/t/show_explain.test
  mysql-test/t/sp.test
  mysql-test/t/sp_notembedded.test
  mysql-test/t/stat_tables_par.test
  mysql-test/t/subselect4.test
  mysql-test/t/subselect_innodb.test
  mysql-test/t/subselect_sj.test
  mysql-test/t/sum_distinct-big.test
  mysql-test/t/user_var.test
  mysql-test/t/view.test
  mysql-test/valgrind.supp
  mysys/array.c
  mysys/charset-def.c
  mysys/default.c
  mysys/hash.c
  mysys/ma_dyncol.c
  mysys/mf_tempdir.c
  mysys/my_alloc.c
  mysys/my_chmod.c
  mysys/my_chsize.c
  mysys/my_copy.c
  mysys/my_create.c
  mysys/my_delete.c
  mysys/my_error.c
  mysys/my_fopen.c
  mysys/my_fstream.c
  mysys/my_getwd.c
  mysys/my_lib.c
  mysys/my_lock.c
  mysys/my_malloc.c
  mysys/my_open.c
  mysys/my_pread.c
  mysys/my_read.c
  mysys/my_redel.c
  mysys/my_rename.c
  mysys/my_seek.c
  mysys/my_sync.c
  mysys/my_thr_init.c
  mysys/my_write.c
  mysys/mysys_priv.h
  mysys/safemalloc.c
  mysys/string.c
  mysys/tree.c
  mysys/waiting_threads.c
  plugin/feedback/utils.cc
  scripts/CMakeLists.txt
  scripts/mysql_install_db.pl.in
  scripts/mysql_install_db.sh
  scripts/mysql_system_tables.sql
  scripts/mysql_system_tables_fix.sql
  scripts/mysqlaccess.sh
  scripts/mysqld_multi.sh
  scripts/mysqld_safe.sh
  sql-common/client.c
  sql-common/client_plugin.c
  sql/CMakeLists.txt
  sql/debug_sync.cc
  sql/event_data_objects.cc
  sql/event_db_repository.cc
  sql/event_scheduler.cc
  sql/events.cc
  sql/field.cc
  sql/field.h
  sql/filesort.cc
  sql/filesort_utils.cc
  sql/ha_ndbcluster.cc
  sql/ha_ndbcluster_binlog.cc
  sql/ha_partition.cc
  sql/ha_partition.h
  sql/handler.cc
  sql/handler.h
  sql/hostname.cc
  sql/item.cc
  sql/item.h
  sql/item_cmpfunc.cc
  sql/item_cmpfunc.h
  sql/item_create.cc
  sql/item_create.h
  sql/item_func.cc
  sql/item_func.h
  sql/item_geofunc.cc
  sql/item_geofunc.h
  sql/item_row.cc
  sql/item_strfunc.cc
  sql/item_strfunc.h
  sql/item_subselect.cc
  sql/item_sum.cc
  sql/item_sum.h
  sql/item_timefunc.cc
  sql/item_timefunc.h
  sql/item_xmlfunc.cc
  sql/item_xmlfunc.h
  sql/lex.h
  sql/log.cc
  sql/log_event.cc
  sql/log_event.h
  sql/log_event_old.cc
  sql/mdl.cc
  sql/mysqld.cc
  sql/mysqld.h
  sql/net_serv.cc
  sql/opt_range.cc
  sql/opt_range_mrr.cc
  sql/opt_subselect.cc
  sql/protocol.cc
  sql/records.cc
  sql/rpl_filter.cc
  sql/rpl_handler.cc
  sql/rpl_handler.h
  sql/rpl_mi.cc
  sql/rpl_mi.h
  sql/rpl_rli.cc
  sql/rpl_tblmap.cc
  sql/rpl_utility.cc
  sql/scheduler.cc
  sql/set_var.cc
  sql/set_var.h
  sql/slave.cc
  sql/sp.cc
  sql/sp_head.cc
  sql/sp_pcontext.cc
  sql/sp_rcontext.cc
  sql/sp_rcontext.h
  sql/sql_acl.cc
  sql/sql_analyse.h
  sql/sql_array.h
  sql/sql_audit.cc
  sql/sql_audit.h
  sql/sql_base.cc
  sql/sql_base.h
  sql/sql_cache.cc
  sql/sql_class.cc
  sql/sql_class.h
  sql/sql_connect.cc
  sql/sql_const.h
  sql/sql_db.cc
  sql/sql_delete.cc
  sql/sql_error.cc
  sql/sql_error.h
  sql/sql_handler.cc
  sql/sql_help.cc
  sql/sql_insert.cc
  sql/sql_join_cache.cc
  sql/sql_lex.cc
  sql/sql_lex.h
  sql/sql_list.h
  sql/sql_load.cc
  sql/sql_parse.cc
  sql/sql_plugin.cc
  sql/sql_plugin_services.h
  sql/sql_prepare.cc
  sql/sql_priv.h
  sql/sql_profile.cc
  sql/sql_profile.h
  sql/sql_reload.cc
  sql/sql_repl.cc
  sql/sql_repl.h
  sql/sql_select.cc
  sql/sql_servers.cc
  sql/sql_show.cc
  sql/sql_signal.cc
  sql/sql_statistics.cc
  sql/sql_string.cc
  sql/sql_string.h
  sql/sql_table.cc
  sql/sql_test.cc
  sql/sql_time.cc
  sql/sql_trigger.cc
  sql/sql_truncate.cc
  sql/sql_udf.cc
  sql/sql_union.cc
  sql/sql_update.cc
  sql/sql_yacc.yy
  sql/sys_vars.cc
  sql/sys_vars.h
  sql/table.cc
  sql/table.h
  sql/thr_malloc.cc
  sql/thr_malloc.h
  sql/tztime.cc
  sql/uniques.cc
  sql/unireg.cc
  storage/archive/ha_archive.cc
  storage/archive/ha_archive.h
  storage/csv/ha_tina.cc
  storage/federated/ha_federated.cc
  storage/federated/ha_federated.h
  storage/federatedx/federatedx_io_mysql.cc
  storage/federatedx/ha_federatedx.cc
  storage/federatedx/ha_federatedx.h
  storage/heap/ha_heap.cc
  storage/heap/heapdef.h
  storage/heap/hp_block.c
  storage/heap/hp_create.c
  storage/heap/hp_open.c
  storage/heap/hp_write.c
  storage/innobase/btr/btr0btr.cc
  storage/innobase/btr/btr0cur.cc
  storage/innobase/buf/buf0buf.cc
  storage/innobase/buf/buf0lru.cc
  storage/innobase/dict/dict0dict.cc
  storage/innobase/fil/fil0fil.cc
  storage/innobase/fts/fts0fts.cc
  storage/innobase/handler/ha_innodb.cc
  storage/innobase/handler/ha_innodb.h
  storage/innobase/handler/handler0alter.cc
  storage/innobase/ibuf/ibuf0ibuf.cc
  storage/innobase/include/btr0cur.h
  storage/innobase/include/dict0mem.h
  storage/innobase/include/fil0fil.h
  storage/innobase/include/lock0lock.h
  storage/innobase/include/page0zip.h
  storage/innobase/include/row0undo.h
  storage/innobase/include/row0upd.ic
  storage/innobase/lock/lock0lock.cc
  storage/innobase/log/log0recv.cc
  storage/innobase/mysql-test/storage_engine/tbl_opt_row_format.rdiff
  storage/innobase/os/os0file.cc
  storage/innobase/page/page0cur.cc
  storage/innobase/page/page0page.cc
  storage/innobase/page/page0zip.cc
  storage/innobase/row/row0mysql.cc
  storage/innobase/row/row0sel.cc
  storage/innobase/row/row0umod.cc
  storage/innobase/row/row0undo.cc
  storage/maria/ha_maria.cc
  storage/maria/ma_bitmap.c
  storage/maria/ma_blockrec.c
  storage/maria/ma_check.c
  storage/maria/ma_ft_boolean_search.c
  storage/maria/ma_ft_nlq_search.c
  storage/maria/ma_ft_parser.c
  storage/maria/ma_loghandler.c
  storage/maria/ma_open.c
  storage/maria/ma_sort.c
  storage/maria/ma_write.c
  storage/maria/maria_pack.c
  storage/maria/unittest/sequence_storage.c
  storage/myisam/ft_boolean_search.c
  storage/myisam/ft_nlq_search.c
  storage/myisam/ft_parser.c
  storage/myisam/ft_stopwords.c
  storage/myisam/mi_check.c
  storage/myisam/mi_open.c
  storage/myisam/mi_write.c
  storage/myisam/myisamchk.c
  storage/myisam/myisamlog.c
  storage/myisam/myisampack.c
  storage/myisam/sort.c
  storage/myisammrg/ha_myisammrg.cc
  storage/myisammrg/mysql-test/storage_engine/vcol.rdiff
  storage/perfschema/pfs.cc
  storage/perfschema/pfs_check.cc
  storage/perfschema/pfs_instr.cc
  storage/perfschema/pfs_server.cc
  storage/sphinx/ha_sphinx.cc
  storage/xtradb/btr/btr0cur.c
  storage/xtradb/btr/btr0pcur.c
  storage/xtradb/buf/buf0lru.c
  storage/xtradb/buf/buf0rea.c
  storage/xtradb/fsp/fsp0fsp.c
  storage/xtradb/handler/ha_innodb.cc
  storage/xtradb/handler/ha_innodb.h
  storage/xtradb/handler/i_s.cc
  storage/xtradb/ibuf/ibuf0ibuf.c
  storage/xtradb/include/btr0btr.h
  storage/xtradb/include/btr0cur.h
  storage/xtradb/include/log0online.h
  storage/xtradb/include/srv0srv.h
  storage/xtradb/include/univ.i
  storage/xtradb/include/ut0ut.h
  storage/xtradb/include/ut0ut.ic
  storage/xtradb/lock/lock0lock.c
  storage/xtradb/log/log0log.c
  storage/xtradb/log/log0online.c
  storage/xtradb/os/os0file.c
  storage/xtradb/row/row0ins.c
  storage/xtradb/row/row0mysql.c
  storage/xtradb/row/row0upd.c
  storage/xtradb/srv/srv0srv.c
  storage/xtradb/srv/srv0start.c
  strings/ctype-latin1.c
  strings/ctype-ucs2.c
  strings/my_vsnprintf.c
  support-files/compiler_warnings.supp
  support-files/mysql.spec.sh
  tests/mysql_client_test.c
  vio/viosocket.c
  win/create_def_file.js
  mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result
  mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result
  mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result
  mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result
  mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_innodb.test
  mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_myisam.test
pending merges:
  Sergei Golubchik 2013-03-28 MDEV-4207 Invalid code in fts_savepoint_rele...
    Alexander Barkov 2013-03-28 Fixing test failure in the previous comm...
    Alexander Barkov 2013-03-28 Merging utf16le from MySQL-5.6
    Vladislav Vaintroub 2013-02-19 MDEV-156 Threadpool - add thd_wait_be...
    Michael Widenius 2013-02-15 [merge] Automatic merge
    Elena Stepanova 2013-02-08 Fix for MDEV-4149, backport from 10.0:
    timour@askmonty.org 2013-02-07 MDEV-537 Make multi-column non-top le...
    Sergei Golubchik 2013-02-05 set THR_THD key and current_thd=NULL as ...
    sanja@askmonty.org 2013-02-04 [merge] merge
    sanja@askmonty.org 2013-02-04 MDEV-3873: post-merge fix.
    Sergei Golubchik 2013-02-04 missing cast added
    Sergey Petrunya 2013-02-04 Skip cassandra_qcache.test if there is no...
    Sergey Petrunya 2013-02-04 [merge] Merge fix for MDEV-3997.
    Sergey Petrunya 2013-02-04 MDEV-3997: Querying a Cassandra table on ...
    Sergey Petrunya 2013-02-04 Fix mysql-test/suite/plugins/suite.pm to ...
    sanja@askmonty.org 2013-02-04 [merge] merge
    sanja@askmonty.org 2013-02-04 MDEV-4091: Dynamic columns C functions...
    knielsen@knielse... 2013-01-31 MDEV-4121: binlog.binlog_row_binlog s...
    Sergei Golubchik 2013-02-02 remove "invisible sysvars" oxymoron
    Sergei Golubchik 2013-01-31 fix for a valgrind builds.
    Sergei Golubchik 2013-01-31 avoid mtr errors for --plugin-add=EXAMPL...
    Sergei Golubchik 2013-01-31 skip cassandra.test unless cassandra is ...
    Sergei Golubchik 2013-01-31 [merge] 10.0-base merge
    Sergei Golubchik 2013-01-30 don't disable the cassandra engine by de...
    knielsen@knielse... 2013-01-30 MDEV-3984: Double free of Master_info...
    Sergei Golubchik 2013-01-29 move cassandra-related code from cmake/c...
    Sergei Golubchik 2013-01-29 buildbot fixes for storage/cassandra/CMa...
    Sergei Golubchik 2013-01-29 [merge] 5.5 merge
    Sergei Golubchik 2013-01-29 more changes for fedora18
    Sergei Golubchik 2013-01-29 fix 'compat' rpm for fedora18
    Vladislav Vaintroub 2013-01-28 fix embedded build with for cmake 2.6...
    timour@askmonty.org 2013-01-28 Fix for MDEV-3948, and backport of th...
    Sergei Golubchik 2013-01-28 [merge] 5.3 merge
    Sergei Golubchik 2013-01-28 [merge] 5.2 merge
    Sergei Golubchik 2013-01-28 compilation error with -Wuninitialized -...
    Sergei Golubchik 2013-01-25 [merge] 5.1 merge
    Sergei Golubchik 2013-01-25 MDEV-729 lp:998028 - Server crashes on n...
    Sergei Golubchik 2013-01-25 MDEV-759 lp:998340 - Valgrind complains ...
    Sergei Golubchik 2013-01-26 MDEV-3875 Wrong result (missing row) on ...
    sanja@askmonty.org 2013-01-25 The problem was that expression with f...
    sanja@askmonty.org 2013-01-28 MDEV-4091: Dynamic columns C functions...
    Vladislav Vaintroub 2013-01-26 [merge] Merge MDEV-3842, MDEV-3923, M...
    Vladislav Vaintroub 2013-01-25 fix embedded
    Vladislav Vaintroub 2013-01-25 Fix embedded build
    Vladislav Vaintroub 2013-01-25 MDEV-3842,  MDEV-3923 :
    Vladislav Vaintroub 2013-01-25 MDEV-3971  : problems installing Mari...
    Michael Widenius 2013-01-26 [merge] Automatic merge
    Michael Widenius 2013-01-25 Fixed MDEV-3890: Server crash inserting ...
    Sergei Golubchik 2013-01-25 [merge] 5.3 merge
    Sergei Golubchik 2013-01-25 [merge] 5.2 merge
    Sergei Golubchik 2013-01-25 MDEV-4040 Replace deprecated SET OPTION ...
    Sergei Golubchik 2013-01-25 MDEV-3909 remote user enumeration
    Sergei Golubchik 2013-01-25 report "using password: YES/NO" correctl...
    Sergei Golubchik 2013-01-25 MDEV-3915 COM_CHANGE_USER allows fast pa...
    Igor Babaev 2013-01-23 [merge] Merge 5.3->5.5
    Igor Babaev 2013-01-21 [merge] Merge 5.2->5.3
    Igor Babaev 2013-01-21 [merge] Merge 5.1->5.2
    Igor Babaev 2013-01-21 [merge] Merge.
    Igor Babaev 2013-01-21 Fixed bug mdev-4063 (bug #56927).
    Sergei Golubchik 2013-01-21 MDEV-4029 SELECT on information_schema u...
    Igor Babaev 2013-01-19 Corrected the test case for bug mdev-3938.
    Igor Babaev 2013-01-16 Corrected the fix for bug mdev-3938.
    Igor Babaev 2013-01-15 Fixed bug mdev-3938.
    sanja@montyprogr... 2013-01-16 MDEV-4056 fix.
    timour@askmonty.org 2013-01-17 MDEV-3900 Optimizer difference betwee...
    sanja@montyprogr... 2013-01-17 backport of:
    sanja@montyprogr... 2013-01-16 MDEV-3988 fix.
    Igor Babaev 2013-01-11 Fixed bug mdev-4025.
    Vladislav Vaintroub 2013-01-11 MDEV-4020 : Make sure strmov symbol i...
    Sergei Golubchik 2013-01-23 remove one particularly stupid test 
    Sergei Golubchik 2013-01-21 MDEV-4069 thd_wait_end does not called i...
    sanja@montyprogr... 2013-01-22 Fixed typo in the function name.
    sanja@montyprogr... 2013-01-21 MDEV-3873: fixed functions absend in ...
    Sergei Golubchik 2013-01-20 fix a strict aliasing warning - remove a...
    Sergei Golubchik 2013-01-20 MDEV-3952 Incompatible change in MariaDB...
    Sergei Golubchik 2013-01-20 MDEV-3934 Assertion `((keypart_map+1) & ...
    Sergei Golubchik 2013-01-20 MDEV-4029 SELECT on information_schema u...
    Sergei Golubchik 2013-01-19 MDEV-3832 MariaDB conflicts with package...
    Sergei Golubchik 2013-01-18 MDEV-633 lp:1024058 - mysqld XA crash in...
    Sergei Golubchik 2013-01-18 simplify THD::binlog_setup_trx_data() usage
    Sergei Golubchik 2013-01-18 MDEV-3908 crash in multi-table delete an...
    Sergei Golubchik 2013-01-18 MDEV-4065 thd_kill_statement service
    Vladislav Vaintroub 2013-01-18 Fix Windows installers' bootstrapper ...
    Michael Widenius 2013-01-17 Don't reset maybe_null in update_used_ta...
    Michael Widenius 2013-01-17 Fixed compiler warning
    Sergei Golubchik 2013-01-16 [merge] xtradb merge. Percona-Server-5.5...
    Sergei Golubchik 2013-01-15 Percona-Server-5.5.28-rel29.3
    Sergei Golubchik 2013-01-15 Test case and a different fix for MySQL ...
    Sergei Golubchik 2013-01-15 small cleanups
    Sergei Golubchik 2013-01-15 backport a test case for a 5.5 bug fix f...
    Sergei Golubchik 2013-01-15 [merge] mysql-5.5.29 merge
    Dmitry Lenev 2012-12-10 Bug #15954896 "SP, MULTI-TABLE DELETE AND LO...
    mysql-builder@or... 2012-12-07 
    Harin Vadodaria 2012-12-06 Bug#15912213: BUFFER OVERFLOW IN ACL_GET()
    Gleb Shchepa 2012-12-05 Bug #15948123: SERVER WORKS INCORRECT WITH L...
    Gleb Shchepa 2012-12-05 Bug #15948123: SERVER WORKS INCORRECT WITH L...
    Joerg Bruehe 2012-11-08 Building RPMs for ULN:
    Joerg Bruehe 2012-11-08 Placement change:
    Tor Didriksen 2012-11-01 [merge] merge 5.1 => 5.5
    Venkata Sidagam 2012-10-31 BUG#13556441: CHECK AND REPAIR TABLE SHOU...
    Ashish Agarwal 2012-10-31 [merge] BUG#14485479: Merge into mysql-5.5...
    Ashish Agarwal 2012-10-31 BUG#14485479: INSTALL AUDIT PLUGIN HANGS I...
    Anirudh Mangipudi 2012-10-30 [merge] BUG#11754894: MYISAMCHK ERROR H...
    Anirudh Mangipudi 2012-10-30 [merge] BUG#11754894: MYISAMCHK ERROR H...
    Anirudh Mangipudi 2012-10-30 BUG#11754894: MYISAMCHK ERROR HAS INCOR...
    Shivji Kumar Jha 2012-10-30 [merge] BUG#14659685: main.mysqlbinlog_r...
    mysql-builder@or... 2012-10-29 
    mysql-builder@or... 2012-10-29 [merge] 
    mysql-builder@or... 2012-10-29 
    Alexander Nozdrin 2012-10-29 [merge] Merge from 5.1.
    Tor Didriksen 2012-10-24 Bug#14737559 BZR JOIN PLUGIN TREES INTO INT...
    Tor Didriksen 2012-10-23 [merge] local merge
    Tor Didriksen 2012-10-23 Use MESSAGE(STATUS ...) as we don't want an...
    Marko Mäkelä 2012-10-22 [merge] Merge mysql-5.1 to mysql-5.5.
    Nuno Carvalho 2012-10-21 [merge] BUG#14629727: USER_VAR_EVENT IS MIS...
    Nuno Carvalho 2012-10-21 [merge] BUG#14629727: USER_VAR_EVENT IS MIS...
    Nuno Carvalho 2012-10-21 [merge] BUG#14629727: USER_VAR_EVENT IS MIS...
    Nuno Carvalho 2012-10-12 [merge] BUG#14629727: USER_VAR_EVENT IS MIS...
    Joerg Bruehe 2012-10-19 Fix formatting in 'INFO_BIN' on Windows - ba...
    Joerg Bruehe 2012-10-19 [merge] Upmerge a backport - empty
    Annamalai Gurusami 2012-10-19 Bug #14226171  EXCESSIVE ROW LOCKING W...
    Neeraj Bisht 2012-10-18 [merge] Bug#13726751 - 8 BYTE MEMORY LEAK IN...
    Marko Mäkelä 2012-10-18 [merge] Merge mysql-5.1 to mysql-5.5.
    Krunal Bauskar 2012-10-17 [merge] merge from mysql-5.1 -> mysql-5.5
    Krunal Bauskar 2012-10-17 removing .... will re-add using merge. for...
    Tatjana Azundris... 2012-10-17 [merge] NULL merge
    mysql-builder@or... 2012-10-17 [merge] 
    mysql-builder@or... 2012-08-27 
    mysql-builder@or... 2012-08-22 
    mysql-builder@or... 2012-08-22 
    mysql-builder@or... 2012-08-09 
    mysql-builder@or... 2012-08-09 
    mysql-builder@or... 2012-08-08 
    mysql-builder@or... 2012-07-25 
    mysql-builder@or... 2012-07-24 
    mysql-builder@or... 2012-07-23 
    mysql-builder@or... 2012-07-23 
    mysql-builder@or... 2012-07-20 
    mysql-builder@or... 2012-07-19 
    mysql-builder@or... 2012-07-19 
    mysql-builder@or... 2012-07-18 
    mysql-builder@or... 2012-07-17 
    mysql-builder@or... 2012-06-28 
    mysql-builder@or... 2012-06-22 
    mysql-builder@or... 2012-06-21 
    mysql-builder@or... 2012-06-20 
    mysql-builder@or... 2012-06-20 
    mysql-builder@or... 2012-06-19 
    mysql-builder@or... 2012-06-11 
    mysql-builder@or... 2012-06-08 
    mysql-builder@or... 2012-06-04 
    mysql-builder@or... 2012-04-28 
    mysql-builder@or... 2012-02-16 
    mysql-builder@or... 2011-06-28 
    mysql-builder@or... 2011-06-09 
    mysql-builder@or... 2011-04-18 
    mysql-builder@or... 2011-03-18 
    mysql-builder@or... 2011-03-11 
    mysql-builder@or... 2011-03-05 
    mysql-builder@or... 2011-03-04 
    mysql-builder@or... 2011-03-02 
    mysql-builder@or... 2011-03-02 
    mysql-builder@or... 2011-03-02 
    mysql-builder@or... 2011-03-01 
    mysql-builder@or... 2011-02-22 
    mysql-builder@or... 2011-02-22 
    mysql-builder@or... 2011-02-14 
    mysql-builder@or... 2011-02-09 [merge] 
    mysql-builder@or... 2011-02-09 
    mysql-builder@or... 2011-02-09 
    mysql-builder@or... 2011-02-08 
    mysql-builder@or... 2011-02-08 
    mysql-builder@or... 2011-02-09 
    mysql-builder@or... 2011-02-05 
    mysql-builder@or... 2010-12-29 
    mysql-builder@or... 2010-12-29 
    mysql-builder@or... 2010-12-28 
    mysql-builder@or... 2010-12-27 
    mysql-builder@or... 2010-09-06 
    mysql-builder@or... 2010-08-09 
    mysql-builder@or... 2010-06-23 
    mysql-builder@or... 2010-06-09 
    mysql-builder@or... 2010-06-08 
    mysql-builder@or... 2012-02-16 
    mysql-builder@or... 2012-01-31 
    mysql-builder@or... 2012-01-26 
    mysql-builder@or... 2011-09-08 
    mysql-builder@or... 2011-09-08 
    mysql-builder@or... 2011-09-28 
    mysql-builder@or... 2011-09-01 
    mysql-builder@or... 2011-08-30 
    mysql-builder@or... 2011-08-26 
    mysql-builder@or... 2011-08-24 
    mysql-builder@or... 2011-08-18 
    mysql-builder@or... 2011-07-22 
    mysql-builder@or... 2011-05-20 
    mysql-builder@or... 2011-03-22 
    mysql-builder@or... 2011-01-21 
    mysql-builder@or... 2011-01-20 
    mysql-builder@or... 2011-01-19 
    mysql-builder@or... 2011-01-19 
    mysql-builder@or... 2011-01-19 
    mysql-builder@or... 2011-01-13 
    mysql-builder@or... 2011-01-13 
    mysql-builder@or... 2011-01-07 [merge] 
    mysql-builder@or... 2011-01-06 
    mysql-builder@or... 2011-01-06 
    mysql-builder@or... 2010-11-30 
    mysql-builder@or... 2010-11-25 
    mysql-builder@or... 2010-11-25 
    mysql-builder@or... 2010-11-25 
    mysql-builder@or... 2010-11-25 
    mysql-builder@or... 2012-08-28 
    mysql-builder@or... 2012-07-25 
    mysql-builder@or... 2012-03-19 
    mysql-builder@or... 2011-12-21 
    mysql-builder@or... 2011-09-21 [merge] 
    mysql-builder@or... 2011-08-19 [merge] 
    mysql-builder@or... 2011-08-18 
    mysql-builder@or... 2011-08-15 
    mysql-builder@or... 2011-07-28 
    mysql-builder@or... 2011-07-26 
    mysql-builder@or... 2011-07-26 
    mysql-builder@or... 2011-06-20 
    mysql-builder@or... 2011-06-14 
    mysql-builder@or... 2011-06-11 
    mysql-builder@or... 2011-06-10 
    mysql-builder@or... 2011-06-10 
    mysql-builder@or... 2011-06-10 
    mysql-builder@or... 2011-06-09 
    mysql-builder@or... 2011-06-06 
    mysql-builder@or... 2011-06-03 
    mysql-builder@or... 2011-06-02 
    mysql-builder@or... 2011-06-01 
    mysql-builder@or... 2011-06-01 
    mysql-builder@or... 2011-06-01 
    mysql-builder@or... 2011-06-01 
    mysql-builder@or... 2011-06-01 
    mysql-builder@or... 2011-06-01 
    mysql-builder@or... 2011-06-01 
    mysql-builder@or... 2011-05-30 
    mysql-builder@or... 2011-05-30 
    mysql-builder@or... 2011-05-30 
    mysql-builder@or... 2011-05-30 
    mysql-builder@or... 2011-05-30 
    mysql-builder@or... 2011-05-26 
    mysql-builder@or... 2011-05-26 
    mysql-builder@or... 2011-05-26 
    mysql-builder@or... 2011-05-26 
    mysql-builder@or... 2011-05-26 
    mysql-builder@or... 2011-05-25 
    mysql-builder@or... 2011-05-25 
    mysql-builder@or... 2011-05-25 
    mysql-builder@or... 2011-05-25 
    mysql-builder@or... 2011-05-25 
    mysql-builder@or... 2011-05-25 
    mysql-builder@or... 2012-10-17 
    mysql-builder@or... 2012-10-16 
    mysql-builder@or... 2012-09-21 
    mysql-builder@or... 2011-11-17 
    mysql-builder@or... 2011-09-28 
    mysql-builder@or... 2011-09-28 
    mysql-builder@or... 2011-09-21 [merge] 
    mysql-builder@or... 2011-09-08 
    mysql-builder@or... 2011-09-07 
    mysql-builder@or... 2011-09-07 
    mysql-builder@or... 2011-09-07 [merge] 
    mysql-builder@or... 2011-09-02 
    mysql-builder@or... 2011-09-01 
    mysql-builder@or... 2011-09-01 
    mysql-builder@or... 2011-05-20 
    mysql-builder@or... 2011-04-28 
    mysql-builder@or... 2011-04-28 
    mysql-builder@or... 2011-02-04 
    mysql-builder@or... 2010-11-29 
    mysql-builder@or... 2010-11-27 
    mysql-builder@or... 2010-11-23 
    mysql-builder@or... 2010-11-18 
    mysql-builder@or... 2010-11-18 
    mysql-builder@or... 2010-11-18 
    mysql-builder@or... 2010-11-18 
    mysql-builder@or... 2010-10-29 
    mysql-builder@or... 2010-10-29 
    mysql-builder@or... 2010-10-16 
    mysql-builder@or... 2010-10-16 
    mysql-builder@or... 2010-10-16 
    mysql-builder@or... 2010-10-15 
    mysql-builder@or... 2010-10-15 
    mysql-builder@or... 2010-10-15 
    mysql-builder@or... 2010-10-15 
    mysql-builder@or... 2010-10-14 
    mysql-builder@or... 2010-10-14 
    mysql-builder@or... 2010-10-13 
    mysql-builder@or... 2010-10-12 
    mysql-builder@or... 2010-10-12 
    mysql-builder@or... 2010-10-12 
    Yasufumi Kinoshita 2012-10-17 [merge] Bug #13702112 : WAIT_FOR_READ ...
    Tatjana Azundris... 2012-10-17 [merge] Bug#11764559: UMASK IS IGNORE...
    Neeraj Bisht 2012-10-16 [merge] Bug#11745891 - LAST_INSERT(ID) DOES ...
    mysql-builder@or... 2012-10-16 
    Marko Mäkelä 2012-10-16 [merge] Merge mysql-5.1 to mysql-5.5.
    Krunal Bauskar 2012-10-15 removed warning message as they have chang...
    Krunal Bauskar 2012-10-15 bug#14704286
    Marc Alff 2012-10-12 [merge] Merge mysql-5.1 --> mysql-5.5
    Vasil Dimov 2012-10-10 [merge] Null merge mysql-5.1 -> mysql-5.5 (th...
    Vasil Dimov 2012-10-09 [merge] Merge mysql-5.1 -> mysql-5.5
    Harin Vadodaria 2012-10-09 Bug #14211140: CRASH WHEN GRANTING OR REV...
    Annamalai Gurusami 2012-10-09 Fixing a compilation issue. 
    Praveenkumar Hul... 2012-10-08 Bug#11756600 - SLAVE THREAD CAN CRASH...
    Annamalai Gurusami 2012-10-08 Bug #14036214 MYSQLD CRASHES WHEN EXEC...
    Marko Mäkelä 2012-10-08 [merge] Merge mysql-5.1 to mysql-5.5.
    Jon Olav Hauglid 2012-10-04 Bug#14640599 MEMORY LEAK WHEN EXECUTING ...
    Tor Didriksen 2012-10-03 Bug#13713525 CREATE_INITIAL_DB.CMAKE IS FAI...
    Jon Olav Hauglid 2012-10-03 Bug#14495351: CRASH IN HA_PARTITION::HAN...
    Mattias Jonsson 2012-09-10 Bug#14495351: CRASH IN HA_PARTITION::HAND...
    Serge Kozlov 2012-10-02 BUG#12604949. Increased timeout for switchin...
    Tor Didriksen 2012-10-01 [merge] merge 5.1 => 5.5
    Joerg Bruehe 2012-10-01 [merge] Empty upmerge of 5.1.66 into 5.5
    hery.ramilison@o... 2012-10-01 Merge from mysql-5.5.28-release
    Annamalai Gurusami 2012-09-28 [merge] Merge from mysql-5.1 to mysql-...
    mysql-builder@or... 2012-09-27 
    Akhila Maddukuri 2012-09-27 Description:
    mysql-builder@or... 2012-09-26 [merge] 
    Akhila Maddukuri 2012-09-26 [merge] Description:
    Tor Didriksen 2012-09-25 [merge] merge 5.1 => 5.5
    mysql-builder@or... 2012-09-25 [merge] 
    mysql-builder@or... 2012-09-25 [merge] 
    Jon Olav Hauglid 2012-09-25 [merge] Merge from mysql-5.1 to mysql-5.5
    Raghav Kapoor 2012-09-25 [merge] BUG#13864642: DROP/CREATE USER BEHA...
    Rohit Kalhans 2012-09-23 [merge] bug#14548159: upmerge from mysql-5....
    Rohit Kalhans 2012-09-22 [merge] upmerge to bug#14548159
    Nirbhay Choubey 2012-09-21 [merge] Merge of fix for Bug#14645196 fro...
    Joerg Bruehe 2012-09-21 [merge] Merge changes for ULN RPMs into main...
    Joerg Bruehe 2012-09-18 Spec file for ULN RPMs:
    Joerg Bruehe 2012-07-26 Spec file: Declare conflicts with the ULN RPMs.
    Joerg Bruehe 2012-07-26 ULN spec file: Some comment or message text ...
    Joerg Bruehe 2012-07-26 Spec file: transfer the 'runselftest' macro ...
    Joerg Bruehe 2012-07-26 Spec file for ULN RPMs:
    Joerg Bruehe 2012-07-26 Spec file polishing: Handle 'MySQL-*' and 'm...
    Joerg Bruehe 2012-07-25 [merge] Merge 5.5.27 into the tree for ULN R...
    Joerg Bruehe 2012-06-14 Copyright text in the spec file for ULN RPMs.
    Joerg Bruehe 2012-06-12 One file still missing for ULN RPMs.
    Joerg Bruehe 2012-06-12 Still work on getting the "SPECIFIC-ULN/" fi...
    Joerg Bruehe 2012-06-11 Protect traditional RPMs that "SPECIFIC-ULN/...
    Joerg Bruehe 2012-06-11 cmake syntax error: missed ${...}
    Joerg Bruehe 2012-06-11 Files in "SPECIFIC-ULN" need to be mentioned...
    Joerg Bruehe 2012-06-11 Adape "SPECIFIC-ULN/mysql-5.5-libdir.patch" ...
    Joerg Bruehe 2012-06-11 More changes to supporting the build of RPMs...
    Joerg Bruehe 2012-06-08 First version of supporting the build of RPM...
    Inaam Rana 2012-09-20 Bug#14594600 ASSERT FROM DROP TABLE CONCURRENT...
    mysql-builder@or... 2012-09-20 
    Marko Mäkelä 2012-09-20 [merge] Null merge mysql-5.1 to mysql-5.5.
    Marko Mäkelä 2012-09-20 Do not try innodb_change_buffering_debug=2.
    Marko Mäkelä 2012-09-19 [merge] Merge mysql-5.1 to mysql-5.5.
    Tor Didriksen 2012-09-18 Bug#14542543 FIX BUG #12694872 IN 5.5
    Marko Mäkelä 2012-09-17 [merge] Null merge mysql-5.1 to mysql-5.5.
    Marko Mäkelä 2012-09-17 [merge] Merge mysql-5.5 to working copy.
    Harin Vadodaria 2012-09-17 [merge] Bug#11753779: MAX_CONNECT_ERRORS ...
    Marko Mäkelä 2012-09-17 [merge] Merge mysql-5.1 to mysql-5.5.
    Sujatha Sivakumar 2012-09-17 [merge] merge from 5.1 to 5.5
    mysql-builder@or... 2012-09-12 [merge] 
    Tor Didriksen 2012-09-12 [merge] merge 5.1 => 5.5
    Georgi Kodinov 2012-09-11 [merge] merge
    Jon Olav Hauglid 2012-09-11 WL#6454: Deprecate SHOW AUTHORS and SHOW...
    Georgi Kodinov 2012-08-27 Bug #13548161: MYSQLD_SAFE IMPROVEMENTS FO...
    Georgi Kodinov 2012-08-24 Bug #14181049: MYSQL_INSTALL_DB.PL CREATES...
    Andrei Elkin 2012-09-10 [merge] merge bug14597605 to 5.5.
    Marc Alff 2012-09-07 [merge] Local merge
    Marc Alff 2012-09-07 [merge] local merge
    Akhil Mohan 2012-09-07 [merge] Empty version change upmerge
    Marc Alff 2012-09-07 Bug#14072995 - PERFSCHEMA.FUNC_FILE_IO FAILS WI...
    Marc Alff 2012-09-07 Bug#14100113 - PERFSCHEMA.FUNC_MUTEX FAILS WITH...
    Tor Didriksen 2012-09-07 Bug#14593123 CONFIGURE.PL WITH CMAKE2.8 BRE...
    Tor Didriksen 2012-09-05 [merge] merge 5.1 => 5.5
    Annamalai Gurusami 2012-09-04 Bug #14500557 CRASH WHEN USING LONG IN...
    Annamalai Gurusami 2012-09-03 [merge] Merge from mysql-5.1 to mysql-...
    Annamalai Gurusami 2012-09-01 [merge] Merge from mysql-5.1 to mysql-...
    mysql-builder@or... 2012-08-31 [merge] 
    Marko Mäkelä 2012-08-30 [merge] Merge mysql-5.1 to mysql-5.5.
    Jorgen Loland 2012-08-30 [merge] Null-merge from 5.1
    mysql-builder@or... 2012-08-29 
    Tor Didriksen 2012-08-28 [merge] merge 5.5.28-release => 5.5
    mysql-builder@or... 2012-08-27 
    Aditya A 2012-08-27 Bug#14145950 AUTO_INCREMENT ON DOUBLE WILL FAIL ...
    hery.ramilison@o... 2012-08-24 Raise version number after cloning 5....
    Sergei Golubchik 2013-01-15 update debian patch to apply
    Sergei Golubchik 2013-01-15 [merge] 5.3 merge
    Sergei Golubchik 2013-01-10 [merge] 5.2->5.3 merge
    Sergei Golubchik 2013-01-10 [merge] 5.1 merge
    Sergei Golubchik 2013-01-09 [merge] mysql-5.1.67 merge
    Joerg Bruehe 2012-12-07 Last-minute fix to 5.1.67,
    akhil.mohan@orac... 2012-11-29 applying patch for BUG15912213
    Tor Didriksen 2012-11-01 Bug#14840488 VALGRIND ERRORS IN MYSQL_CLIEN...
    Anirudh Mangipudi 2012-10-30 BUG#11754894: MYISAMCHK ERROR HAS INCOR...
    Shivji Kumar Jha 2012-10-30 BUG#14659685 - main.mysqlbinlog_row_myis...
    mysql-builder@or... 2012-10-29 
    Alexander Nozdrin 2012-10-29 Fix sp_notembedded.test.
    Marko Mäkelä 2012-10-22 Backport from 5.6: Bug#14769820 ASSERT FLEN ...
    Nuno Carvalho 2012-10-21 BUG#14629727: USER_VAR_EVENT IS MISSING RAN...
    Nuno Carvalho 2012-10-21 [merge] BUG#14629727: USER_VAR_EVENT IS MIS...
    Nuno Carvalho 2012-10-12 BUG#14629727: USER_VAR_EVENT IS MISSING RAN...
    Joerg Bruehe 2012-10-19 [merge] Automerge into main 5.1
    Joerg Bruehe 2012-09-11 Backport this change from MySQL 5.5 to 5.1:
    Neeraj Bisht 2012-10-18 Bug#13726751 - 8 BYTE MEMORY LEAK IN DO_SAVE...
    Marko Mäkelä 2012-10-18 Bug#14758405: ALTER TABLE: ADDING SERIAL NUL...
    Krunal Bauskar 2012-10-17 bug#14765606: ensure select is active befo...
    Tatjana Azundris... 2012-10-17 [merge] Bug#11764559: UMASK IS IGNORE...
    Tatjana Azundris... 2012-10-17 Bug#11764559: UMASK IS IGNORED BY ERR...
    Yasufumi Kinoshita 2012-10-17 Bug #13702112 : WAIT_FOR_READ IS STUCK...
    Neeraj Bisht 2012-10-16 Bug#11745891 - LAST_INSERT(ID) DOES NOT SUPP...
    Marko Mäkelä 2012-10-16 Bug#14729221 IN-PLACE ALTER TABLE REPORTS ''...
    Krunal Bauskar 2012-10-15 bug#14704286
    Marc Alff 2012-10-12 Bug#14629232 SECURITY VULNERABILITY WITH SHOW P...
    Vasil Dimov 2012-10-10 Fix compilation error in debug mode:
    Vasil Dimov 2012-10-09 Port the test for Bug#14708715 from 5.1/innod...
    Vasil Dimov 2012-10-09 Update the ChangeLog with the fix of Bug#1470...
    Vasil Dimov 2012-10-09 Fix Bug#14708715 CREATE TABLE MEMORY LEAK ON ...
    Marko Mäkelä 2012-10-08 Bug#14731482 UPDATE OR DELETE CORRUPTS A REC...
    Tor Didriksen 2012-10-01 Bug#14683676 ENDLESS MEMORY CONSUMPTION IN ...
    Joerg Bruehe 2012-10-01 [merge] Merge 5.1.66 into main 5.1
    Annamalai Gurusami 2012-09-28 Bug #13249921 ASSERT !BPAGE->FILE_PAGE...
    mysql-builder@or... 2012-09-26 
    Akhila Maddukuri 2012-09-26 Description:
    Tor Didriksen 2012-09-25 Backport
    mysql-builder@or... 2012-09-25 
    mysql-builder@or... 2012-09-25 
    Jon Olav Hauglid 2012-09-25 Bug#14621627 THREAD CACHE IS UNFAIR
    Raghav Kapoor 2012-09-25 BUG#13864642: DROP/CREATE USER BEHAVING ODDLY 
    Rohit Kalhans 2012-09-23 BUG#14548159: Followup patch to fix some is...
    Rohit Kalhans 2012-09-22 BUG#14548159: NUMEROUS CASES OF INCORRECT I...
    Nirbhay Choubey 2012-09-21 Bug#14645196 MYSQL CLIENT'S USE COMMAND F...
    mysql-builder@or... 2012-09-20 
    Marko Mäkelä 2012-09-19 Bug#14636528 INNODB CHANGE BUFFERING IS NOT ...
    Marko Mäkelä 2012-09-17 [merge] Merge mysql-5.1 to working copy.
    Harin Vadodaria 2012-09-17 Bug#11753779: MAX_CONNECT_ERRORS WORKS ON...
    Marko Mäkelä 2012-09-17 Bug#12701488 ASSERT PAGE_ZIP_VALIDATE, UNIV_...
    Sujatha Sivakumar 2012-09-17 Bug#11750014:ASSERTION TRX_DATA->EMPTY(...
    mysql-builder@or... 2012-09-12 
    Tor Didriksen 2012-09-12 Backport Bug#13724099
    Andrei Elkin 2012-09-10 [merge] merge bug14597605 to the main repo.
    Andrei Elkin 2012-09-10 Bug#14597605 Issue with Null-value user on s...
    akhil.mohan@orac... 2012-09-07 Raise version number after cloning 5....
    Sergei Golubchik 2012-12-04 proactive s/strmov/strnmov/ in sql_acl.c...
    Vladislav Vaintroub 2012-12-21 [merge] merge
    Vladislav Vaintroub 2012-12-21 Support VS2012. Exclude compiler-defi...
    Vladislav Vaintroub 2012-12-21 [merge] merge
    Vladislav Vaintroub 2012-12-06 MDEV-3918: myisamchk  bogus error for...
    Sergei Golubchik 2012-12-11 one-byte overflow with old passwords
    Vladislav Vaintroub 2012-11-26 Fix broken feedback plugin after MDEV...
    Vladislav Vaintroub 2012-11-23 MDEV-712  -  LP:1024239 - Mysqlclient...
    Vladislav Vaintroub 2012-11-22 [merge] merge 5.1
    Vladislav Vaintroub 2012-11-22 Feedback plugin now recognizes  Windo...
    Sergei Golubchik 2013-01-08 MDEV-3942 FROM_DAYS(<timestamp column>) ...
    sanja@askmonty.org 2012-12-28 MDEV-3873 & MDEV-3876 & MDEV-3912 : Wr...
    timour@askmonty.org 2012-12-19 MDEV-3928: Assertion `example' failed...
    sanja@montyprogr... 2012-12-05 MDEV-3914 fix.
    Sergei Golubchik 2012-11-23 bump the version to 5.3.11
    Igor Babaev 2012-11-22 [merge] Merge
    Igor Babaev 2012-11-21 Fixed LP bug #1002146 (bug mdev-645).
    Sergei Golubchik 2013-01-15 remove thd_mark_as_hard_kill()
    timour@askmonty.org 2013-01-15 Fix for bug MDEV-3992, second attempt
    timour@askmonty.org 2013-01-14 Fix for bug MDEV-3992
    Michael Widenius 2013-01-11 Buildbot fixes and cleanups:
    Michael Widenius 2013-01-11 Fixed crashing bug in GROUP_CONCAT with ...
    Michael Widenius 2013-01-11 Fixed problem with failing mysql_upgrade...
    Michael Widenius 2013-01-11 Fixed MDEV-4013: Password length in repl...
    Michael Widenius 2013-01-11 Fixed some race conditons and bugs relat...
    Michael Widenius 2013-01-10 Fix for MDEV-4009: main.delayed sporadic...
    Sergei Golubchik 2013-01-09 MDEV-3846 REFRESH_CHECKPOINT and REFRESH...
    Sergei Golubchik 2013-01-09 MDEV-3985 crash: uninstall soname 'a'
    Sergei Golubchik 2013-01-08 MDEV-3883 Show global status not in order
    Sergei Golubchik 2013-01-08 MDEV-3987 uninitialized read in Item_con...
    Sergei Golubchik 2013-01-07 non-functional cleanup, clarifying CONVE...
    Sergei Golubchik 2013-01-28 my_alloca() when it's mapped to malloc()...
    Sergei Golubchik 2013-01-24 fix ha_cassandra to compile
    Sergei Golubchik 2013-01-24 workaround for incorrectly (?) generated...
    Sergei Golubchik 2013-01-24 race conditions in show_explain.test
    Sergei Golubchik 2013-01-23 main.partition_myisam crashes in embedded.
    Sergei Golubchik 2013-01-23 fix the failing federated.federated_inno...
    Sergei Golubchik 2013-01-23 32-bit fix: first cast the value to a si...
    Sergei Golubchik 2013-01-23 test suite fixes
    Sergei Golubchik 2013-01-23 cleanup:
    Sergei Golubchik 2013-01-23 cleanup:
    Sergei Golubchik 2013-01-23 cleanup: remove unused init_dynamic_arra...
    Sergei Golubchik 2013-01-23 cleanup: use MYF() for mysys flags
    Michael Widenius 2013-01-23 MDEV-4011 Added per thread memory counti...
    Jani Tolonen 2013-01-23 MDEV-3931 Cassandra SE packaging
    knielsen@knielse... 2013-01-21 Fix uninitialised variable in binlog ...
    knielsen@knielse... 2013-01-16 Fix missing #include
    Elena Stepanova 2013-01-16 [merge] MDEV-3990: engine tests went out ...
    Elena Stepanova 2013-01-13 MDEV-3990: engine tests went out of sync ...
    sanja@askmonty.org 2013-01-14 Compiler warning fixed.
    Igor Babaev 2013-01-13 [merge] Merged the fix for bug mdev-4019.
    Igor Babaev 2013-01-13 Fixed bug mdev-4019.
    sanja@askmonty.org 2013-01-11 Windows compiler warnings fix.
    sanja@askmonty.org 2013-01-11 Fix windows compiler warnings.
    sanja@askmonty.org 2013-01-10 fixed crossplatform double values repr...
    Sergey Petrunya 2013-01-10 MDEV-3982: show_explain.test fails, times...
    sanja@askmonty.org 2013-01-10 32 bit systems warnings fixed.
    sanja@askmonty.org 2013-01-10 append_identifier() declaration fixed.
    sanja@askmonty.org 2013-01-10 fix cassandra SE test to be working in...
    sanja@askmonty.org 2013-01-10 Make cassandra not built by default
    sanja@askmonty.org 2013-01-10 [merge] Cassandra SE merge
    sanja@askmonty.org 2013-01-10 Make cassandra module and do not load ...
    sanja@askmonty.org 2013-01-09 fixed feature counter.
    sanja@askmonty.org 2013-01-09 The library interface fixed.
    sanja@askmonty.org 2013-01-09 MDEV-4005 fix.
    Sergey Petrunya 2012-12-24 Post-merge fixes:
    sanja@askmonty.org 2012-12-23 [merge] pre-merge
    sanja@askmonty.org 2012-12-23 Post-post review fixes.
    sanja@askmonty.org 2012-12-23 backport to 5.5 dyncol changes and nam...
    Sergey Petrunya 2012-12-20 Cassandra Storage Engine: Address review ...
    Sergey Petrunya 2012-12-20 Cassandra Storage Engine: Address review ...
    Sergey Petrunya 2012-12-20 Cassandra Storage Engine: 
    sanja@montyprogr... 2012-09-30 Check of deleting whole dynamic columns.
    sanja@montyprogr... 2012-09-29 Fix of MDEV-565: Server crashes in ha...
    Sergey Petrunya 2012-09-28 Include cassandra storage engine in tarballs
    Sergey Petrunya 2012-09-28 Fix compile: expect Thrift where it is at...
    Sergey Petrunya 2012-09-28 Fix compile warnings
    sanja@montyprogr... 2012-09-28 Ending spaces removed.
    sanja@montyprogr... 2012-09-28 MDEV-506 Cassandra dynamic columns ac...
    sanja@montyprogr... 2012-09-28 MDEV-377 Name support for dynamic col...
    Sergey Petrunya 2012-09-27 Cassandra SE: lazy connections
    Sergey Petrunya 2012-09-27 Cassandra SE
    Sergey Petrunya 2012-09-26 - Update testcases
    Sergey Petrunya 2012-09-26 Cassandra SE:
    Sergey Petrunya 2012-09-26 Cassandra SE: Add capability to retry fai...
    Sergey Petrunya 2012-09-25 Cassandra SE: more datatypes support
    Sergey Petrunya 2012-09-24 Cassandra SE: varint datatype support: 
    Sergey Petrunya 2012-09-24 Cassandra SE
    Sergey Petrunya 2012-09-22 Cassandra SE: make consistency settings u...
    Sergey Petrunya 2012-09-20 Cassandra SE:
    Sergey Petrunya 2012-09-16 Cassandra SE: 
    Sergey Petrunya 2012-09-14 MDEV-530: Cassandra SE: Locking is incorrect
    Sergey Petrunya 2012-09-14 Cassandra SE
    Sergey Petrunya 2012-09-14 Cassandra SE
    Sergey Petrunya 2012-09-12 Cassandra SE: small optimization: StringC...
    Sergey Petrunya 2012-09-12 Update test results after last cset
    Sergey Petrunya 2012-09-10 Cassandra SE: add support for reading cou...
    Sergey Petrunya 2012-09-10 Cassandra SE
    Sergey Petrunya 2012-09-07 Cassandra SE: added support for boolean t...
    Sergey Petrunya 2012-08-31 MDEV-498: Cassandra: Inserting a timestam...
    Sergey Petrunya 2012-08-31 Cassandra SE
    Sergey Petrunya 2012-08-29 Cassandra SE: fix batched insert to flush...
    Sergey Petrunya 2012-08-29 Fix for the previous cset: Field::store_T...
    Sergey Petrunya 2012-08-29 Cassandra SE: Timestamp data type support.
    Sergey Petrunya 2012-08-29 Cassandra SE
    Sergey Petrunya 2012-08-29 Cassandra storage engine: add @@rnd_batch...
    Sergey Petrunya 2012-08-28 MDEV-494, part #1: phantom row for big fu...
    Sergey Petrunya 2012-08-28 MDEV-480: TRUNCATE TABLE on a Cassandra t...
    Sergey Petrunya 2012-08-27 Cassandra storage engine: BKA support
    Sergey Petrunya 2012-08-26 Cassandra storage engine: bulk INSERT sup...
    Sergey Petrunya 2012-08-23 - Enable mapping of CHAR(n)
    Sergey Petrunya 2012-08-23 # MDEV-476: Cassandra: Server crashes in ...
    Sergey Petrunya 2012-08-21 Make ha_cassandra work with filesort().
    Sergey Petrunya 2012-08-20 Read records in batches when doing full t...
    Sergey Petrunya 2012-08-19 position() and rnd_pos() implementations.
    Sergey Petrunya 2012-08-19 MDEV-431: Cassandra storage engine
    Sergey Petrunya 2012-08-19 MDEV-431: Cassandra storage engine
    Sergey Petrunya 2012-08-18 MDEV-431: Cassandra storage engine
    Sergey Petrunya 2012-08-18 MDEV-431: Cassandra storage engine
    Sergey Petrunya 2012-08-18 MDEV-431: Cassandra storage engine
    Sergey Petrunya 2012-08-17 Initial commit for Cassandra storage engine.
2013-03-29 11:33:42 +04:00
Olivier Bertrand
dd8c89b2f4 - Fix problems related to table file names when not specified:
Split unspecified VEC tables are no more allowed.
  Empty XML files are now accepted.
  Separate index files are now depending upon the SEPINDEX option
  and not allowed when file name is not specified.
  DROP now can erase table and index file.

modified:
  storage/connect/ha_connect.cc
  storage/connect/tabdos.cpp
  storage/connect/tabxml.cpp
2013-03-29 01:28:48 +01:00
Olivier Bertrand
0de0a46f02 - Commit revision pushed from Linux
modified:
  storage/connect/xindex.cpp*
2013-03-28 22:21:17 +01:00
unknown
a804f28c49 - Fixing Linux index compile errors
modified:
  storage/connect/xindex.cpp
2013-03-28 22:15:02 +01:00
Sergei Golubchik
2901497b18 MDEV-4243 Warnings/errors while compiling with clang 2013-03-28 20:04:14 +01:00
Sergei Golubchik
3a9f1091f0 MDEV-4207 Invalid code in fts_savepoint_release() in InnoDB 2013-03-28 19:36:11 +01:00
Olivier Bertrand
0dc6f5aa15 - Miscelleanous fix for compiling on Linux
modified:
  storage/connect/xindex.cpp
2013-03-28 18:42:45 +01:00
Olivier Bertrand
35ee485b65 - Implemented: not split indexes (all indexes in one file)
modified:
  storage/connect/tabdos.cpp
  storage/connect/xindex.cpp
  storage/connect/xindex.h
2013-03-28 18:31:10 +01:00
Annamalai Gurusami
f4b97d10a7 Bug #16244691 SERVER GONE AWAY ERROR OCCURS DEPENDING ON THE NUMBER OF
TABLE/KEY RELATIONS

Problem:

When there are many tables, linked together through the foreign key
constraints, then loading one table will recursively open other tables.  This
can sometimes lead to thread stack overflow.  In such situations the server
will exit.

I see the stack overflow problem when the thread_stack is 196608 (the default
value for 32-bit systems).  I don't see the problem when the thread_stack is
set to 262144 (the default value for 64-bit systems).

Solution:

Currently, in InnoDB, there is a macro DICT_FK_MAX_RECURSIVE_LOAD which defines
the maximum number of tables that will be loaded recursively because of foreign
key relations.  This is currently set to 250.  We can reduce this number to 33
(anything more than 33 does not solve the problem for the default value).  We
can keep it small enough so that thread stack overflow does not happen for the
default values.  Reducing the DICT_FK_MAX_RECURSIVE_LOAD will not affect the
functionality of InnoDB.  The tables will eventually be loaded. 

rb#2058 approved by Marko
2013-03-28 10:42:42 +05:30
Annamalai Gurusami
efff966148 Merge from mysql-5.1 to mysql-5.5 2013-03-28 10:25:23 +05:30
Sergei Golubchik
993ea79f2d 5.5 merge 2013-03-27 23:41:02 +01:00
Sergei Golubchik
6599fd3e9c 5.3 merge 2013-03-27 10:03:28 +01:00
Annamalai Gurusami
38e97daee1 Bug #16244691 SERVER GONE AWAY ERROR OCCURS DEPENDING ON THE NUMBER OF
TABLE/KEY RELATIONS

Problem:

When there are many tables, linked together through the foreign key
constraints, then loading one table will recursively open other tables.  This
can sometimes lead to thread stack overflow.  In such situations the server
will exit.

I see the stack overflow problem when the thread_stack is 196608 (the default
value for 32-bit systems).  I don't see the problem when the thread_stack is
set to 262144 (the default value for 64-bit systems).

Solution:

Currently, in InnoDB, there is a macro DICT_FK_MAX_RECURSIVE_LOAD which defines
the maximum number of tables that will be loaded recursively because of foreign
key relations.  This is currently set to 250.  We can reduce this number to 33
(anything more than 33 does not solve the problem for the default value).  We
can keep it small enough so that thread stack overflow does not happen for the
default values.  Reducing the DICT_FK_MAX_RECURSIVE_LOAD will not affect the
functionality of InnoDB.  The tables will eventually be loaded. 

rb#2058 approved by Marko
2013-03-27 11:11:38 +05:30
Olivier Bertrand
039630806f - PROFILE_Close cannot be static
modified:
  storage/connect/inihandl.c
2013-03-26 16:25:19 +01:00
Olivier Bertrand
1e55712f5e - On Linux, closing an INI table removes it from the inihandl cache
modified:
  storage/connect/inihandl.c
  storage/connect/osutil.h
  storage/connect/tabsys.cpp

- Clean. Remove some unused functions

modified:
  storage/connect/plgdbsem.h
  storage/connect/plgdbutl.cpp
2013-03-26 15:20:22 +01:00
Michael Widenius
068c61978e Temporary commit of 10.0-merge 2013-03-26 00:03:13 +02:00
Olivier Bertrand
cd9e1938ef - Add a new table option SEPINDEX (not used yet) and remove an unused
parameter to all catalog info functions.

modified:
  storage/connect/catalog.h
  storage/connect/filamvct.cpp
  storage/connect/filamzip.cpp
  storage/connect/ha_connect.cc
  storage/connect/mycat.cc
  storage/connect/mycat.h
  storage/connect/reldef.cpp
  storage/connect/reldef.h
  storage/connect/tabdos.cpp
  storage/connect/tabfmt.cpp
  storage/connect/tabmul.cpp
  storage/connect/tabmysql.cpp
  storage/connect/tabodbc.cpp
  storage/connect/tabsys.cpp
  storage/connect/tabtbl.cpp
  storage/connect/tabvct.cpp
  storage/connect/tabwmi.cpp
  storage/connect/tabxml.cpp
  storage/connect/xindex.cpp
2013-03-25 11:07:45 +01:00
Olivier Bertrand
8f0ae6322c - Upated columns must be allocated before opening the table
modified:
  storage/connect/connect.cc
2013-03-23 23:48:10 +01:00
Olivier Bertrand
6a15b5f870 - Wrong FLAG values transmitted to created table by the AS SELECT table:
It is not enough to ignore the flags while populating the table. They have
  to be removed from the definition in pre_create. The issue is to pass the
  info from the selected table handler to the created table handler.
  It is done via the only common item between them: the GLOBAL structure.

modified:
  storage/connect/global.h
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
  storage/connect/plugutil.c
2013-03-23 19:47:51 +01:00
Olivier Bertrand
aa881ad593 - Fix a typo error: in AllocateValue(2) Tiny values were given the TYPE_SHORT type.
modified:
  storage/connect/value.cpp
2013-03-23 16:03:56 +01:00
Olivier Bertrand
6c6d6fbf41 - Fix bug: When a table is created ... AS SELECT ... the offsets (FLAG value)
of the source table columns must be ignored by the created table.

modified:
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
2013-03-23 16:00:09 +01:00
Olivier Bertrand
322a99b097 - Fix check_if_incompatible_data to correctly get thd.
modified:
  storage/connect/ha_connect.cc
2013-03-22 12:57:24 +01:00
Olivier Bertrand
2ad6e653eb - Fix bug to allow creating views.
modified:
  storage/connect/ha_connect.cc
2013-03-22 12:49:41 +01:00
Alexander Barkov
70622eaac8 Fixing compilation failure in Windows: unknown symbol "any_db".
modified:
  storage/connect/ha_connect.cc
2013-03-22 14:05:15 +04:00
Alexander Barkov
8087daaeb3 Require FILE privilege to DROP a table with FILE_NAME.
modified:
  mysql-test/suite/connect/r/bin.result
  mysql-test/suite/connect/t/grant.inc
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
2013-03-22 13:44:21 +04:00
Alexander Barkov
79f84fdc77 - Require FILE privilege for the file based TABLE_TYPEs
when FILE_NAME is specified

- Require FILE privileges for the TABLE_TYPEs that
  access to the underlying operating system:
  ODBC, MYSQL, DIR, MAC, WMI, OEM.

added:
  mysql-test/suite/connect/t/grant.inc
modified:
  mysql-test/suite/connect/r/bin.result
  mysql-test/suite/connect/t/bin.test
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
2013-03-22 11:28:58 +04:00
Olivier Bertrand
50af1a52f6 - Commit merged items
modified:
  mysql-test/suite/connect/t/xml.test
  storage/connect/ha_connect.cc*
2013-03-21 12:22:41 +01:00
Olivier Bertrand
fe6d5f497c - Fix GetTypeID (to take care of supported features)
and IsFileType functions (INI was missing)

modified:
  storage/connect/mycat.cc

- Update test result

modified:
  mysql-test/suite/connect/r/null.result
2013-03-21 12:16:56 +01:00
Alexander Barkov
356402356a Removing executable flag.
modified:
  storage/connect/ha_connect.cc*
2013-03-21 11:34:58 +04:00
Sergey Petrunya
fb2501e2d4 MDEV-4277: Crash inside mi_killed_in_mariadb() with myisammrg
- Set MI_INFO::external_ref for MyISAM tables that are parts of myisamMRG table.
2013-03-21 11:06:27 +04:00
Olivier Bertrand
fff28085d8 - A specified table type not supported is now flagged as an error
instead of being replaced by the default type DOS.

modified:
  mysql-test/suite/connect/r/general.result
  mysql-test/suite/connect/t/general.test
  storage/connect/ha_connect.cc
2013-03-20 23:42:23 +01:00
Murthy Narkedimilli
e55c30f943 Correcting the permissions of the executable files. 2013-03-20 17:50:15 +01:00
Murthy Narkedimilli
7c28426b8b Correcting the permissions of executable files. 2013-03-20 17:49:30 +01:00
Olivier Bertrand
964a423d2c - Fix a bug causing the index file not being made or erased on statements
such as CREATE INDEX, DROP INDEX, ALTER TABLE... ADD INDEX etc.

modified:
  storage/connect/ha_connect.cc
2013-03-20 00:52:32 +01:00
Olivier Bertrand
5746fcc9e1 - Make INI and XML tables not writing null column values
modified:
  mysql-test/suite/connect/r/dbf.result
  storage/connect/tabsys.cpp
  storage/connect/tabxml.cpp
  storage/connect/tabxml.h
2013-03-19 19:41:50 +01:00
Olivier Bertrand
19e9fa45ea - Use all columns in case of INSERT so default values are generated for
columns not specified in the statemant.

modified:
  storage/connect/ha_connect.cc
2013-03-19 18:45:05 +01:00
Sergei Golubchik
e73f13a707 extend check_global_access() to avoid my_error when it's not needed
(in INFORMATION_SCHEMA).
2013-03-19 15:25:58 +01:00
Murthy Narkedimilli
8afe262ae5 Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 15:53:48 +01:00
Murthy Narkedimilli
fe85f54640 Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
Vasil Dimov
57059380b5 Fix Bug#16400412 UNNECESSARY DICT_UPDATE_STATISTICS DURING CONCURRENT
UPDATES

After checking that the table has changed too much in
row_update_statistics_if_needed() and calling dict_update_statistics(),
also check if the same condition holds after acquiring the table stats
latch. This is to avoid multiple threads concurrently entering and
executing the stats update code.

Approved by:	Marko (rb:2186)
2013-03-18 17:20:30 +02:00
Olivier Bertrand
5008a3e897 - Add in create a check for nullable columns not supported by some table types.
modified:
  storage/connect/ha_connect.cc
  storage/connect/mycat.cc
  storage/connect/mycat.h
2013-03-17 11:31:11 +01:00
Olivier Bertrand
d2b6d80bc8 - A quick and dirty fix for erased or not erased files when executing an
Alter table on an auto-generated CONNECT table.

modified:
  storage/connect/ha_connect.cc
2013-03-15 00:11:46 +01:00
Olivier Bertrand
1c4a3eb9a6 - Fix bug on ALTER TABLE t1 MODIFY a VARCHAR(10) NOT NULL;
modified:
  storage/connect/ha_connect.cc
2013-03-13 16:06:02 +01:00
Olivier Bertrand
fe39ea1b03 - Make Tiny compatible with DBF tables.
modified:
  storage/connect/filamdbf.cpp
2013-03-13 14:37:34 +01:00
Aditya A
59bc951a1f Bug#16268289 LOCK_REC_VALIDATE_PAGE() MAY DEREFERENCE A POINTER TO A
FREED LOCK

ANALYIS
-------

In 5.5 code the lock_rec_block_validate() is called after releasing
the kernel mutex. There is a chance that the lock might be invalid so,
we are getting the valgrind error on invalid read on lock->index.

FIX
---

Fix would be to copy the lock->index when we are holding the kernel mutex 
and then pass it to the lock_rec_block_validate(). This implementation
is present in 5.1 code.  

[ Approved by sunny rb.no.oracle.com/rb/r/2152/ ]
2013-03-13 11:43:21 +05:30
Olivier Bertrand
74115f5fa3 - Commit changes from ubuntu
modified:
  storage/connect/ha_connect.cc*
2013-03-13 02:02:44 +01:00
unknown
14f3d5a6c3 - Fix a GCC compile error (crosses initialization of pos) an change
_O_CREAT to O_CREAT

modified:
  storage/connect/ha_connect.cc
  
- Change mode to -x

modified:
  mysql-test/suite/connect/t/index.test*
  storage/connect/filamap.cpp*
2013-03-13 01:56:01 +01:00
Olivier Bertrand
b210168752 - Handle delete_table and rename_table for CONNECT tables whose files are
auto generated and must be erased or renamed on Drop or Rename Table.
  TODO: Take care of eventual index files.

modified:
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
2013-03-13 01:10:20 +01:00
Marko Mäkelä
d910c5acaf Bug#16409715 ASSERT SYNC_THREAD_LEVELS_G(ARRAY, LEVEL - 1, TRUE),
IBUF, FREE SPACE MANAGEMENT

ibuf_merge_or_delete_for_page(): Declare the user index page latched
for UNIV_SYNC_DEBUG after opening the change buffer cursor. This
should avoid the bogus latching order violation.

ibuf_delete_rec(): Add assertions to the callers, checking that the
mini-transaction was committed when the function returned TRUE. This
is a non-functional change, just clarifying the code.

rb#2136 approved by Kevin Lewis
2013-03-12 13:58:10 +02:00
Marko Mäkelä
b5f4385ee3 Merge mysql-5.1 to mysql-5.5. 2013-03-12 13:57:02 +02:00
Marko Mäkelä
daa28126f5 Bug#16463505 PESSIMISTIC PAGE_ZIP_AVAILABLE() MAY CAUSE INFINITE PAGE SPLIT
For a fresh insert, page_zip_available() was counting some fields twice.
In the worst case, the compressed page size grows by PAGE_ZIP_DIR_SLOT_SIZE
plus the size of the record that is being inserted. The size of the record
already includes the fields that will be stored in the uncompressed portion
of the compressed page.

page_zip_get_trailer_len(): Remove the output parameter entry_size,
because no caller is interested in it.

page_zip_max_ins_size(), page_zip_available(): Assume that the page grows
by PAGE_ZIP_DIR_SLOT_SIZE and the record size (which includes the fields
that would be stored in the uncompressed portion of the page).

rb#2169 approved by Sunny Bains
2013-03-12 13:42:12 +02:00
Olivier Bertrand
7572315ecd - New handling of default file name:
Not added as an option but handled when the table is used.
  An empty file is created in the database directory if not exists.

modified:
  storage/connect/ha_connect.cc
  storage/connect/mycat.cc
  storage/connect/tabdos.cpp
  storage/connect/tabmul.cpp
  storage/connect/tabsys.cpp
  storage/connect/tabxml.cpp
2013-03-12 01:20:52 +01:00
Sergei Golubchik
d24c8d9af1 fix innodb failures on solaris 2013-03-11 21:00:08 +01:00
Olivier Bertrand
a2ca685661 - somethin about property
modified:
  storage/connect/filamap.cpp*
2013-03-11 18:40:55 +01:00
unknown
ad020e2c45 - Resetting chmod to non executable
modified:
  storage/connect/maputil.cpp*
2013-03-11 18:35:51 +01:00
Olivier Bertrand
dd72f03f95 - Fix a bug on DBF file name such as 'x/y.dbf' leading to a crash on Insert.
modified:
  storage/connect/filamdbf.cpp
2013-03-11 17:47:27 +01:00
Olivier Bertrand
17fb343a5c - Add tiny integer as a supported type by CONNECT
modified:
  storage/connect/global.h
  storage/connect/ha_connect.cc
  storage/connect/myutil.cpp
  storage/connect/plgdbutl.cpp
  storage/connect/tabdos.cpp
  storage/connect/tabwmi.cpp
  storage/connect/valblk.cpp
  storage/connect/valblk.h
  storage/connect/value.cpp
  storage/connect/value.h
  storage/connect/xobject.cpp
2013-03-11 16:52:59 +01:00
Olivier Bertrand
ffc29ac310 - Enable type conversion on Insert and Update
modified:
  storage/connect/connect.cc
2013-03-11 16:51:40 +01:00
Olivier Bertrand
cb1847df32 - Make indexes to be rebuilt on Update only when an indexed column was updated.
modified:
  mysql-test/suite/connect/r/index.result
  mysql-test/suite/connect/t/index.test
  storage/connect/ha_connect.cc
  storage/connect/tabdos.cpp
  storage/connect/xindex.cpp
2013-03-10 19:48:45 +01:00
Olivier Bertrand
7a30ec7231 - XML and INI tables now return NULL when a node does not exist in a row (XML)
or if the key is missing in a section (INI)

modified:
  mysql-test/suite/connect/r/ini.result
  mysql-test/suite/connect/r/xml.result
  storage/connect/tabsys.cpp
  storage/connect/tabxml.cpp

- Do a sub-storage cleanup on info commands and fix a limit of column number
  in ODBCColumns. This was doing a crash for unexpected longjmp when many info
  commands were executed in a row.

modified:
  storage/connect/ha_connect.cc
  storage/connect/odbconn.cpp
2013-03-10 15:10:00 +01:00
Olivier Bertrand
c7b95cb9df - Delete ALL or truncate must not be done using file mapping.
modified:
  storage/connect/tabdos.cpp
  storage/connect/tabfix.cpp
  storage/connect/tabvct.cpp
2013-03-08 22:48:27 +01:00
Olivier Bertrand
3342df63ef - Commit changes on memory mapping that hopefully should now work on Linux.
modified:
  storage/connect/maputil.cpp
  storage/connect/tabdos.cpp
  storage/connect/tabfmt.cpp
  storage/connect/tabvct.cpp
2013-03-08 18:29:05 +01:00
Olivier Bertrand
69154073d9 - Until the problem is fixed, temporarily not use mapping on Linux for Update.
modified:
  storage/connect/tabdos.cpp
  storage/connect/tabfmt.cpp
  storage/connect/tabvct.cpp
2013-03-08 01:09:53 +01:00
Olivier Bertrand
07beddc421 - Working on the problem of writing to mapped files on Linux
modified:
  storage/connect/maputil.cpp*
2013-03-08 00:41:24 +01:00
Olivier Bertrand
274b2f8c4a - Fix a bug causing the server to crash when writing on a memory mapped
file on Linux.

modified:
  storage/connect/maputil.cpp
2013-03-07 23:05:54 +01:00
Olivier Bertrand
079f053c66 - Fix bug causing a crash when writing to a memory mapped file on Linux.
modified:
  storage/connect/maputil.cpp
2013-03-07 22:56:52 +01:00
Olivier Bertrand
eab8fcfa3f - Set file name when unspecified as tablename.tabletype.
modified:
  storage/connect/ha_connect.cc
  storage/connect/mycat.cc
  storage/connect/mycat.h
2013-03-07 21:38:00 +01:00
Olivier Bertrand
bc9c872483 - Calculate default date field length from the specified format.
modified:
  storage/connect/ha_connect.cc
2013-03-07 18:53:41 +01:00
Aditya A
b6b3d6e243 BUG#16069598 - SERVER CRASH BY NULL POINTER DEREFERENCING IN
MEM_HEAP_CREATE_BLOCK() 

PROBLEM
-------

If we give start mysqld with the option --innodb_log_buffer_size=50GB
,then  mem_area_alloc() function fails to allocate memory and returns
NULL.In debug version we assert at this point,but there is no check in
release version and we get a segmentation fault.

FIX
---
Added a log message saying that we are unable to allocate memory.
After this message we assert.

[Approved by Kevin http://rb.no.oracle.com/rb/r/2065 ]
2013-03-07 14:44:35 +05:30
Sergei Golubchik
9d8ee74b38 MDEV-4186 Test case main.myisampack fails on ppc32 (only)
fix the declaration to use the correct type for st_handler_check_param::sort_buffer_length.
remove redundant casts.
2013-03-08 19:09:45 +01:00
Sergei Golubchik
0d9a6d52d7 merge with XtraDB as of Percona-Server-5.5.30-rel30.1 2013-03-08 19:08:45 +01:00
Olivier Bertrand
5d7d579c8f - In index.test t1 was back to T1! fixed
modified:
  mysql-test/suite/connect/t/index.test*

- Line endings restored to LF only

modified:
  storage/connect/CMakeLists.txt
2013-03-06 11:27:47 +01:00
unknown
1e114f73ad - Changing mode to -x
modified:
  mysql-test/suite/connect/t/index.test
  storage/connect/connect.cc*
  storage/connect/myconn.cpp*
  storage/connect/value.cpp*
2013-03-06 11:16:29 +01:00
Olivier Bertrand
6452fd3065 - Fix wrong format used in ScanRecord for MYSQL_TYPE_TIME
- Change field option BUF_LENGTH to FIELD_LENGTH. It now used to specify
  the field length of DATE columns (MySQL doesn't allow to give a length)

modified:
  storage/connect/ha_connect.cc
2013-03-05 19:30:40 +01:00
Olivier on SAMSUNG 64-bits
25fc1b0308 - Add domdoc.h in source list
modified:
  storage/connect/CMakeLists.txt
2013-03-04 17:49:20 +01:00
Olivier Bertrand
50beff5cbf - FIX a bug causing a crash when deleting a mapped table
modified:
  storage/connect/filamap.cpp
2013-03-04 00:42:39 +01:00
Olivier Bertrand
6a09944072 - FIX a BUG: error (wrong value set) in:
update xempl set ddentree = adddate(ddentree, interval 16 year);
  The same value sdval was used to convert MySQL dates to CONNECT date
  value and CONNECT dates to MySQL date. This was wrong in update because
  the second time the wrong value was used converting to incoherent values.
  There are now 2 separate values used: sdvalin and sdvalout.

modified:
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
2013-03-03 15:37:27 +01:00
Olivier Bertrand
8103dd5e88 - Some end of lines changed from CRLF to LF
modified:
  storage/connect/reldef.h
  storage/connect/tabxml.h
  storage/connect/value.h
2013-03-02 22:30:40 +01:00
Olivier Bertrand
5972b56a6d - Fix conversion bug for MS-DOM XML tables. The node content was written
and read as if the table DATA_CHARSET was ANSI instead of UTF-8. Warning
  are now provided when the read content of a node is truncated.

modified:
  storage/connect/domdoc.cpp
  storage/connect/domdoc.h
  storage/connect/libdoc.cpp
  storage/connect/libdoc.h
  storage/connect/plgxml.h
  storage/connect/tabxml.cpp

- Conditional compilation of pre_create depending on the MARIADB setting.

modified:
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
2013-03-02 17:58:18 +01:00
Olivier Bertrand
3734dfb3b6 - MySQL connection was not close if mysql_real_connect failed.
modified:
  storage/connect/myconn.cpp
2013-03-02 01:02:59 +01:00
unknown
073b0e7731 - MySQL connection was not closed in case of error
modified:
  storage/connect/myconn.cpp
2013-03-02 00:09:15 +01:00
Olivier Bertrand
63798ef4a5 - Rewrite some VALBLK classes as templates
- Correct typo initializing datm in DTVAL::MakeDate as {0,0,0,2,0,70,0,0,0}
  instead of {0,0,0,1,0,70,0,0,0}

modified:
  storage/connect/valblk.cpp
  storage/connect/valblk.h
  storage/connect/value.cpp
  storage/connect/value.h
2013-03-01 22:23:40 +01:00
Olivier Bertrand
cdf3606b38 - Begin fixing memory leaks
modified:
  storage/connect/connect.cc
  storage/connect/plugutil.c
2013-03-01 22:21:48 +01:00
Michael Widenius
4cace76d4d Automatic merge 2013-03-01 18:09:06 +02:00
Annamalai Gurusami
775dbed9d0 Bug #16133801 UNEXPLAINABLE INNODB UNIQUE INDEX LOCKS ON DELETE +
INSERT WITH SAME VALUES

Problem:

When a transaction is in READ COMMITTED isolation level, gap locks are still
taken in the secondary index, when row is inserted.  This happens when the
secondary index is scanned for duplicate.  

The function row_ins_scan_sec_index_for_duplicate() always calls the 
function row_ins_set_shared_rec_lock() with LOCK_ORDINARY irrespective of
the transaction isolation level.

Solution:

The function row_ins_scan_sec_index_for_duplicate() calls the 
function row_ins_set_shared_rec_lock() with LOCK_ORDINARY or 
LOCK_REC_NOT_GAP based on the transaction isolation level.

rb://2035 approved by Krunal and Marko
2013-03-06 11:49:57 +05:30
Inaam Rana
e283b56a46 Bug#16068056 INNODB CALLS BUF_VALIDATE() TOO OFTEN WITH UNIV_DEBUG
Approved by: Marko Makela (patch in bug report)

Reduce the number of debug buf_validate() calls
2013-03-05 10:47:49 -05:00
Olivier Bertrand
612b8c5500 - Fix warning on missing initial values on Linux
modified:
  storage/connect/connect.cc*
  storage/connect/value.cpp*
2013-03-01 00:41:04 +01:00
unknown
0a05caf29f - Fix memory leak
modified:
  storage/connect/connect.cc
  
- GCC requires template<> headers

modified:
  storage/connect/value.cpp
2013-03-01 00:29:48 +01:00
Sergei Golubchik
9d72bbf84c merge with XtraDB as of Percona-Server-5.5.29-rel30.0 2013-02-28 23:56:17 +01:00
Olivier Bertrand
bf6c3f5133 - Second version of template value classes
The first one did not compile with GCC on Linux

modified:
  storage/connect/value.cpp
  storage/connect/value.h
2013-02-28 22:50:26 +01:00
Sergei Golubchik
213f1c76a0 5.3->5.5 merge 2013-02-28 22:47:29 +01:00
Sergei Golubchik
c4341d5095 5.2 -> 5.3 2013-02-28 21:48:47 +01:00
Sergei Golubchik
5dec570d7c 5.1 -> 5.2 merge 2013-02-28 19:00:58 +01:00
Sergei Golubchik
8161c6772d merge with mysql-5.5.30 minus few incorrect or not applicable changesets 2013-02-28 18:42:49 +01:00
Marc Alff
99f83c6684 Bug#16414644 ASSERTION FAILED: SIZE == PFS_ALLOCATED_MEMORY
Before this fix, the command
  SHOW ENGINE PERFORMANCE_SCHEMA STATUS
could report wrong amount of memory allocated,
when the amount of memory used exceeds 4GB.

The problem is that size computations are not done using size_t,
so that overflows do occur, truncating the results.

This fix compute memory sizes properly with size_t.

Tested manually.

No test script provided, as the script would need to allocate too much 
memory for the test.
2013-02-28 13:19:15 +01:00
Michael Widenius
6a2d730a7f Fixed BUG#51763 Can't delete rows from MEMORY table with HASH key 2013-02-28 10:00:07 +01:00
Sergei Golubchik
08ba257846 mysql-5.1 merge
mysys/errors.c:
  revert upstream's fix. use a much simpler one
mysys/my_write.c:
  revert upstream's fix. use a simpler one
sql/item_xmlfunc.cc:
  useless, but ok
sql/mysqld.cc:
  simplify upstream's fix
storage/heap/hp_delete.c:
  remove upstream's fix.
  we'll use a much less expensive approach.
2013-02-28 09:58:39 +01:00
Michael Widenius
2d78ef1d3b Added support for --crash-script in mysqld_safe.
Trivial cleanup

scripts/mysqld_safe.sh:
  Added support for --crash-script.
  Don't remove socket file (not needed as server will re-create it if needed)
  Patch by Eric Bergen
storage/maria/ha_maria.h:
  Removed not existing variable.
2013-02-28 08:42:05 +02:00
Olivier Bertrand
812c1a7f6b - Modify the way value.h and valblk.h are included to try fixing
the gcc error: invalid use of incomplete type

modified:
  storage/connect/myconn.cpp
  storage/connect/xobject.h
2013-02-27 23:32:34 +01:00
Olivier Bertrand
7879632cea - Change Subclass name from TYPE to T
modified:
  storage/connect/value.h
2013-02-27 22:54:42 +01:00
Olivier Bertrand
7132c590ca - Fix a miscalculation of column length in ODBCTables
- Clean code in Value.h

modified:
  storage/connect/odbconn.cpp
  storage/connect/value.h
2013-02-27 22:42:50 +01:00
unknown
e1e43631f8 Bug #16305265 HANG IN RENAME TABLE
This is a deadlock that will also be fixed in the server by
Bug #11844915 - HANG IN THDVAR MUTEX ACQUISITION.
So this is a simple alternate method of fixing the same problem,
but from within InnoDB.

The simple change is to make rename table start a transaction
before locking dict_sys->mutex since thd_supports_xa() can call
THDVAR which can lock a mutex, LOCK_global_system_variables, that
is used in the server by many other activities.  At least one of
those, sys_var::update(), can call back into InnoDB and try to
lock dict_sys->mutex while holding LOCK_global_system_variables.

The other bug fix for 11844915 eliminates the use of
LOCK_global_system_variables for calls to THDVAR.

Approved by marko in http://rb.no.oracle.com/rb/r/2000/
2013-02-27 12:44:58 -06:00
Olivier Bertrand
fa4aa616a1 - Rewriting the VALUE classes as template classes
modified:
  storage/connect/tabdos.cpp
  storage/connect/tabdos.h
  storage/connect/tabmysql.cpp
  storage/connect/tabodbc.cpp
  storage/connect/tabsys.cpp
  storage/connect/tabxml.cpp
  storage/connect/value.cpp
  storage/connect/value.h
  storage/connect/xobject.h
2013-02-27 16:42:59 +01:00
Marko Mäkelä
a0d7f34ba6 Merge mysql-5.1 to mysql-5.5. 2013-02-27 10:04:43 +02:00
Marko Mäkelä
d065d72704 Bug#16400920 INNODB TRIES TO PASS EMPTY BUFFER TO ZLIB, GETS Z_BUF_ERROR
page_zip_compress_node_ptrs(): Do not attempt to invoke deflate() with
c_stream->avail_in, because it will result in Z_BUF_ERROR (and
page_zip_compress() failure and unnecessary further splits of the node
pointer page). A node pointer record can have empty payload, provided
that all key fields are empty.

Approved by Jimmy Yang
2013-02-27 10:00:50 +02:00
Vladislav Vaintroub
65831bca6f MDEV-4203 : fix maria SE repair functions (wrong operator precedence) 2013-02-26 21:20:15 +01:00
Olivier Bertrand
edd161587e - Catalog table: Use XFLD as Flag value instead of column index.
- Use the COLDEF flag to initialize column nullable value.
- Fix a bug on inserting null values in MYSQL tables.

modified:
  storage/connect/colblk.cpp
  storage/connect/connect.cc
  storage/connect/ha_connect.cc
  storage/connect/odbconn.cpp
  storage/connect/plgdbsem.h
  storage/connect/table.cpp
  storage/connect/tabmysql.cpp
2013-02-25 22:44:42 +01:00
Murthy Narkedimilli
053d7e775c Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
Vladislav Vaintroub
2c97d5a305 Compilation : fix oqgraph's system check, in case where boost header aren't in standard include directory. 2013-02-24 20:05:26 +01:00
Olivier Bertrand
2b60525d57 - Add support to NULL values. This concern the MYSQL
and ODBC table types. Not supported yet for indexes.

modified:
  storage/connect/colblk.cpp
  storage/connect/colblk.h
  storage/connect/connect.cc
  storage/connect/ha_connect.cc
  storage/connect/tabmysql.cpp
  storage/connect/tabodbc.cpp
  storage/connect/valblk.cpp
  storage/connect/valblk.h
  storage/connect/value.cpp
  storage/connect/value.h
  storage/connect/xindex.cpp
2013-02-24 01:23:18 +01:00
Olivier Bertrand
a769cb2fc5 - Add header files to source files
modified:
  storage/connect/CMakeLists.txt
2013-02-22 22:46:52 +01:00
Olivier Bertrand
0a280eb8bd - Commiting merges
Simplify update in pre_create

modified:
  mysql-test/suite/connect/r/mysql.result
  mysql-test/suite/connect/t/mysql.test
  mysql-test/suite/connect/t/xml.test
  storage/connect/CMakeLists.txt
  storage/connect/ha_connect.cc
  storage/connect/mycat.cc
2013-02-22 22:04:47 +01:00
Olivier Bertrand
553964dc70 - Suppress warning on non virtual descriptor
modified:
  storage/connect/CMakeLists.txt
2013-02-22 19:21:34 +01:00
Olivier Bertrand
ebc8a6ef0c - Fix connect string wrongly used when zero length
modified:
  storage/connect/tabmysql.cpp
2013-02-22 18:32:47 +01:00
Olivier Bertrand
b535cb9874 - Add the support of URL connection string fo MYSQL tables
Federated servers are not yet supported.

modified:
  storage/connect/ha_connect.cc
  storage/connect/tabmysql.cpp
  storage/connect/tabmysql.h
2013-02-22 17:26:08 +01:00
Alexander Barkov
aa92de5a70 Adding a reminder.
modified:
  storage/connect/CMakeLists.txt
2013-02-22 16:53:42 +04:00
Alexander Barkov
d899840afb - Adding tests for DBNAME=<unknown database name>.
- Fixing a bug that DBNAME value was forgotten when followed by OPTION_LIST.

modified:
  mysql-test/suite/connect/r/mysql.result
  mysql-test/suite/connect/t/mysql.test
  storage/connect/ha_connect.cc
2013-02-22 13:12:09 +04:00
Alexander Barkov
38210b1145 Skip test XML if no XML support is compiled.
modified:
  mysql-test/suite/connect/t/xml.test
  storage/connect/mycat.cc
2013-02-22 12:52:56 +04:00
Olivier Bertrand
24672d2db8 - Oops! db was no more initialized in pre-create. Fixed
modified:
  storage/connect/ha_connect.cc
  mysql-test/suite/connect/r/mysql.result  (merged)
  mysql-test/suite/connect/t/mysql.test    (merged)
2013-02-21 17:59:58 +01:00
Olivier Bertrand
183698b779 - Change DB_NAME option name to DBNAME. Temporarily, "database" is still
accepted in OPTION_LIST for compatibity but DB_NAME is no more recognized.

modified:
  storage/connect/ha_connect.cc
2013-02-21 17:48:35 +01:00
Olivier Bertrand
9d7f134186 - Fix bad conversion from "bigint" to TYPE_FLOAT.
modified:
  storage/connect/myutil.cpp
2013-02-21 12:30:40 +01:00
Olivier Bertrand
9716acfcc3 - Re-install blank trimming to have the xml test pass.
Note that the problem if far more complex. To be revisited.

modified:
  storage/connect/libdoc.cpp
  storage/connect/tabxml.h
2013-02-20 23:23:35 +01:00
Olivier Bertrand
b63eb1d8b4 - Fix the elimination of control characters from node content
- Take care of XML special chars (<>& etc.)
- Remove Encode, Decode

modified:
  storage/connect/libdoc.cpp
  storage/connect/libdoc.h

- Neither libmysql.lib nor mysqlclient.lib needed for MYSQL table type

modified:
  storage/connect/CMakeLists.txt
2013-02-20 18:49:18 +01:00
Olivier Bertrand
26bf803c04 - Update the MYSQL table handling to use only client API functions.
It is no more necessary to be liked to libmysql.lib nor mysqlclient.lib.

modified:
  storage/connect/libdoc.cpp
  storage/connect/myconn.cpp
  storage/connect/myconn.h
  storage/connect/tabmysql.cpp
  storage/connect/tabmysql.h
2013-02-20 16:57:38 +01:00
Olivier Bertrand
818d0a5622 Suppress a warning on unused variable.
modified:
  storage/connect/reldef.cpp
2013-02-20 16:54:57 +01:00
Alexander Barkov
d99d3da1d1 Removing the MODULE_ONLY option, to be able to run with valgrind.
(with MODULE_ONLY valgrind does not display file name and line number
if a problem happens inside a dlopen-ed plugin)

modified:
  storage/connect/CMakeLists.txt
2013-02-20 16:43:38 +04:00
Alexander Barkov
ea0e250669 Fixing valgrind warning: uninitialized memory read.
modified:
  storage/connect/ha_connect.cc
2013-02-20 16:05:53 +04:00
Satya Bodapati
6ca27ddec0 Testcase fix for BUG#14147491
The random failure will be fixed by Bug#16263506 and this patch

Approved by Marko. rb#1988
2013-02-20 18:25:18 +05:30