database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-19 19:03:26 +03:00
Code Activity
31,064 Commits 3,280 Branches 1,098 Tags
3de74e62370eb8fed4810c283fa526befb04920f
Commit Graph

8323 Commits

Author SHA1 Message Date
konstantin@mysql.com
5d07195888 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-22 20:15:24 +03:00
jmiller@mysql.com
ef1b1e406f Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-02-22 15:50:26 +01:00
konstantin@mysql.com
a27e32b565 Merge mysql.com:/home/kostja/mysql/mysql-5.0-root 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-22 14:04:24 +03:00
anozdrin@mysql.com
a77cc69e62 Fix for BUG#7787: Stored procedures: improper warning for "grant execute" statement. 
The problem was that error flag was not reset.
 2006-02-22 13:44:04 +03:00
mskold@mysql.com
f56016ee66 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-02-22 09:10:55 +01:00
reggie@linux.site
cb10b77c31 BUG #15408 - Partitions: subpartition names are not unique 2006-02-21 17:40:07 -06:00
konstantin@mysql.com
f0abdf1ebe Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-runtime
 2006-02-22 01:20:47 +03:00
jmiller@mysql.com
eafd514e1a Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-02-21 18:24:44 +01:00
reggie@linux.site
336c0ba4cb Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  linux.site:/home/reggie/work/mysql-5.1-bug15408
 2006-02-21 10:29:41 -06:00
mskold@mysql.com
043a16e34a Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb_improved_on-line_discover 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-02-21 13:54:58 +01:00
andrey@lmy004.
85236db1f1 disable tests. failures happen from time to time and stop people from 
pushing. the code needs to be more stable.
 2006-02-21 13:07:25 +01:00
pekka@mysql.com
73d75104af ndb - enable ndb_dd_backuprestore 2006-02-21 09:27:20 +01:00
pekka@mysql.com
11a7a3ea63 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-02-21 05:08:18 +01:00
pekka@mysql.com
54074472e5 ndb - fix event created by ndb_restore bug#17045 (not really) 2006-02-21 02:27:23 +01:00
andrey@lmy004.
a1fdeb1386 manual merge 2006-02-21 00:01:39 +01:00
andrey@lmy004.
22ba4ca3a3 fix for bug#16407 (Events: Changes in sql_mode won't be taken into account) 
WL#1032
sql_mode setting was disregarded during create/alter event and wasn't set during
event execution.
(post-review small fixes)
 2006-02-20 23:52:22 +01:00
andrey@lmy004.
7ef557ed49 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16406
 2006-02-20 23:29:55 +01:00
konstantin@mysql.com
07db5ac8b1 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/kostja/mysql/mysql-5.1-vanilla
 2006-02-20 23:00:50 +03:00
andrey@lmy004.
e5e7066e26 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16406
 2006-02-20 20:57:44 +01:00
konstantin@mysql.com
b58345d8c4 A new error message for deprecated statements. 
Fixes failing sp.test
 2006-02-20 22:51:32 +03:00
pekka@mysql.com
93db514db6 ndb - enable rpl_ndb_blob2 bug#17505 2006-02-20 17:20:54 +01:00
pekka@mysql.com
6287081587 disabled.def: merge 2006-02-20 12:37:28 +01:00
knielsen@mysql.com
ddc2da9c09 post-merge fixes. 2006-02-20 10:30:32 +01:00
knielsen@mysql.com
4e378f7f72 Merge mysql.com:/usr/local/mysql/mysql-5.0-fixtest 
into  mysql.com:/usr/local/mysql/mysql-5.0
 2006-02-20 09:37:26 +01:00
knielsen@mysql.com
c15158e108 Remove hard-coded ../var/.. path in test mix_innodb_myisam_binlog, 
fails with --vardir option.
 2006-02-20 09:34:02 +01:00
