mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
54223 commits 2784 branches 343 tags 1.6 GiB
Commit graph

54223 commits

This branch
This branch
All branches
Author SHA1 Message Date
kostja@bodhi.(none)
7334f7c20d Fix compilation warnings (embedded library, Windows build) 2008-04-19 20:51:23 +04:00
kostja@bodhi.(none)
06443747f6 Merge bodhi.(none):/opt/local/work/mysql-5.1-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-27430
 2008-04-19 17:52:30 +04:00
kostja@bodhi.(none)
63d116c1ae An attempt to fix a link failure on Windows (embedded library). 2008-04-19 17:48:29 +04:00
kostja@bodhi.(none)
ae1e1ca280 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-27430
 2008-04-19 15:46:34 +04:00
kostja@bodhi.(none)
cae01871e7 Fix a Windows + embedded library build 2008-04-19 15:44:08 +04:00
kostja@bodhi.(none)
62c6ffd81f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-27430
 2008-04-19 14:58:37 +04:00
kostja@bodhi.(none)
30296dcae4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-27430 
into  bodhi.(none):/opt/local/work/mysql-5.1-27430
 2008-04-19 14:40:30 +04:00
kostja@bodhi.(none)
db70574976 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.(none):/opt/local/work/mysql-5.1-27430
 2008-04-19 14:37:20 +04:00
kostja@bodhi.(none)
78e4f40173 Attempt to fix a sporadic failure of innodb_mysql.test 2008-04-19 14:27:17 +04:00
mleich@five.local.lan
95ca54954b Add tests + modifications according to review 2008-04-18 21:18:53 +02:00
joerg@trift2.
61469fa997 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2008-04-18 20:01:35 +02:00
joerg@trift2.
33fbfd6f76 Merge trift2.:/MySQL/M50/bug34291-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2008-04-18 19:54:08 +02:00
joerg@trift2.
8a36dd32bc Merge trift2.:/MySQL/M51/bug34291-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-04-18 19:49:51 +02:00
hhunger@hh-nb.hungers
e1db626108 Fix of makefile. 2008-04-18 19:22:35 +02:00
joerg@trift2.
41658010d5 BUILD/Makefile.am 
Post-merge fix:  Add those files which are new in version 5.1

This is the 5.1 version of the fix for
   Bug #34291  compile-amd64-debug-max-no-ndb missing
 2008-04-18 16:58:47 +02:00
joerg@trift2.
92a9ba0b7e Merge trift2.:/MySQL/M50/bug34291-5.0 
into  trift2.:/MySQL/M51/bug34291-5.1
 2008-04-18 16:35:11 +02:00
joerg@trift2.
055697c973 Merge trift2.:/MySQL/M51/push-5.1 
into  trift2.:/MySQL/M51/tmp-5.1
 2008-04-18 15:49:51 +02:00
hhunger@hh-nb.hungers
dcf0b2edb7 Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean 
into  hh-nb.hungers:/work/merge/mysql-5.1-build
 2008-04-18 12:01:06 +02:00
