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

41638 commits

This branch
This branch
All branches
Author SHA1 Message Date
lars/lthalmann@dl145h.mysql.com
77c4b08fd1 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-01-13 15:08:42 +01:00
lars/lthalmann@dl145j.mysql.com
1e356251a0 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-01-12 12:31:44 +01:00
mmj@tiger.mmj.dk
ebb4885357 Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.1-build
 2007-01-11 23:05:13 +01:00
aelkin/elkin@dsl-hkibras-fe36f900-97.dhcp.inet.fi
5ee04ffa08 Bug #24998 rpl_row_delayed_ins.test fails in pushbuild 
The test uses show binlog event which is not deterministic due to the single insert delayed
query can generate up to number of inserted rows row-events pair (table_map + Write_row)

The solution is to leave the current binlogging behaviour as it is and change 
the test as spliting arguments of insert delayed query. Note, that such fix was applied
earlier for  binlog_insert_delayed.test :
https://intranet.mysql.com/secure/apps/irclog.php?channel=22&start_time=2006-09-27 

There are no tests with insert delayed and show binlog events combination requiring
this fix.
 2007-01-11 23:59:12 +02:00
tsmith@siva.hindu.god
bc0e0ba7cc Merge siva.hindu.god:/home/tsmith/m/bk/mysql-5.0-build 
into  siva.hindu.god:/home/tsmith/m/bk/mysql-5.1-build
 2007-01-11 13:50:48 -07:00
joerg@trift2.
d90427abaa Merge trift2.:/MySQL/M50/tmp-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-01-11 20:43:43 +01:00
joerg@trift2.
759b66479c Merge trift2.:/MySQL/M50/tmp1-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-01-11 20:20:43 +01:00
joerg@trift2.
05d161e04c Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-01-11 19:40:05 +01:00
cbell/Chuck@suse.vabb.com
baf4272152 Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  suse.vabb.com:/home/Chuck/development/mysql-5.1-new-rpl
 2007-01-11 11:12:31 -05:00
mmj@tiger.mmj.dk
49913f2a95 Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0-sage 
into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0
 2007-01-11 09:19:32 +01:00
cbell/Chuck@suse.vabb.com
20036a42b8 BUG#22645 - LC_TIME_NAMES: Statement not replicated 
This patch is an additional code change to the get_str_len_and_pointer 
method in log_events.cc. This change is necessary to correct a problem
encountered on 64-bit SUSE where the auto_increment_* variables were
being overwritten. The change corrects a cast mismatch which caused
the problem.
 2007-01-10 12:20:13 -05:00
kent@mysql.com/kent-amd64.(none)
ba7b6e86f2 configure.in: 
Corrected default for --disable-grant-options
 2007-01-10 18:19:51 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
27d56afcfc Merge bk@192.168.21.1:mysql-5.0 
into  mysql.com:/d2/hf/mr10/my50-mr10
 2007-01-10 20:37:22 +04:00
kent@mysql.com/kent-amd64.(none)
1768b21a14 configure.in: 
Removed line accidently inserted when correcting bug#18526
 2007-01-10 14:50:09 +01:00
holyfoot/hf@hfmain.(none)
93a7321d45 Merge mysql.com:/d2/hf/common/my51-common 
into  mysql.com:/d2/hf/mr10/my51-mr10
 2007-01-10 14:34:28 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
bcd4d84de9 Merge mysql.com:/d2/hf/common/my50-common 
into  mysql.com:/d2/hf/mr10/my50-mr10
 2007-01-10 14:33:34 +04:00
tsmith@siva.hindu.god
bac65ee90a WL #3670: Compile-time option to remove GRANT-related startup options 
- configure --disable-grant-options defines DISABLE_GRANT_OPTIONS
- configure.js/cmake also updated
- if DISABLE_GRANT_OPTIONS is defined, mysqld no longer recognizes:
  --bootstrap
  --init-file
  --skip-grant-tables