igor@rurik.mysql.com
1e437a1fda Merge rurik.mysql.com:/home/igor/mysql-5.1 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-02-19 19:26:25 -08:00
igor@rurik.mysql.com
a3093f7e1e Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-02-19 17:26:06 -08:00
kent@mysql.com
544e07ba78 Merge 2006-02-19 23:57:49 +01:00
kent@mysql.com
4c81413932 Merge 2006-02-19 23:47:00 +01:00
brian@zim.tangent.org
70b70e43d9 We had a number of tests where there were no bugs related to disabling of tests, bugs were fixed, or no clear discription or plan. 2006-02-19 10:52:12 -08:00
guilhem@mysql.com
af149459ed Fix after merge of 5.0, fix of a result file which somebody hadn't updated. 
"mysqldump" test fails (mysqlimport related, Brian aware), ndb_cache2 ndb_cache_multi2
partition_mgm_err fail (unrelated to my changes), rpl_row_view01 (known crash BUG#17265)
 2006-02-18 23:37:56 +01:00
guilhem@mysql.com
32a5692733 In previous push, a DROP TABLE at the end of test was missing. 2006-02-18 21:08:41 +01:00
guilhem@mysql.com
473cfdfcb2 Merge mysql.com:/home/mysql_src/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.1-new; will fix manually sp_head.cc and mysqld.cc later soon.
 2006-02-18 19:07:32 +01:00
guilhem@mysql.com
37c1744a03 Fix for BUG#13897 "failure to do SET SQL_MODE=N where N is a number > 31" (the original bug's title isn't the simplest 
symptom). sys_var::check_set() was wrong. mysqlbinlog makes use of such SET SQL_MODE=N
(where N is interpreted like if SQL_MODE was a field of type SET), so
this bug affected recovery from binlogs if the server was running with certain SQL_MODE values,
for example the default values on Windows (STRICT_TRANS_TABLES); to work around this bug people
had to edit mysqlbinlog's output.
 2006-02-18 17:32:15 +01:00
guilhem@mysql.com
56bed24c92 Fix for BUG#14769 "Function fails to replicate if fails half-way (slave stops)": 
if the function, invoked in a non-binlogged caller (e.g. SELECT, DO), failed half-way on the master,
slave would stop and complain that error code between him and master mismatch. 
To solve this, when a stored function is invoked in a non-binlogged caller (e.g. SELECT, DO), we binlog the function
call as SELECT instead of as DO (see revision comment of sp_head.cc for more).
And: minor wording change in the help text.
This cset will cause conflicts in 5.1, I'll merge.
 2006-02-18 17:26:30 +01:00
guilhem@mysql.com
4c5d18b150 Fix for BUG#16559 "Replication Problems with Non transactional tables inside an interrupted trans.": 
problem was: when a connection disconnects having an open transaction affecting MyISAM and InnoDB, the ROLLBACK event stored in the binary log
contained a non-zero error code (1053 because of the disconnection), so when slave applied the transaction, slave complained that its ROLLBACK succeeded
(error_code=0) while master's had 1053, so slave stopped. But internally generated binlog events such as this ROLLBACK
should always have 0 as error code, as is true in 4.1 and was accidentally broken in 5.0,
so that there is no false alarm.
 2006-02-18 17:19:16 +01:00
petr@mysql.com
d6a36615d6 Merge mysql.com:/home/cps/mysql/devel/im/5.0-im-add-error-message 
into  mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-debug
 2006-02-18 18:00:22 +03:00
petr@mysql.com
db7b6ef56f Merge mysql.com:/home/cps/mysql/trees/5.0/mysql-5.0-virgin-debug 
into  mysql.com:/home/cps/mysql/devel/im/5.0-im-add-error-message
 2006-02-18 02:50:50 +03:00
kent@mysql.com
c56a4b1eb6 mysql-test-run.sh: 
Set the ndbcluster slave port (bug#16780)
disabled.def:
  Disabled 'mysqldump' until bug 17443 is closed
 2006-02-17 21:55:27 +01:00
jimw@mysql.com
4d483fa2d1 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-02-17 12:42:08 -08:00
elliot@mysql.com
649d64d7f9 BUG#17385 Re-enabling test case as it passes now. Wrong results were 
corrected by Ingo when pushing WL#1563
 2006-02-17 15:01:27 -05:00
jmiller@mysql.com
14b60467b9 Updated 2006-02-17 20:34:47 +01:00
jmiller@mysql.com
8545383824 Test updates to use with a default engine of ndb 2006-02-17 20:29:46 +01:00
jimw@mysql.com
bf0b775859 Merge mysql.com:/home/jimw/my/mysql-5.0-7955 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-02-17 11:03:34 -08:00
jimw@mysql.com
30c343a04e Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-02-17 10:59:47 -08:00
jimw@mysql.com
10b96ec4c8 Merge mysql.com:/home/jimw/my/mysql-5.1-17169 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-02-17 10:55:43 -08:00
msvensson@neptunus.(none)
ace6f14267 Bug#17382 mysql-test-run mysqldump fails with mysqlimport: Error:client run out of memory 
- Disable --use-threads option in 5.1.7
 2006-02-17 18:19:29 +01:00
jimw@mysql.com
38aafce1ef Merge mysql.com:/home/jimw/my/mysql-5.0-14676 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-02-17 08:32:50 -08:00
tomas@poseidon.ndb.mysql.com
9495f8c56a Bug #17210 Create temp table call to ha_ndbcluster::create_handler_files caused core 
- do not try to create ndb temp tables even if default storage is ndb
 2006-02-17 17:12:35 +01:00
bar@mysql.com
5f7cca2e46 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.16234
 2006-02-17 13:38:01 +04:00