Commit graph

88902 commits

Author SHA1 Message Date
Sergei Golubchik
759fa19690 don't install ndb related .ini files, remove mysql_fix_privilege_tables.1 and mysqlman.1 2014-06-01 11:23:20 +02:00
Sergei Golubchik
44ce364ac2 MDEV-5645 MariaDB-5.5.35 - references are made to an "EXCEPTIONS-CLIENT" file but it does not exist
Added the EXCEPTIONS-CLIENT (that was lost in the merge),
as the ascii version of http://www.mysql.com/about/legal/licensing/foss-exception/
2014-05-31 13:18:56 +02:00
Sergei Golubchik
69bb48b89b disable unstable tokudb tests 2014-05-31 10:16:25 +02:00
Sergei Golubchik
de8cb7a1f3 MDEV-5485 Minor man pages formatting issues
MDEV-6281 Typo in mysql_install_db scripts
and collateral changes:

* remove mysql_tableinfo.1 and references to it (there's no mysql_tableinfo)
* for debian: create manpages for mysqlrepair, mysqlanalyze, mysqloptimize
  (as symlinks for mysqlcheck.1, just as executables are symlinks to mysqlcheck)
* remove mysqlmanager.8 and references to it
* correct "very long line" error in mysqladmin.1
* simplify and fix table formatting in mysqlbinlog.1 and mysqldump.1
* fix a typo in the help text in mysql_install_db
* aria_chk: say "for Linux on x86_64", like other tools do
  (not "for Linux at x86_64")
* add simple manpages for aria_* utilities
2014-05-30 23:19:26 +02:00
Olivier Bertrand
c1973c80d4 - Eliminate virtual columns from CSV and FMT table fields
modified:
  storage/connect/colblk.h
  storage/connect/reldef.h
  storage/connect/tabfmt.cpp

- Fix length specification and writing (when using FIELD_FORMAT) of DECIMAL columns
modified:
  storage/connect/ha_connect.cc
  storage/connect/tabdos.cpp

- Add the D field_format option (specifying the decimal separator character)
modified:
  storage/connect/tabdos.cpp
  storage/connect/tabdos.h
  storage/connect/tabfmt.cpp
2014-05-30 14:53:15 +02:00
Alexander Barkov
4211b1cd48 MDEV-4051 INET6_ATON() and INET6_NTOA()
Backporting functions from MySQL-5.6:

- INET6_ATON()
- INET6_NTOA()
- IS_IPV4()
- IS_IPV4_COMPAT()
- IS_IPV4_MAPPED()
- IS_IPV6()
2014-05-30 16:19:00 +04:00
Alexander Barkov
1449d1d54f Moving implementation of INET_ATON() INET_NTOA() into
separate files item_inetfunc.h and item_inetfunc.cc.
2014-05-30 15:24:25 +04:00
Sergey Petrunya
d533a64bf3 MDEV-6239: Partition pruning is not working as expected in an inner query
- Make partition pruning work for tables inside semi-join nests
  (the new condition is the same that range optimizer uses so 
   it should be ok)
2014-05-29 02:25:37 +04:00
Sergei Golubchik
8bdda78c82 MDEV-6271 update MSI installer to include latest Version of HeidiSQL (8.3.x.x) 2014-05-27 21:05:44 +02:00
Sergei Golubchik
926661ac7c MDEV-6273 Export my_progname symbol in libmysqlclient.so 2014-05-27 20:57:28 +02:00
Sergey Petrunya
dedc76b7d9 MDEV-6263: Wrong result when using IN subquery with order by
- When the optimizer chose LooseScan, make_join_readinfo() should
  use the index that was chosen for LooseScan, and should not try 
  to find a better (shortest) index.
2014-05-28 17:32:43 +04:00
Alexey Botchkov
1e96de926c MDEV-6216 sys_vars.completion_type_func fails in --embedded.
The bug was in the mysqltest.c. It didn't check the send_query result
properly, so when that fails and the thread gets disconnected,
it goes unnoticed, so the consequitive read_result call crashes.
Fixed by checking the sernd_query return.
2014-05-28 16:51:19 +05:00
Sergei Petrunia
0925ab9d88 MDEV-406: ANALYZE $stmt
-Add analyze_stmt.test/result
2014-05-27 20:16:51 +04:00
Sergei Petrunia
eaba1ba4a5 Re-commit in git:
MDEV-406: ANALYZE $stmt
- Ported the old patch to new explain code
- New SQL syntax (ANALYZE $stmt)
- ANALYZE UPDATE/DELETE is now supported (because EXPLAIN UPDATE/DELETE is supported)
- Basic counters are calculated for basic kinds of queries
  (still need to see what happens with join buffer, ORDER BY...LIMIT queries, etc)
2014-05-27 20:13:17 +04:00
Sergei Golubchik
1e702f3d20 don't include <linux/falloc.h> when it's not really needed 2014-05-27 14:29:05 +02:00
Olivier Bertrand
cd185c1468 - Fix a bug causing the tabname option to be ignored when the connection
string was not an URL but a server name. Also make the dbname option
  to be recignized in create (was only seached in option_list)
modified:
  storage/connect/ha_connect.cc
  storage/connect/tabmysql.cpp
2014-05-27 12:50:52 +02:00
Sergei Golubchik
5a61516afd Merge remote-tracking branch 'origin/10.1' into 10.1-serg-merge 2014-05-26 21:14:51 +02:00
Sergei Golubchik
6a85b10dcb merge the compilation fixes from 10.0-FusionIO 2014-05-26 21:11:53 +02:00
Sergei Golubchik
4e68fafad4 compilation failure on Win64
cannot use &ulint_var (where ulint == unsigned __int64)
where (ulong *) is expected (in uncompress() and in "%lu")
2014-05-26 20:42:06 +02:00
Elena Stepanova
69742e4ee3 Increase version number 2014-05-26 22:41:35 +04:00
Sergei Golubchik
8eaa1d90a4 use ENUM not ULONG for innodb-compression-algorithm command-line option 2014-05-26 20:41:10 +02:00
Sergei Golubchik
5035495108 compilation failure on Windows
VS doesn't like #ifdefs inside a macro expansion. move them outside
2014-05-26 20:31:03 +02:00
Sergei Golubchik
7e7e1bf8aa don't include the file that 1) not present everywhere 2) not used anyway 2014-05-26 20:27:14 +02:00
Sergei Golubchik
9ad97c4b1e temporarily disable lzo compression 2014-05-26 20:26:51 +02:00
Sergei Golubchik
45d389fb84 lzo.cmake: don't use the same symbol for two different tests 2014-05-26 20:26:04 +02:00
Sergei Golubchik
63a0e5640d typo fixed (compilation failure with libwrap) 2014-05-26 13:31:11 +02:00
Sergei Golubchik
ac4d78432e more files in .gitignore 2014-05-25 17:20:15 +02:00
Sergei Golubchik
eef1201bcc set version to 10.1.0 2014-05-25 17:17:50 +02:00
Sergei Golubchik
c2b9d993e3 Merge branch '10.1' of bzr::/usr/home/serg/Abk/mysql into 10.1 2014-05-25 10:18:07 +02:00
Jan Lindström
1016ee9d77 Merge 10.0 -> 10.1 2014-05-24 21:37:21 +03:00
Sergei Golubchik
a85186d7ab split README into the actual README and third-party licenses 2014-05-24 18:23:46 +02:00
Sergei Golubchik
a8e1fa173e fix file_contents to pass with git 2014-05-24 18:09:21 +02:00
Sergei Golubchik
3e48269f2a git support in cmake files 2014-05-24 18:09:08 +02:00
Sergei Golubchik
05df71abd9 remove support for per-plugin bzr repositories
we don't have closed-source plugins
2014-05-24 18:08:23 +02:00
Sergei Golubchik
91128dd9f3 remove now-obsolete "5.5+5.6 merge" TODO file 2014-05-24 12:14:06 +02:00
Sergei Golubchik
c39a10bba3 add .gitignore 2014-05-24 12:13:03 +02:00
Jan Lindström
6d460760eb Fix compiler warnings. 2014-05-23 08:20:43 +03:00
Jan Lindström
105060e307 Fix compiler warnings. 2014-05-23 08:10:54 +03:00
Jan Lindström
76c6cd0337 Fixed compiler error if LZO is not installed. 2014-05-22 21:05:35 +03:00
Jan Lindström
192790e0e9 Fix compiler error if LZO is not installed. 2014-05-22 21:03:26 +03:00
Jan Lindström
a64daceb59 Fixed compiler errors caused by merge error. 2014-05-22 19:48:34 +03:00
Jan Lindström
ff3f63c31f Fix compiler errors caused by merge error. 2014-05-22 19:01:41 +03:00
Jan Lindström
b5cdc5adcf Fix some compiler warnings and small errors on code. 2014-05-22 16:31:31 +03:00
Jan Lindström
d12dbe77e2 MDEV-6246: Merge 10.0.10-FusionIO to 10.1. 2014-05-22 14:24:00 +03:00
Jan Lindström
972a14b59a Code cleanup after review. 2014-05-16 15:30:13 +03:00
Jan Lindström
9d399c9f35 MDEV-6075: Allow > 16K pages on InnoDB
This patch allows up to 64K pages for tables with DYNAMIC, COMPACT 
and REDUNDANT row types. Tables with COMPRESSED row type allows 
still only <= 16K page size. Note that single row size must be
still <= 16K and max key length is not affected.
2014-05-13 13:28:57 +03:00
Sergei Golubchik
edf1fbd25b MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wrong executable bits 2014-05-13 11:53:30 +02:00
Olivier Bertrand
8b7c7b9280 - Fix writing header of void CONNECT DBF tables on first insert. An error
occured when the table definition had a special column that was not skipped
  from the header.
modified:
  storage/connect/filamdbf.cpp

- Update some test cases to reflect a change of error message generated when
  trying to update or delete a read only table.
modified:
  storage/connect/mysql-test/connect/r/csv.result
  storage/connect/mysql-test/connect/r/dbf.result
  storage/connect/mysql-test/connect/r/fix.result
  storage/connect/mysql-test/connect/r/ini.result
  storage/connect/mysql-test/connect/r/vec.result
  storage/connect/mysql-test/connect/t/csv.test
  storage/connect/mysql-test/connect/t/dbf.test
  storage/connect/mysql-test/connect/t/fix.test
  storage/connect/mysql-test/connect/t/ini.test
  storage/connect/mysql-test/connect/t/vec.test
2014-05-12 23:42:17 +02:00
Balasubramanian Kandasamy
c1fd09f3d4 Increment release version to resolve upgrade conflict issue 2014-05-11 18:24:12 +02:00
Sergei Golubchik
1170a54060 fix a bad merge, causing a crash of fulltext.test in --ps-protocol 2014-05-10 23:42:01 +02:00