mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
61100 commits 2790 branches 343 tags 1.7 GiB
Commit graph

61100 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonathan Perkin
2487bc32f5 Merge to mysql-next-mr-bugfixing 2010-02-23 11:02:27 +00:00
Jonathan Perkin
b0a89a2ee5 Support non-GPL builds. 2010-02-23 09:53:48 +00:00
Alexander Nozdrin
ff68d48279 Manual merge from mysql-next-mr. 
Conflicts:
  - mysql-test/r/mysqld--help-notwin.result
  - mysql-test/r/mysqld--help-win.result
 2010-02-22 16:22:31 +03:00
Alexander Nozdrin
9b68ea49bc Fix default.conf. 2010-02-22 14:48:38 +03:00
Alexander Nozdrin
672cb8d9b8 Make sp-error.test experimental on Windows due to Bug 43201. 
The patch is ready and will be pushed via -bugfixing.
 2010-02-22 14:40:41 +03:00
Luis Soares
d9da901092 BUG#50364: Automerge from mysql-trunk-bugfixing. 2010-02-22 00:27:46 +00:00
Luis Soares
1e638e728a Post-push fix for BUG#50364. 
There was an erroneous parameter when calling flush_master_info
from write_ignored_events_info_to_relay_log which could lead to a
server crash. This happens because the I/O thread releases the
log_lock before calling the flush_master_info.

Set the function to call flush_master_info with third parameter
to true, so that the mutex is properly taken.
 2010-02-22 00:26:29 +00:00
Alexander Nozdrin
36d6330aa1 Auto-merge from mysql-next-mr. 2010-02-21 22:36:05 +03:00
Alexander Nozdrin
b29eb4e282 Auto-merge from mysql-next-mr. 2010-02-21 21:34:09 +03:00
Vladislav Vaintroub
2bbfec9252 Do not run shared memory sys_vars tests in embedded 2010-02-21 15:10:52 +01:00
Vladislav Vaintroub
56700fd38c Install static client and embedded debug libraries 2010-02-20 20:40:03 +01:00
Vladislav Vaintroub
b2d289f3d7 extend configure-like perl wrapper for INSTALL_FOODIR variables 2010-02-20 14:17:55 +01:00
Vladislav Vaintroub
d6f8da6e8a merge 2010-02-20 11:23:12 +01:00
Alexander Nozdrin
7c10a8981c Patch for WL#3736: Extended Table, Column and Index Comments. 
The task is to 
  (a) add a comment on indexes and 
  (b) increase the maximum length of column, table and the new index comments.

The patch committed on behalf of Yoshinori Matsunobu (Yoshinori.Matsunobu@Sun.COM).
 2010-02-20 13:07:32 +03:00
Alexander Nozdrin
c255be712b Auto-merge (empty) from mysql-trunk-bugfixing. 2010-02-20 12:43:54 +03:00
Alexander Nozdrin
77c6baf612 Auto-merge from mysql-next-mr. 2010-02-20 12:40:21 +03:00
Alexander Nozdrin
ed8097d050 Auto-merge from mysql-trunk. 2010-02-20 12:40:04 +03:00
Alexander Nozdrin
7ba0546620 Fix default.conf. 2010-02-20 12:27:30 +03:00
Alexander Nozdrin
7b7dd8dc0a Fix default.conf. 2010-02-20 12:26:22 +03:00
Alexander Nozdrin
2b1fe9c3e1 Auto-merge from mysql-trunk-mtr. 2010-02-20 12:14:09 +03:00
Alexander Nozdrin
70c136ad3a Auto-merge from mysql-5.1-mtr. 2010-02-20 12:09:17 +03:00
Alexander Nozdrin
c4de42d6f9 Auto-merge from mysql-5.1. 2010-02-20 12:08:40 +03:00
Vladislav Vaintroub
6efcf9e3b6 add_executable => mysql_add_executable (just for uniformity) 2010-02-20 08:58:18 +01:00
Vladislav Vaintroub
ab3ecf5a7c Fix configure.js : set the variabes in cache, so they can overwrite cache variables in CMakeLists.txt 2010-02-20 08:17:44 +01:00
Vladislav Vaintroub
b7d7a42800 SET FN_NO_CASE_SENSE to 1 on Windows 2010-02-20 02:12:01 +01:00
Serge Kozlov
5b1700bbfa Bug#48308. Merge mysql-trunk-bugfixing -> mysql-next-mr-bugfixing 2010-02-19 22:40:20 +03:00
Serge Kozlov
6b443a7e2c Bug#48308. Post-fix 
Removed --remove_file in cleanup procedure
 2010-02-19 22:37:23 +03:00
