database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity
28,980 Commits 3,346 Branches 1,099 Tags
a699a2ea1bfdadd36331e9ccae8ec2f07add3d07
Commit Graph

28980 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
msvensson@neptunus.(none)
a699a2ea1b Merge neptunus.(none):/home/msvensson/mysql/bug14871/my50-bug14871 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-21 15:05:58 +01:00
msvensson@neptunus.(none)
c293324eb0 Bug#14871 mysqldump: invalid view dump output 
- Add comments with embeded veriosn info around the parts of the view syntax that are only supported by a certain version of MySQL Server
 2006-02-21 13:21:17 +01:00
msvensson@neptunus.(none)
40fe710394 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-21 09:40:18 +01:00
msvensson@neptunus.(none)
6006c9ac36 Merge neptunus.(none):/home/msvensson/mysql/bug13809/my50-bug13809 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-21 09:11:03 +01:00
msvensson@neptunus.(none)
7786d075e7 Merge neptunus.(none):/home/msvensson/mysql/bug16557/my50-bug16557 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-21 08:58:19 +01:00
msvensson@neptunus.(none)
3764d3dab1 Merge neptunus.(none):/home/msvensson/mysql/bug16795/my50-bug16795 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-21 08:55:13 +01:00
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
msvensson@neptunus.(none)
1119defd8f Escape \ in "exec" 2006-02-20 15:03:16 +01:00
msvensson@neptunus.(none)
ae174fbef8 Fix typo 2006-02-20 12:05:45 +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
msvensson@neptunus.(none)
c8c579b2e5 Set opt_vardir_trace for path for tracefiles 2006-02-17 12:19:05 +01:00
msvensson@neptunus.(none)
b951068d62 Replace win filename s with unix equivalent 
Evaluate commands passed to "exec" and "system" to expand any $variables before executing command.
 2006-02-17 12:07:45 +01: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
msvensson@neptunus.(none)
cb9b610586 #define popen(A,B) _popen((A),(B)) 2006-02-16 23:05:15 +01:00
msvensson@neptunus.(none)
340598a3ba Use the tmp dir of MYSQLTEST_VARDIR 2006-02-16 22:10:25 +01:00
msvensson@neptunus.(none)
7a33a4ac0a Don't disable warnings when dropping objects that should exist 2006-02-16 22:06:07 +01:00
msvensson@neptunus.(none)
3a0ce1e248 Use --system for unix command's 2006-02-16 21:34:01 +01: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)
3fc22ca4b9 Bug#13809 mysql-test: --replace_result option works on Windows incorrect 2006-02-16 00:53:55 +01:00
msvensson@neptunus.(none)
47257f1317 Bug#16795 ndb_cache_multi2 
- remove timing dependent part of test, wait until condition occurs or sleep max 10 seconds
 2006-02-15 22:46:16 +01:00
msvensson@neptunus.(none)
cac0931b8c Add possibility to have a negative expression in "if" and "while" in mysqltest 2006-02-15 22:43:42 +01: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