hhunger@hh-nb.hungers
68aa177686 Fix for win platforms (bug#35988). 2008-04-18 11:38:41 +02:00
kostja@bodhi.(none)
ce04207ad9 Fix broken --cursor-protocol (all tests). 2008-04-17 23:02:01 +04:00
joerg@trift2.
c29de2c3a5 Fix for Bug #34291 compile-amd64-debug-max-no-ndb missing 
Include several "BUILD/compile-*" files in a source tarball ("make dist" target)
which might be useful to community users who want to build from source.

When merging this up, the "BUILD/compile-*" file list needs to be checked.
 2008-04-17 18:41:23 +02:00
hhunger@hh-nb.hungers
bd112f7103 Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean 
into  hh-nb.hungers:/work/merge/mysql-5.1-build
 2008-04-17 16:12:39 +02:00
hhunger@hh-nb.hungers
29a18ff8b6 fix of typo for bug#35988. 2008-04-17 15:51:17 +02:00
mleich@five.local.lan
9e371dd2e5 Minor corrections within the script 2008-04-17 14:31:43 +02:00
kostja@bodhi.(none)
d42545fbc6 Fix create.test in --ps-protocol broken by the previous push. 2008-04-17 03:27:14 +04:00
kostja@bodhi.(none)
7289eccfbd WL#4165 "Prepared statements: validation". 
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
 2008-04-17 01:04:49 +04:00
kent@kent-amd64.(none)
dcd05a49eb Merge mysql.com:/home/kent/bk/mysql-5.1-release 
into  mysql.com:/home/kent/bk/build/mysql-5.1-build
 2008-04-16 22:01:50 +02:00
hhunger@hh-nb.hungers
a14e5f3707 Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean 
into  hh-nb.hungers:/work/merge/mysql-5.1-build
 2008-04-16 16:49:49 +02:00
hhunger@hh-nb.hungers
9c925be163 fifth set of fixes to bug#35988. 2008-04-16 16:32:33 +02:00
hhunger@hh-nb.hungers
b7436cb905 Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean 
into  hh-nb.hungers:/work/merge/mysql-5.1-build
 2008-04-16 10:50:09 +02:00
hhunger@hh-nb.hungers
eee7bdc51a fourth set of fixes for bug#35988. 2008-04-16 10:23:07 +02:00
hhunger@hh-nb.hungers
f6aa788f26 Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean 
into  hh-nb.hungers:/work/merge/mysql-5.1-build
 2008-04-15 15:56:11 +02:00
hhunger@hh-nb.hungers
679b907964 Third set of fixes for bug#35988. 2008-04-15 15:44:11 +02:00
cmiller@zippy.cornsilk.net
13fa535b80 Bug#35157: mysqldump should use FLUSH TABLES NO_WRITE_TO_BINLOG \ 
when --master-data is used

When using the --master-data option with mysqldump, mysqldump uses 
a FLUSH TABLES command.  However, this statement got replicated to 
the slave(s), which caused the slave(s) to block unnecessarily while
the FLUSH tables command completed.

Now, if the master-data option is set to one of the two "on" modes,
then use the "LOCAL" qualifier to ensure that it's not replicated.
 2008-04-14 17:43:08 -04:00
hhunger@hh-nb.hungers
63b0997fd7 Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean 
into  hh-nb.hungers:/work/merge/mysql-5.1-build
 2008-04-14 17:31:15 +02:00
hhunger@hh-nb.hungers
913b7b8030 Second set of fixes for bug#35988. 2008-04-14 17:21:18 +02:00
thek@kpdesk.mysql.com
2e4da966a8 Merge kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.0-merge 
into  kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.1-merge
 2008-04-14 13:28:45 +02:00
thek@kpdesk.mysql.com
d92bc9eee4 Merge kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.0 
into  kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.0-merge
 2008-04-14 13:27:26 +02:00
thek@kpdesk.mysql.com
f932e51b45 Merge kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.1 
into  kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.1-merge
 2008-04-14 12:58:53 +02:00
hhunger@hh-nb.hungers
ea349ae170 Merge hh-nb.hungers:/work/merge/mysql-5.1-build 
into  hh-nb.hungers:/work/merge/mysql-5.1-wl4288
 2008-04-11 22:16:41 +02:00
hhunger@hh-nb.hungers
3e3b797d0a Fixes of system variable test programs for bug#35988. 2008-04-11 21:59:33 +02:00
cmiller@zippy.cornsilk.net
ac2d693514 Fix merge problem. 2008-04-10 23:27:24 -04:00
cmiller@zippy.cornsilk.net
2f7bdf8427 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-04-10 17:58:58 -04:00
cmiller@zippy.cornsilk.net
c27dd4372c Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-04-10 17:48:33 -04:00
cmiller@zippy.cornsilk.net
82d8a99c05 Fix mismerge. 2008-04-10 15:55:37 -04:00
hhunger@hh-nb.hungers
88451eacfd Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean 
into  hh-nb.hungers:/work/merge/mysql-5.1-build
 2008-04-10 18:32:37 +02:00
hhunger@hh-nb.hungers
afd90d6166 System variable tests delivered by Folio3 (see WL4288). 2008-04-10 15:14:28 +02:00
cmiller@zippy.cornsilk.net
7a4136604a Error message changed across versions. 2008-04-09 21:19:41 -04:00
cmiller@zippy.cornsilk.net
53980960ea Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-04-09 21:03:14 -04:00
cmiller@zippy.cornsilk.net
ff37cb0b51 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my51-bug15776-encore 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-04-09 20:38:32 -04:00