Scripts which rely on those three options are modified to check the environment for MYSQLD_BOOTSTRAP; it should be set to the full path of a mysqld which does handle those options.

For example:

$ export MYSQLD_BOOTSTRAP
$ MYSQLD_BOOTSTRAP=/path/to/full/MySQL/bin/mysqld
$ mysql_install_db
$ make test
 2007-01-09 19:22:01 -07:00
joerg@trift2.
b63c167f66 support-files/MySQL-shared-compat.spec.sh : Dummy, irrelevant change - just trigger a new build. 2007-01-10 00:36:41 +01:00
joerg@trift2.
46a8d14e21 Version 4.0 is in "extended maintenance" by now, and so 
no future build of it will include Berkeley DB:
Remove it from the Windows VC++ project files.
 2007-01-09 17:21:54 +01:00
thek@kpdesk.mysql.com
2af1ec2911 Merge kpdesk.mysql.com:/home/thek/dev/bug23010/my50-bug23010 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-build
 2007-01-09 14:35:16 +01:00
thek@kpdesk.mysql.com
ede1dba2f4 Merge kpdesk.mysql.com:/home/thek/dev/bug23010/my51-bug23010 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-build
 2007-01-09 14:34:04 +01:00
thek@kpdesk.mysql.com
5a10216511 Merge kpdesk.mysql.com:/home/thek/dev/bug23010/my50-bug23010 
into  kpdesk.mysql.com:/home/thek/dev/bug23010/my51-bug23010
 2007-01-09 12:37:11 +01:00
thek@kpdesk.mysql.com
16590668f1 Merge kpdesk.mysql.com:/home/thek/dev/bug23010/my41-bug23010 
into  kpdesk.mysql.com:/home/thek/dev/bug23010/my50-bug23010
 2007-01-09 12:33:02 +01:00
thek@kpdesk.mysql.com
98a9706edb Merge kpdesk.mysql.com:/home/thek/dev/test23010/my40-bug23010 
into  kpdesk.mysql.com:/home/thek/dev/bug23010/my41-fix23010
 2007-01-09 12:30:57 +01:00
thek@kpdesk.mysql.com
0906993457 Cset exclude: thek@kpdesk.mysql.com|ChangeSet|20061106104152|07628 2007-01-09 12:28:46 +01:00
joerg@trift2.
cca28699c8 configure.in : Fix a wrong comment. 2007-01-09 12:21:06 +01:00
guilhem@gbichot3.local
6712c0963d Manual merge of the fix for BUG#19725 "Calls to SF in other database are not replicated 
correctly in some cases", from 5.0.
In short, calls to a stored function located in another database
than the default database, may fail to replicate if the call was made
by SET, SELECT, or DO.
sp_head.cc automerged, only the test and test's result had to be hand-merged.
 2007-01-08 23:52:21 +01:00
guilhem@gbichot3.local
c144de06e4 Merge gbichot3.local:/home/mysql_src/mysql-5.0-rpl-19725 
into  gbichot3.local:/home/mysql_src/mysql-5.1-rpl-19725
 2007-01-08 22:06:19 +01:00
guilhem@gbichot3.local
3e760410a0 Fix for BUG#19725 "Calls to SF in other database are not replicated 
correctly in some cases".
In short, calls to a stored function located in another database
than the default database, may fail to replicate if the call was made
by SET, SELECT, or DO.
Longer: when a stored function is called from a statement which does not go
to binlog ("SET @a=somedb.myfunc()", "SELECT somedb.myfunc()",
"DO somedb.myfunc()"), this crafted statement is binlogged:
"SELECT myfunc();" (accompanied with a mention of the default database
if there is one). So, if "somedb" is not the default database,
the slave would fail to find myfunc(). The fix is to specify the
function's database name in the crafted binlogged statement, like this:
"SELECT somedb.myfunc();". Test added in rpl_sp.test.
 2007-01-08 22:01:06 +01:00
joerg@trift2.
68d6f7ae52 Changes necessary to build version 4.0.28: 
- "make_binary_distribution" accepts a dummy "--platform=" argument.

