1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-21 06:21:35 +03:00
Commit Graph

10365 Commits

Author SHA1 Message Date
kent@mysql.com
bcdd552d6e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
2005-11-19 11:20:52 +01:00
kent@mysql.com
bd80dc6c2e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-11-19 11:11:09 +01:00
guilhem@mysql.com
24006266d0 Merge mysql.com:/home/mysql_src/mysql-5.0-van
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
(2nd try; Pekka kindly accepted to fix storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
and storage/ndb/src/kernel/vm/SimulatedBlock.cpp after I push).
2005-11-19 10:43:28 +01:00
patg@krsna.patg.net
f6cd0148b8 BUG #14524
Patch that fixes crashing when partition uses blackole for 
underlying tables.
2005-11-18 17:02:27 -08:00
konstantin@mysql.com
86f1896fb0 Bug#13510 "Setting password local variable changes current
password": additional fix, also make sure that a syntax error is 
returned for set names="foo" when there is no such variable or no
stored procedure.
2005-11-19 01:22:12 +03:00
konstantin@mysql.com
a86eaaf5c3 A test case for Bug#8568 "GROUP_CONCAT returns string, unless in
a UNION in which case returns BLOB". The bug is not present anymore.
2005-11-18 23:46:04 +03:00
evgen@moonbone.local
c9ab4d614e Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/13622-bug-5.0-mysql
2005-11-18 22:11:34 +03:00
pem@mysql.com
4513ffd109 Removed forgotten test line in sp-code.test. 2005-11-18 18:05:04 +01:00
guilhem@mysql.com
2f95fc2701 Merge mysql.com:/home/mysql_src/mysql-5.0
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
2005-11-18 16:38:01 +01:00
pem@mysql.com
3a832faafe Post-review fixes, mainly fixing all print() methods for sp_instr* classes.
Also added mysql-test files:
 include/is_debug_build.inc
 r/is_debug_build.require
 r/sp-code.result
 t/sp-code.test
