Michael Widenius 58bb0769bd Merge with MySQL 5.1.55 ...

- Fixed some issues with partitions and connection_string, which also fixed lp:716890 "Pre- and post-recovery crash in Aria"
- Fixed wrong assert in Aria

Now need to merge with latest xtradb before pushing 

sql/ha_partition.cc:
  Ensure that m_ordered_rec_buffer is not freed before close.
sql/mysqld.cc:
  Changed to use opt_stack_trace instead of opt_pstack.
  Removed references to pstack
sql/partition_element.h:
  Ensure that connect_string is initialized
storage/maria/ma_key_recover.c:
  Fixed wrong assert

2011-02-20 18:51:43 +02:00

..

.cvsignore

…

array.c

Merge MySQL 5.1.39 into MariaDB 5.1.

2009-10-15 23:38:29 +02:00

base64.c

fixed compilation warnings. addendum to the fix for bug 29125

2009-03-20 16:27:53 +02:00

ChangeLog

…

charset-def.c

Added more general support for sorting 2 characters as one (contractions)

2009-11-30 14:42:24 +02:00

charset.c

Fixed some compiler warnings

2010-11-30 01:14:34 +02:00

checksum.c

Bug#29125 Windows Server X64: so many compiler warnings

2009-02-13 11:41:47 -05:00

CMakeLists.txt

Bug#473914: mysql_client_test fail with in debug compilaton on windows x64

2010-12-06 12:52:06 +01:00

default_modify.c

Bug#29125 Windows Server X64: so many compiler warnings

2009-02-13 11:41:47 -05:00

default.c

Recommit of Bug#49447.

2010-02-04 13:39:42 +01:00

errors.c

Merge with MySQL 5.1.55

2011-02-20 18:51:43 +02:00

hash.c

Additional fix for bug #45613: handle failures from my_hash_insert

2009-11-23 17:32:10 +02:00

lf_alloc-pin.c

post-review fixes

2009-01-15 22:27:36 +01:00

lf_dynarray.c

Windows fixes

2008-01-10 13:21:53 +01:00

lf_hash.c

Remove compiler warnings (Including some warnings from -Wstrict-aliasing)

2009-11-30 01:08:56 +02:00

list.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

make-ccc

…

make-conf.c

…

Makefile.am

- Added/updated copyright headers

2010-12-28 19:57:23 +01:00

md5.c

Bug #42434: license of mysys MD5 implementation is not GPL-compatible

2009-03-09 20:57:03 +02:00

mf_arr_appstr.c

Bug #20748: Configuration files should not be read more than once

2007-11-07 15:23:50 -07:00

mf_brkhant.c

…

mf_cache.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mf_dirname.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mf_fn_ext.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mf_format.c

BUG#43949 Initialization of slave produces a warning message in Valgrind

2009-04-19 02:21:33 +01:00

mf_getdate.c

Merge from 5.0-bugteam

2009-05-13 08:48:00 -07:00

mf_iocache2.c

Merge MySQL->MariaDB

2009-09-08 00:50:10 +04:00

mf_iocache.c

Merge with MySQL 5.1.50

2010-08-27 17:12:44 +03:00

mf_keycache.c

Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failure

2010-11-10 19:14:47 -02:00

mf_keycaches.c

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1

2007-06-27 17:49:12 +03:00

mf_loadpath.c

Bug#53445: Build with -Wall and fix warnings that it generates

2010-07-02 15:30:47 -03:00

mf_pack.c

Merge

2010-12-29 00:47:05 +01:00

mf_path.c

Slow query log to file now displays queries with microsecond precission

2007-07-30 11:33:50 +03:00

mf_qsort2.c

…

mf_qsort.c

We are now using Valgrind rather than purify, and have for quite some time.

2009-05-06 14:03:24 +02:00

mf_radix.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mf_same.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mf_sort.c

Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint

2007-10-18 14:32:43 +04:00

mf_soundex.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mf_tempdir.c

Bug#29125 Windows Server X64: so many compiler warnings

2009-02-13 11:41:47 -05:00

mf_tempfile.c

Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1

2007-10-11 18:07:40 +03:00

mf_unixpath.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

mf_util.c

…

mf_wcomp.c

…

mf_wfile.c

Bug#42733: Type-punning warnings when compiling MySQL --

2010-06-10 17:16:43 -03:00

