mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 07:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
60005 commits 2776 branches 343 tags 1.6 GiB
Commit graph

60005 commits

This branch
This branch
All branches
Author SHA1 Message Date
0c4e5f784b Backport Bug #43913 rpl_cross_version can't pass on conflicts complainig clash with --slave-load-tm 
The 'rpl_cross_version' fails on mysql-next-mr-bugfixing as following:
mysqltest: In included file "./include/setup_fake_relay_log.inc": At line 80: query
'select './$_fake_filename-fake.000001\n' into dumpfile '$_fake_relay_index'' failed:
1290: The MySQL server is running with the --secure-file-priv option so it cannot execute
this statement.

To fix the problem by removeing the --secure-file-priv option
for adapting the update of the 'setup_fake_relay_log.inc'.
 2009-12-25 14:12:49 +08:00
Alexander Nozdrin
fa64b359ab Auto-merge (empty) from mysql-trunk-bugfixing. 2009-12-24 10:31:09 +03:00
Alexander Nozdrin
27e7547bc6 Auto-merge from mysql-next-mr. 2009-12-24 10:30:13 +03:00
Alexander Nozdrin
2af3baceaf Auto-merge from mysql-trunk. 2009-12-24 10:30:04 +03:00
Alexander Nozdrin
9f335d9e91 Manual merge from mysql-trunk. 
Conflicts:
  - storage/myisam/mi_static.c
 2009-12-24 10:12:07 +03:00
Alexander Nozdrin
9721437edf Postfix for Bug#37408 (fix for Bug#49898). 2009-12-24 10:10:05 +03:00
ff16e34df7 Enable rpl_get_master_version_and clock and rpl_cross_version 
as the bug#46931 and bug#43913 have been closed.
 2009-12-24 11:01:39 +08:00
Alexander Nozdrin
88642ae7e6 Merge default.conf from mysql-trunk. 2009-12-23 15:10:25 +03:00
Alexander Nozdrin
97412d1d41 Fix default.conf. 2009-12-23 15:09:31 +03:00
Alexander Nozdrin
919f7968e5 Auto-merge (empty) from mysql-trunk-bugfixing. 2009-12-23 15:06:10 +03:00
Alexander Nozdrin
84caa9480f Backporting fix for Bug#49834 from mysql-next-mr-bugfixing 
into mysql-trunk-bugfixing.

Original revision:
------------------------------------------------------------
revision-id: vvaintroub@mysql.com-20091222115311-bam0xorumd8gvjyo
parent: mattias.jonsson@sun.com-20091221104426-x2e6c93x8iik4fo0
committer: Vladislav Vaintroub <vvaintroub@mysql.com>
branch nick: mysql-next-mr-bugfixing
timestamp: Tue 2009-12-22 12:53:11 +0100
message:
  Bug#49834 - fixed a bug introduced by mismerge.
  restore original innobase version
------------------------------------------------------------
 2009-12-23 15:03:51 +03:00
Alexander Nozdrin
0f8ea111b9 Auto-merge from mysql-trunk-bugfixing. 2009-12-23 13:43:52 +03:00
Alexander Nozdrin
1b7ced0008 Auto-merge from mysql-next-mr. 2009-12-23 13:42:03 +03:00
Alexander Nozdrin
29f54b416f Auto-merge from mysql-trunk. 2009-12-23 13:41:55 +03:00
Vladislav Vaintroub
fd14e3dd1e merge 2009-12-22 22:05:04 +01:00
Vladislav Vaintroub
2c4015fba5 Fix build error with CMake 2.8 (mysql_stmt_next_result not exported 
by shared embedded library)
 2009-12-22 21:49:37 +01:00
Alexey Botchkov
eab2fc917a merging. 2009-12-22 16:39:06 +04:00
Alexey Botchkov
54133bab9b Bug#46570 test udf fails with valgrind 
the value obtained by String::c_ptr() method not always
    has the ending zero. Particularly in this bug the
    dlsym() expects zero-ending string.
    The String::c_ptr_safe() is more correct here.

per-file comments:
  sql/item_func.cc
Bug#46570      test udf fails with valgrind
    c_ptr_safe() used for UDF parameters as the library expects
    zero-ending strings.
 2009-12-22 16:37:21 +04:00
Vladislav Vaintroub
83f61bb7ea merge 2009-12-22 13:06:31 +01:00
Vladislav Vaintroub
13d5d2f747 Bug#49834 - fixed a bug introduced by mismerge. 
restore original innobase version
 2009-12-22 12:53:11 +01:00