- "MySQL-shared-compat.spec" uses a "version40" define symbol internally.
 2007-01-08 18:33:55 +01:00
mmj@thorsen-consulting.dk
4e0e863a4e Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  thorsen-consulting.dk:/Users/mmj/bktrees/mysql-5.1-build
 2007-01-08 12:46:57 +01:00
brian@zim.(none)
05d05c776f Fix for when shell version of mysql-test-run is called. 2007-01-05 22:28:53 -08:00
brian@zim.(none)
77004aabf2 Cleaning up warning for windows. Innodb is compiled but disable on Windows, so it should be fine. NDB wasn't compiled in, which is what caused the issue. 2007-01-05 20:20:53 -08:00
tsmith@siva.hindu.god
eb8cf09388 Merge siva.hindu.god:/home/tsmith/m/inno/jan04/51 
into  siva.hindu.god:/home/tsmith/m/bk/51-build
 2007-01-05 16:05:48 -07:00
kent@kent-amd64.(none)
1a0e36ea6d Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-01-05 17:30:40 +01:00
kent@mysql.com/kent-amd64.(none)
fa5a359f07 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-01-05 16:57:23 +01:00
kent@mysql.com/kent-amd64.(none)
528b457644 mysql.spec.sh, make_binary_distribution.sh: 
Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
  correct "libgcc.a" path is returned for the 32/64 bit architecture
 2007-01-05 16:53:03 +01:00
tsmith@siva.hindu.god
7a2d8c14dd Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots. 
Fixes:
- Bug #24712: SHOW TABLE STATUS for file-per-table showing incorrect time fields
- Bug #24386: Performance degradation caused by instrumentation in mutex_struct
- Bug #24190: many exportable definitions of field_in_record_is_null
- Bug #21468: InnoDB crash during recovery with corrupted data pages: XA bug?
 2007-01-04 19:51:34 -07:00
mmj@tiger.mmj.dk
7e9361a34c Merge tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0-build 
into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.1-build
 2007-01-04 23:21:44 +01:00
mmj@tiger.mmj.dk
8941159ed8 Merge tiger.mmj.dk:/Users/mmj/bktrees/mysql-4.1-build 
into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0-build
 2007-01-04 23:20:04 +01:00
mmj@tiger.mmj.dk
f61a873c60 my_global.h: 
Patch from Alfredo for TARGET_FAT_BINARY
 2007-01-04 23:18:04 +01:00
mmj@tiger.mmj.dk
f0d503a8f2 Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0-build
 2007-01-04 22:33:34 +01:00
mmj@tiger.mmj.dk
e36b282f1f Merge tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0-build 
into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.1-build
 2007-01-04 22:24:07 +01:00
mmj@tiger.mmj.dk
37ae5bbbbe my_global.h: 
Add patch from Alfredo for TARGET_FAT_BINARY
 2007-01-04 22:22:25 +01:00
brian@zim.(none)
c578350e05 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/merge-5.1
 2007-01-04 12:06:40 -08:00
brian@zim.(none)
452a1331b2 The CSV format has always relied on numbers being quoted, which doesn't always happen. This fixes that so that numbers can now be unquoted (and the output does this as well so that the log takes up less space). 2007-01-04 11:41:17 -08:00
baker@bk-internal.mysql.com
9ffaf185f0 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-01-04 19:54:52 +01:00
brian@zim.(none)
6ff7092698 Split out the hidden class from the ha_tina file (probably should have just deleted it...) but this is a bit better. 2007-01-03 17:26:45 -08:00
andrey@example.com
e2876ecce4 fix for bug #18981 event_logs_tests failure 
On loaded boxes it is possible a INSERT with sleep of 1.5s to take
more time.
 2007-01-03 14:09:31 +01:00
holyfoot/hf@hfmain.(none)
14696a56e2 Merge mysql.com:/d2/hf/common/my50-common 
into  mysql.com:/d2/hf/common/my51-common
 2007-01-03 03:36:39 +04:00