mulalloc.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_access.c

…

my_aes.c

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

my_alarm.c

…

my_alloc.c

Merge with MySQL 5.1.49

2010-08-02 12:01:24 +03:00

my_append.c

Bug#29125 Windows Server X64: so many compiler warnings

2009-02-13 11:41:47 -05:00

my_atomic.c

Bug#22320: my_atomic-t unit test fails

2010-07-05 09:00:39 -03:00

my_bit.c

Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1

2007-10-11 18:07:40 +03:00

my_bitmap.c

Fix for Bug#43152 "Assertion `bitmap_is_set_all(&table->s->all_set)' failed in handler::ha_reset"

2010-10-06 11:45:30 +03:00

my_chmod.c

Added wrapper for chmod(): my_chmod()

2008-01-03 09:45:46 +02:00

my_chsize.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_clock.c

…

my_compress.c

Fix most Compiler warnings seen in buildbot.

2009-09-03 15:20:22 +02:00

my_conio.c

Bug#29125 Windows Server X64: so many compiler warnings

2009-02-13 11:41:47 -05:00

my_copy.c

mysqltest now gives error messages with error code for my_delete, my_rename, my_copy etc.

2010-09-15 15:48:15 +03:00

my_crc32.c

…

my_create.c

Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main

2008-03-13 23:35:52 +02:00

my_delete.c

Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main

2007-12-16 17:03:44 +02:00

my_div.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_dup.c

Fixed compiler warnings.

2007-03-22 20:32:07 +02:00

my_error.c

Merged with mysql-5.1 tree.

2009-04-25 13:05:32 +03:00

my_file.c

Merge with MySQL 5.1.47

2010-05-26 21:55:40 +03:00

my_fopen.c

Merge with MySQL 5.1.55

2011-02-20 18:51:43 +02:00

my_fstream.c

Merge BUG#22082 from 5.0-bugteam to 5.1-bugteam

2009-03-06 17:38:14 +08:00

my_gethostbyname.c

Bug#45288: pb2 returns a lot of compilation warnings on linux

2010-10-19 11:49:31 -02:00

my_gethwaddr.c

Bug#45288: pb2 returns a lot of compilation warnings

2010-10-20 11:40:04 -02:00

my_getncpus.c

Merge with MySQL 5.1.55

2011-02-20 18:51:43 +02:00

my_getopt.c

Merge with MySQL 5.1.52

2010-11-23 23:39:59 +02:00

my_getpagesize.c

…

my_getsystime.c

Merge with MySQL 5.1.55

2011-02-20 18:51:43 +02:00

my_getwd.c

missing DBUG_RETURNs

2010-08-14 18:44:45 +04:00

my_handler_errors.h

Merge MySQL->MariaDB

2009-09-08 00:50:10 +04:00

my_handler.c

Merge with MySQL 5.1.50

2010-08-27 17:12:44 +03:00

my_init.c

Merge MySQL 5.1.46 into MariaDB.

2010-04-28 14:52:24 +02:00

my_largepage.c

Bug #43606: 4GB Limit on huge_pages shared memory set-up

2009-09-18 11:19:02 +04:00

my_lib.c

- Added/updated copyright headers

2010-12-28 19:57:23 +01:00

my_libwrap.c

…

my_lock.c

Added versioning of Maria index

2008-06-26 08:18:28 +03:00

my_lockmem.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_malloc.c

Merge with MySQL 5.1.49

2010-08-02 12:01:24 +03:00

my_memmem.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_messnc.c

…

my_mkdir.c

…

my_mmap.c

…

my_net.c

…

my_netware.c

…

my_new.cc

Bug#43461: invalid comparison with string literal in default.c

2009-03-19 17:20:15 -03:00

my_once.c

Fix build error after last push with --with-debug=full due to SAFEMALLOC now being

2009-03-31 10:06:51 +02:00

my_open.c

Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1

2007-10-11 18:07:40 +03:00

my_port.c

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

my_pread.c

Merged with mysql-5.1 tree.

2009-04-25 13:05:32 +03:00

my_pthread.c

WL#3262 add mutex lock order checking to safemutex (also called safe_mutex_deadlock_detector)

2008-12-03 00:02:52 +02:00

my_quick.c

Bug#29125 Windows Server X64: so many compiler warnings

2009-02-13 11:41:47 -05:00