2005-11-18 16:30:27 +01:00
konstantin@mysql.com
159bf8832e A test case for Bug#14845 "mysql_stmt_fetch returns MYSQL_NO_DATA
when COUNT(*) is 0". The bug itself cannot be repeated.
2005-11-18 17:55:52 +03:00
mskold@mysql.com
ab812dd5d8 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-11-18 15:54:53 +01:00
mskold@mysql.com
38878cd724 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-11-18 15:51:15 +01:00
evgen@moonbone.local
badc2668ce Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/13622-bug-5.0-mysql
2005-11-18 17:26:44 +03:00
jimw@mysql.com
385082ede0 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-18 05:24:29 -08:00
konstantin@mysql.com
c20fe5dffd More authors. 2005-11-18 14:39:44 +03:00
mskold@mysql.com
16fcccce1a Disabled --ps-protocol during autodiscover test 2005-11-18 12:20:22 +01:00
mskold@mysql.com
2237d9b745 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-11-18 10:14:27 +01:00
mskold@mysql.com
96413a44d1 Using new error code HA_ERR_TABLE_DEF_CHANGED to signal wrong schema version of table 2005-11-18 09:54:49 +01:00
timour@mysql.com
9a644b948c WL#2486 - natural/using joins according to SQL:2003.
Enabled view tests that didn't work before.
2005-11-18 10:51:46 +02:00
igor@rurik.mysql.com
a0744fba27 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2005-11-17 20:26:34 -08:00
jimw@mysql.com
2ff5c55896 Fix mix_innodb_myisam_binlog test and results after merge 2005-11-17 20:17:49 -08:00
omer@mysql.com
46f140deb3 Updated authors.h file (and show_check.result file) to include QA team members
Note: This change was reviewed by Brian before the commit.
2005-11-17 17:35:50 -08:00
evgen@moonbone.local
a031778955 Manually merged 2005-11-18 01:16:15 +03:00
serg@serg.mylan
e0abc22bfc BUG#13406 - incorrect amount of "records deleted" in CSV.
Fallback to row-wise delete if number or rows in the table is unknown
2005-11-17 22:52:31 +01:00
jimw@mysql.com
f8ce7bc01e Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-17 13:37:30 -08:00
mskold@mysql.com
8ca38a90ad Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-11-17 15:38:15 +01:00
ingo@production.mysql.com
a7daeaf64f Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.1
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-4.1
2005-11-17 13:44:34 +01:00
mskold@mysql.com
77cbf5d3ff Fixed incorrectly use if table with wrong schema version 2005-11-17 12:45:23 +01:00
eric@mysql.com
c8485ed447 Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/eric/fed-txn-mysql-5.1-new
2005-11-17 02:54:17 -08:00
sasha@asksasha.com
0b275de13f Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947
2005-11-16 21:18:13 -07:00
sasha@asksasha.com
eac88b685c fixed the race condition in the test case for BUG#7947 2005-11-16 21:17:38 -07:00
igor@rurik.mysql.com
dc32369fb0 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2005-11-16 20:09:35 -08:00
dlenev@mysql.com
f0e558c1b8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13399-2
2005-11-17 04:38:10 +03:00
dlenev@mysql.com
63fcccb193 Fix for bug #13399 Crash when executing PS/SP which should activate trigger
which is now dropped" and bug #12329 "Bogus error msg when executing PS with
stored procedure after SP was re-created".
2005-11-17 03:51:14 +03:00
konstantin@mysql.com
9e1f155864 A fix and a test case for Bug#14077 "Failure to replicate a stored
function with a cursor". Enable execution of SELECT queries in SP on slave.
2005-11-17 03:15:10 +03:00
pekka@mysql.com
becda93988 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/export/space/pekka/ndb/version/my50
2005-11-16 22:22:34 +01:00
ingo@mysql.com
1237c2fbcc Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-4100
2005-11-16 21:33:38 +01:00
ingo@production.mysql.com
e55fd656dc Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0
2005-11-16 18:47:17 +01:00
ingo@production.mysql.com
82d91620ce Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0
2005-11-16 16:04:34 +01:00
serg@serg.mylan
60875d3236 bug#14433 - archive uses wrong ref_length 2005-11-16 15:17:08 +01:00
pekka@mysql.com
06531fb1d0 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/export/space/pekka/ndb/version/my50
2005-11-16 13:29:44 +01:00
pekka@mysql.com
a6e410dd4e Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/export/space/pekka/ndb/version/my41-r1.2456.1.1
2005-11-16 13:28:54 +01:00
pekka@mysql.com
9fe68c3da6 ndb - bug#14007 5.0 *** does not automerge into 5.1 *** 2005-11-16 13:26:26 +01:00
bell@sanja.is.com.ua
a60a6b0f7f Issuing error about presence of commit/rollback statements in stored functions and triggers added to SP parsing procedure (BUG#13627)
The crash mentioned in original bug report is already prevented by one
of previous patches (fix for bug #13343 "CREATE|etc TRIGGER|VIEW|USER
don't commit the transaction (inconsistency)"), this patch only improve
error returning.
2005-11-16 14:09:06 +02:00
pekka@mysql.com
a8ce4d27ce ndb - bug#14007 4.1 [re-commit for LenZ merge] 2005-11-16 11:52:09 +01:00
ingo@mysql.com
3df2007147 Merge mysql.com:/home/mydev/mysql-4.1-4100
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-11-16 10:23:42 +01:00
ingo@mysql.com
e66b88bb7d Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-11-16 10:10:53 +01:00
igor@rurik.mysql.com
aaf066bc86 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2005-11-15 23:01:29 -08:00
jimw@mysql.com
8ecedd193b Report truncation of spaces when inserting into a BINARY or VARBINARY
field. (Bug #14299)
2005-11-15 19:21:05 -08:00