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

30945 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
msvensson@neptunus.(none)
46620c4ab9 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-18 16:20:14 +01:00
msvensson@neptunus.(none)
e592227529 Fix build failure 2006-02-18 16:18:51 +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
cb74e09f46 Add a shift in the parser. Forgotten in the previous commit. 2006-02-18 03:22:13 +03:00
brian@zim.tangent.org
e4ce125d79 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.tangent.org:/home/brian/mysql/dep-5.1
 2006-02-17 16:06:08 -08:00
brian@zim.tangent.org
3ea4f67f5b Removing support for storage engines being loadable, will push featureto 5.2. 2006-02-17 16:00:36 -08: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
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
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
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
msvensson@neptunus.(none)
b2a13dd760 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-17 17:21:34 +01:00
msvensson@neptunus.(none)
a50d87da34 Fix after review 2006-02-17 17:16:18 +01: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
msvensson@neptunus.(none)
7632371576 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-17 15:56:01 +01:00
msvensson@neptunus.(none)
e96353cf55 Bug#17382 mysql-test-run mysqldump fails with mysqlimport 
- Remove global  MYSQL connection variable
 2006-02-17 15:52:05 +01:00
paul@snake-hub.snake.net
b05dcd504c Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
 2006-02-17 08:41:10 -06:00
paul@snake-hub.snake.net
abe3dd2a7e Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2006-02-17 08:38:05 -06:00
paul@snake-hub.snake.net
3a9bfb00c8 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
 2006-02-17 08:33:47 -06:00
paul@snake-hub.snake.net
22f630f59a mysqlcheck.c: 
Tweak --check-upgrade help text.
 2006-02-17 08:32:52 -06:00
kent@mysql.com
03ecedcae8 configure.in: 
Updated version number to 5.1.8
 2006-02-17 14:54:06 +01:00
joerg@mysql.com
0611ea3222 Surprising change: "mysqld-max" is resurrected in 5.1, but in a common package. 2006-02-17 14:14:56 +01:00
paul@snake-hub.snake.net
8a231241eb Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
 2006-02-17 07:10:55 -06:00
bar@mysql.com
9d9dcf81b8 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 16:39:42 +04:00
evgen@moonbone.local
e115d605de Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/15706-bug-5.0-mysql
 2006-02-17 15:36:56 +03:00
holyfoot@mysql.com
0841480e1e merging 2006-02-17 14:39:38 +04: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
holyfoot@deer.(none)
942503927a WL#2645 (CHECK FOR UPGRADE) 
5.1-related fixes
 2006-02-17 13:37:37 +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
bar@mysql.com
d0e4df18e6 client_priv.h: 
Sorry, forgot to push in the previous changeset.
 2006-02-17 13:10:12 +04:00
bar@mysql.com
ed4f5ac923 mysqlcheck.c: 
WL#3046  Migration tool for 5.1 table-name encoding
 2006-02-17 12:10:36 +04:00
tomas@poseidon.ndb.mysql.com
bd690b5e17 reported bugs and disabled corresponding tests 
disabled non deterministic test
 2006-02-17 09:02:11 +01:00
holyfoot@mysql.com
be02944df6 Merging 5.0->5.1 2006-02-17 11:26:03 +04:00
holyfoot@mysql.com
77605c3576 Merge mysql.com:/home/hf/work/mysql-5.0.clean 
into mysql.com:/home/hf/work/mysql-5.1.w2645
 2006-02-17 11:12:05 +04:00
holyfoot@mysql.com
f500cbf83c Merge bk@192.168.21.1:mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.w2645
 2006-02-17 10:56:54 +04:00
holyfoot@deer.(none)
053d90a234 WL#2645 (CHECK TABLE FOR UPGRADE) 
necessary implementation in the server
mysql_upgrade script added
 2006-02-17 10:52:32 +04:00