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

8549 commits

Author SHA1 Message Date
andrey@lmy004.
0ba2425caf fix for bug#16407 (EVENTS: sql_mode) 
post-review fixes
 2006-02-21 02:40: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
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
tomas@poseidon.ndb.mysql.com
bb0b5cdbb1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-20 12:37:26 +01:00
tomas@poseidon.ndb.mysql.com
82be07c41b Bug #17559 ndb_gis test failure 
- test tables use blobs without PK, and was not handled correctly
 2006-02-20 12:36:10 +01:00
andrey@lmy004.
51f87cc655 fix the output. now only 1 space in PK definition 2006-02-20 11:20:31 +01:00
knielsen@mysql.com
ddc2da9c09 post-merge fixes. 2006-02-20 10:30:32 +01:00
knielsen@mysql.com
4fc82049c8 Merge mysql.com:/usr/local/mysql/mysql-5.0-fixtest 
into  mysql.com:/usr/local/mysql/mysql-5.1-new
 2006-02-20 09:52:22 +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
kent@mysql.com
4c81413932 Merge 2006-02-19 23:47:00 +01:00
brian@zim.tangent.org
86763e6198 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.tangent.org:/home/brian/mysql/dep-5.1
 2006-02-19 09:48:17 -08:00
brian@zim.tangent.org
faa1b42989 Fixed some threading issues that Guilhem found (and its what I get for copy and pasting from elsewhere without thinking about it). Added depracted messages to BACKUP, RESTORE, and LOAD TABLE FROM MASTER (which doesn't work well). 2006-02-19 09:41:59 -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
ac2b5966ca Merge mysql.com:/home/mysql_src/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.1-new
 2006-02-18 21:10:44 +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
jimw@mysql.com
5659853f3c Fix results due to change in SHOW CREATE TABLE output 2006-02-17 14:41:57 -08:00
jimw@mysql.com
cdad081fbe Merge mysql.com:/home/jimw/my/mysql-5.1-13883 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-02-17 11:06:05 -08: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
jimw@mysql.com
7182785f19 Fix subselect results (there was a bad merge when subselect test was disabled) 2006-02-17 10:02:59 -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
bar@mysql.com
54009d973a upgrade.result, upgrade.test: 
new file:
  Adding a test case for "Migration tool for 5.1 table name encoding"
 2006-02-17 13:19:26 +04:00
jmiller@mysql.com
5b51b14b1d Test case 2006-02-17 00:54:00 +01:00
jmiller@mysql.com
450682f194 Updated result files 2006-02-16 23:10:52 +01:00
jmiller@mysql.com
c63218aa91 Test cleanup 2006-02-16 21:50:05 +01:00
jmiller@mysql.com
4a5e97af1c 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-16 21:42:45 +01:00
jimw@mysql.com
d30dbf6efa Bug #17169: Partitions: out of memory if add partition and unique. 
When creating a new partition, a bogus memory allocation problem was
reported.
 2006-02-16 08:15:36 -08:00
andrey@lmy004.
4e4520b723 fix for bug#17543 Creating Event crash the server 
this problem affects only debug builds
 2006-02-16 16:11:02 +01:00
andrey@lmy004.
d89fc62e78 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16406
 2006-02-16 14:53:36 +01:00
aivanov@mysql.com
09847849b9 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/dev/mysql-5.1-wl3148
 2006-02-16 16:53:34 +03:00
aivanov@mysql.com
14633e0532 The patch adds PROCESSLIST information schema 2006-02-16 16:45:05 +03:00
andrey@lmy004.
3c82af94e7 fix bug in show events which shows 
| INTERVAL_VALUE | INTERVAL_FIELD |
| 20             | 20 MINUTE      |
the second one should be without the value
 2006-02-16 13:11:16 +01:00
msvensson@neptunus.(none)
23c694a596 Merge msvensson@devsrv-b:/space/magnus/my51-bug17386 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-16 10:24:50 +01:00
ingo@mysql.com
65a4e27633 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug8841
 2006-02-16 08:59:55 +01:00
ingo@mysql.com
233155e64e Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug8841
 2006-02-16 07:01:15 +01:00
andrey@lmy004.
6354f2454d Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16406
 2006-02-16 05:23:04 +01:00