Alexander Nozdrin
f058e97ffe Auto-merge from mysql-next-mr. 2009-12-22 13:23:47 +03:00
Alexander Nozdrin
09f8e195f6 Auto-merge (empty) from mysql-trunk-build. 2009-12-22 09:36:04 +03:00
Alexander Nozdrin
6f8073497c Manual merge from mysql-next-mr. 
Conflicts:
  - storage/ibmdb2i/ha_ibmdb2i.cc
 2009-12-22 09:32:58 +03:00
Alexander Nozdrin
f23b17696c Manual merge from mysql-trunk. 
Conflicts:
  - storage/ibmdb2i/ha_ibmdb2i.cc
 2009-12-22 09:31:24 +03:00
Alexander Nozdrin
ba28878bac Auto-merge from mysql-next-mr. 2009-12-22 08:29:03 +03:00
Alexander Nozdrin
1741282d22 Null-merge default.conf from mysql-trunk-bugfixing. 2009-12-21 18:41:48 +03:00
Alexander Nozdrin
92b4a908fb Null-merge default.conf from mysql-next-mr. 2009-12-21 18:40:39 +03:00
Alexander Nozdrin
b7ac3c2692 Null-merge default.conf from mysql-trunk. 2009-12-21 18:40:26 +03:00
Alexander Nozdrin
9af3a8bf83 Merge default.conf from mysql-trunk. 2009-12-21 18:36:59 +03:00
Alexander Nozdrin
9ce5872e03 Fix default.conf. 2009-12-21 18:35:38 +03:00
Mikael Ronstrom
1d60eece25 Force use of c-register in CAS instruction on x86-32 bit architecture, b-register used for push and pop, so don't want to give compile the chance to choose the wrong register 2009-12-21 14:08:11 +01:00
Mattias Jonsson
a96c22fe8e merge 2009-12-21 11:44:26 +01:00
Mattias Jonsson
4309b20402 Bug#48737: Partitions: search fails with ucs2 
Recommit of patch:
http://lists.mysql.com/commits/91400

Test case only (code part was pushes as bug-49028)
 2009-12-21 11:38:31 +01:00
Alexander Nozdrin
a67056d183 Auto-merge from mysql-trunk-bugfixing. 2009-12-21 13:23:41 +03:00
Alexander Nozdrin
858cf5555c Disable plugin_load.test due to Bug#42144. 2009-12-21 13:20:43 +03:00
Vladislav Vaintroub
e3976aa9ae Fix inconsistently defined THR_LOCK_myisam_mmap 
It was pthread_mutex_t in mi_static.c and 
mysql_mutex_t in my_thr_init.c

Solaris linker complains about different size of the 
symbol.

Fix : use mysql_mutex_t everywhere.
 2009-12-20 21:20:11 +00:00
Alexander Nozdrin
04ee14ccb3 Auto-merge from mysql-next-mr. 2009-12-20 12:48:09 +03:00
Alexander Nozdrin
ffb03b281d Auto-merge (empty) from mysql-trunk-bugfixing. 2009-12-20 12:43:07 +03:00
Mikael Ronstrom
5bce1e0642 Yet one more fix for Solaris atomics in builds 2009-12-19 18:24:52 +01:00
Mikael Ronstrom
1a6d85eab6 Fixed Solaris build issues 2009-12-19 17:44:45 +01:00
Mikael Ronstrom
18a30d0933 Post-merge fix: wait for statement result before disconnecting. Otherwise the statement might affect unrelated tests. mysql-test/t/lock_multi.test, Reap statement status 2009-12-19 13:26:00 +01:00
Mikael Ronstrom
e451711b61 Merged in latest mysql-next-mr 2009-12-19 12:50:48 +01:00
Mikael Ronstrom
56d81f3bc1 Fixed solaris builds 2009-12-19 12:48:39 +01:00
Alexander Nozdrin
3f6a503b9a Auto-merge (empty) from mysql-trunk-bugfixing. 2009-12-19 11:38:14 +03:00
Alexander Nozdrin
594d05a688 Auto-merge from mysql-next-mr. 2009-12-19 11:35:19 +03:00
Alexander Nozdrin
f408138c71 Auto-merge from mysql-trunk. 2009-12-19 11:33:33 +03:00
Alexander Nozdrin
faed50d555 Auto-merge from mysql-next-mr. 2009-12-19 11:27:22 +03:00
Alexander Nozdrin
45222a117d Manual merge from mysql-trunk-merge (configure.in). 2009-12-19 11:22:13 +03:00
Alexander Nozdrin
d05c63f721 Auto-merge from mysql-trunk. 2009-12-19 11:20:21 +03:00
Mikael Ronstrom
2e72189535 Increase probability of correct atomics implementation by choosing stable implementations first 2009-12-19 08:54:05 +01:00