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

28962 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@neptunus.(none)
e919f8e888 Merge neptunus.(none):/home/msvensson/mysql/bug14057/my50-bug14057 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-21 08:50:26 +01:00
msvensson@neptunus.(none)
674ee5987c Merge neptunus.(none):/home/msvensson/mysql/bug2845/my50-bug2845 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-21 08:44:27 +01:00
holyfoot@mysql.com
9d77d8d9fa Merge bk@192.168.21.1:mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.w2645
 2006-02-20 14:29:50 +04:00
holyfoot@deer.(none)
796489ea1e Messgges corrected in mysql_upgrade script 2006-02-20 14:26:32 +04: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
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
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
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
holyfoot@deer.(none)
70fdbff94f --help option added to mysql_upgrade script 2006-02-18 14:55:31 +04:00
petr@mysql.com
cb74e09f46 Add a shift in the parser. Forgotten in the previous commit. 2006-02-18 03:22:13 +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
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
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
22f630f59a mysqlcheck.c: 
Tweak --check-upgrade help text.
 2006-02-17 08:32:52 -06: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
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
ingo@mysql.com
c5d62e4a5c Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug8841
 2006-02-16 19:23:37 +01:00
evgen@moonbone.local
611f25f932 Merge 2006-02-16 21:11:38 +03:00
paul@snake-hub.snake.net
a9cda1edd3 mysqlcheck.c: 
Fix out of order options.
 2006-02-16 10:00:14 -06:00
msvensson@neptunus.(none)
56acf0a0c2 Bug#14057 mysql_ping() handles TCP and UNIX socket connections in different ways 
- Retry the ping if reconnect is turned on and the error was CR_SERVER_LOST
 2006-02-16 13:44:56 +01:00
msvensson@neptunus.(none)
8c828967ee Bug#2845 client fails to reconnect if using TCP/IP 
- Detect that connection to server has been broken in "net_clear". Since 
  net_clear is always called before we send command to server, we can be sure
  that server has not received the command.
 2006-02-16 12:02:38 +01:00
ingo@mysql.com
bd37ef8ad5 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug8841
 2006-02-16 10:31:32 +01:00
msvensson@neptunus.(none)
6282d5aa4f Merge neptunus.(none):/home/msvensson/mysql/bug16333/my50-bug16333 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-16 10:20:42 +01:00
ingo@mysql.com
cc538673ce Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug8841
 2006-02-16 10:17:30 +01:00
msvensson@neptunus.(none)
7d9eba0441 ndb_load disabled 2006-02-16 10:03:13 +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
stewart@mysql.com
86332f4369 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug17411-thisisaverylongnamethatshouldbewaylongerthanthe128limitthatweprivouslyhadbutireallywantotestitandseethatitdoesreallywork.nowitshouldbeabout160charslongnonow.iwonderifanythingwillchokeornotwiththisoutrageouslylongpathname
 2006-02-16 15:47:48 +11:00
msvensson@neptunus.(none)
12b23630db Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-15 20:16:33 +01:00
jimw@mysql.com
469cd9c610 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-02-15 09:29:11 -08:00
jimw@mysql.com
ce766cfc30 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-02-15 09:13:56 -08:00
evgen@moonbone.local
4d2b0fd026 Fix bug #15706 find_field_in_tables() returns field from outer select 
If item->cached_table is set, find_field_in_tables() returns found field
even if it doesn't belong to current select. Because Item_field::fix_fields
doesn't expect such behaviour, reported bug occurs.

Item_field::fix_fields() was modifed to detect when find_field_in_tables() 
can return field from outer select and process such fields accordingly.
In order to ease this code which was searching and processing outed fields was
moved into separate function called Item_field::fix_outer_field().
 2006-02-15 19:45:06 +03:00
jimw@mysql.com
e75a62aeae Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2006-02-15 07:36:33 -08:00
msvensson@devsrv-b.mysql.com
eb97818627 Bug#16143 mysql_stmt_sqlstate returns an empty string instead of '00000' 
- Init sql_state in mysql_stmt_init
 2006-02-15 13:45:03 +01:00
msvensson@neptunus.(none)
56ef2e28e4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-15 12:02:20 +01:00
msvensson@neptunus.(none)
aacf783e86 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-15 10:53:25 +01:00
stewart@mysql.com
e50298980c BUG#17411 cannot have path longer than 128 characters 
Use the POSIX limits.h define of PATH_MAX for maximum path length.

This has been being hit in pushbuild
 2006-02-15 16:37:09 +11:00
jimw@mysql.com
a58c542e61 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-02-14 18:14:04 -08:00
jimw@mysql.com
d70c47b2a9 Merge mysql.com:/home/jimw/my/mysql-4.1-16389 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2006-02-14 18:12:30 -08:00
aelkin@mysql.com
42cc473df3 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
 2006-02-14 20:19:00 +02:00
aelkin@mysql.com
6423fe2d49 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
 2006-02-14 20:15:17 +02:00
evgen@moonbone.local
131217eb6f Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/16272-bug-5.0-mysql
 2006-02-14 19:46:35 +03:00
msvensson@neptunus.(none)
9a06392b2f Merge neptunus.(none):/home/msvensson/mysql/bug17233/my50-bug17233 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-14 17:25:44 +01:00
msvensson@neptunus.(none)
dc5bb00467 Enable ndb_load test case 2006-02-14 17:21:18 +01:00
msvensson@neptunus.(none)
52183ddd78 Change from std_data to std_data_ln 2006-02-14 17:15:24 +01:00
msvensson@neptunus.(none)
93a98270d1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-14 15:36:19 +01:00