Vladislav Vaintroub
e81640ba27 Install extremely useful program "replace" 2010-02-19 18:04:35 +01:00
Vladislav Vaintroub
541cf19c5c When installing, exclude some documents in Docs 2010-02-19 17:51:53 +01:00
Vladislav Vaintroub
0563ac784e Fix some glitches with INSTALL_LAYOUT=STANDALONE 
- mysql_install_db is in scripts dir now
- sql-bench is installed
-some extra support-files (e.g ini) are in support-files
 2010-02-19 18:30:08 +01:00
Magne Mahre
2da4521fb8 Cleanup after push of 
WL#5154 - Remove deprecated 4.1 features

The fix is the removal of the sql_log_update_basic
test, as this option is deprecated and removed,
and a minor change to the result file of
lc_time_names_basic as the error message has
changed.
 2010-02-18 18:10:39 +01:00
Vladislav Vaintroub
67d57568f1 merge 2010-02-18 14:43:56 +01:00
Vladislav Vaintroub
a99f78da5c merge 2010-02-18 14:09:35 +01:00
Bjorn Munch
f1f68c5982 merge from next-mr 2010-02-18 09:26:21 +01:00
Bjorn Munch
3687803e11 upmerge 51135 2010-02-18 09:09:08 +01:00
Bjorn Munch
a9af3b51a9 upmerge 51135 2010-02-18 09:02:38 +01:00
Magne Mahre
a83c305e43 Bug#47017 rpl_timezone fails on PB-2 with mismatch error 
This is a post-fix cleanup to move rpl.rpl_timezone out
of 'experimental' state.
 2010-02-17 22:17:17 +01:00
hery.ramilison@sun.com
ab1b9cecd9 Merge from mysql-5.1.44-release 2010-02-17 18:48:40 +01:00
hery.ramilison@sun.com
df555c117c configure.in 
- Changes to the banner text
 - Use older AC_PROG_LIBTOOL (Bug#51009)

scripts/mysql_install_db.sh
 - Changes to banner text
 2010-02-17 18:39:28 +01:00
Bjorn Munch
4d5c86fb27 Bug #51135 Please increase the maximum number of connections allowed in mysqltest 
Added --max-connections= argument to mysqltest and mtr
Small fix to first patch: forgot to check before free'ing connections array
 2010-02-17 16:28:02 +01:00
Bjorn Munch
3796d78eb5 merge 44054 2010-02-17 13:12:30 +01:00
Bjorn Munch
584a6e7425 merge 44054 2010-02-17 13:09:48 +01:00
Alexander Nozdrin
b5936f7340 Re-adding 'include/probes_mysql_nodtrace.h' removed by accident 
in 'kostja@sun.com-20091210084103-l4f8u62u4evoy3dc'.

This file is necessary for Windows builds.
 2010-02-17 14:37:55 +03:00
Bjorn Munch
db1f4e0bf9 Bug #44054 MTR2: --no-reorder does not prevent reordering 
Some logic would group by suite always
Disable this if using --noreorder
Also fix getting array from collect_one_suite() in this case
Amended according to previous comment
 2010-02-17 12:37:37 +01:00
Alexey Botchkov
b0cdcdcbb9 Bug#38959 archive_gis fails due to rounding difference 
Multi_polygon::centroid() has an error in the implementation
      
per-file messages:
  sql/spatial.cc
Bug#38959      archive_gis fails due to rounding difference
        multi_polygon::centroid() implementation fixed
 2010-02-17 14:19:17 +04:00
Magne Mahre
4f1c72f313 Merge from mysql-trunk-bugfixing 2010-02-17 22:19:56 +01:00
Bjorn Munch
547f9acd52 Bug #51248 Server start fails with MTR_VERSION=1 and code with WL5154 
Replaced --default-character-set with --character-set-server
Replaced --language with --lc-messages-dir
NB full test suite not tested yet
 2010-02-17 19:08:49 +01:00
Magne Mahre
efaf2ee253 WL#5182 Remove more deprecated 4.1/5.0 features 
WL#5154 was a task for formally deprecating and removing items that
were mentioned in the manual as having been deprecated since MySQL
4.1 or 5.0, but that had never been removed.

Since WL#5154 was created, examination of mysqld.cc, mysql.cc, and
mysqldump.c reveals additional deprecations not mentioned in the
manual. (In some cases, the items are simply not mentioned in the
5.1+ manuals.)

This is a follow-on task to deprecate and remove these additional
items.

The deprecation happened in MySQL 5.1, and the options/variables
are now removed from the code.
 2010-02-17 13:15:07 +01:00
Magne Mahre
1f7f620f30 WL#5154 Remove deprecated 4.1 features 
A set of program options and variables was deprecated in
MySQL 5.1, and is hereby removed.
 2010-02-17 10:18:17 +01:00
Alexander Barkov
ae57a478f8 Merging from mysql-next-mr 2010-02-17 12:24:47 +04:00