my_read.c

Merged with mysql-5.1 tree.

2009-04-25 13:05:32 +03:00

my_realloc.c

Fix build error after last push with --with-debug=full due to SAFEMALLOC now being

2009-03-31 10:06:51 +02:00

my_redel.c

Added option BACKUP_ALL to mysqld --myisam-recover to also get a backup of the index file before it's repaired.

2010-11-07 14:25:29 +02:00

my_rename.c

Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1

2007-10-11 18:07:40 +03:00

my_rnd.c

We are now using Valgrind rather than purify, and have for quite some time.

2009-05-06 14:03:24 +02:00

my_safehash.c

Fixed compiler warnings

2007-08-22 10:56:10 +03:00

my_safehash.h

Merged with mysql-5.1 main tree.

2007-07-02 20:45:15 +03:00

my_seek.c

Merge with MySQL 5.1.55

2011-02-20 18:51:43 +02:00

my_sleep.c

WL#3262 add mutex lock order checking to safemutex (also called safe_mutex_deadlock_detector)

2008-12-03 00:02:52 +02:00

my_static.c

Added --sync-sys=0 option for mysqld to skip sync() calls for faster testing

2010-08-09 20:05:42 +03:00

my_static.h

Bug#35616: memory overrun on 64-bit linux on setting large values for keybuffer-size

2008-08-19 15:56:41 +02:00

my_symlink2.c

Fix for: LP #634955: Assert in _ma_update_at_original_place()

2010-11-02 17:22:57 +02:00

my_symlink.c

Merge with MySQL 5.1.55

2011-02-20 18:51:43 +02:00

my_sync.c

Merge with MySQL 5.1.53

2010-11-25 00:57:34 +02:00

my_thr_init.c

Merge MySQL 5.1.44 into MariaDB.

2010-03-04 09:03:07 +01:00

my_uuid.c

MWL#74: Shared libmysqld.so library.

2010-11-17 13:24:20 +01:00

my_vle.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_wincond.c

Merge with MySQL 5.1, with following additions:

2009-11-16 21:49:51 +01:00

my_windac.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

my_winthread.c

Merge MySQL 5.1.44 into MariaDB.

2010-03-04 09:03:07 +01:00

my_write.c

merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except

2009-04-01 11:34:52 +02:00

mysys_priv.h

WL#3262 add mutex lock order checking to safemutex (also called safe_mutex_deadlock_detector)

2008-12-03 00:02:52 +02:00

ptr_cmp.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

queues.c

Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>

2008-02-18 23:29:39 +01:00

rijndael.c

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

safemalloc.c

fix "./configure --with-debug" builds

2011-01-26 14:16:13 +01:00

sha1.c

Bug #56427 : Replace copyright notice removed from SHA1 code

2010-10-05 17:03:04 +03:00

stacktrace.c

Workaround a GCC warning about a pointer being cast to a larger

2010-11-30 21:07:55 -02:00

string.c

Bug#29125 Windows Server X64: so many compiler warnings

2009-02-13 11:41:47 -05:00

test_charset.c

Fix doxygen warnings.

2007-08-15 17:43:08 +04:00

test_dir.c

…

test_fn.c

…

test_thr_mutex.c

Add missing file: Testing of mutex-wrong-usage-detector

2008-12-03 00:09:37 +02:00

test_xml.c

…

testhash.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

thr_alarm.c

Bug#54667: Unnecessary signal handler redefinition

2010-07-01 12:02:00 +04:00

thr_lock.c

Fixed bugs found by buildbot:

2011-01-26 15:17:46 +02:00

thr_mutex.c

Merge with MySQL 5.1.53

2010-11-25 00:57:34 +02:00

thr_rwlock.c

Merge with MySQL 5.1.55

2011-02-20 18:51:43 +02:00

tree.c

- Fixed that Aria works with HANDLER commands

2011-01-10 23:22:40 +02:00

trie.c

WL#3817: Simplify string / memory area types and make things more consistent (first part)

2007-05-10 12:59:39 +03:00

typelib.c

Merge the last bit of MySQL 5.1.41 into MariaDB.

2009-11-18 12:47:59 +01:00

waiting_threads.c

compilation fixes

2009-01-19 16:27:49 +01:00

wqueue.c

Debug code fixed.

2008-04-21 17:43:38 +03:00