mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
27814 commits 2788 branches 343 tags 1.7 GiB
Commit graph

27814 commits

This branch
This branch
All branches
Author SHA1 Message Date
ingo@mysql.com
a0f14eb8ef Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug13707
 2005-11-21 15:28:21 +01:00
aivanov@mysql.com
d741ce9017 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/dev/mysql-5.0-14554
 2005-11-21 15:56:29 +03:00
aivanov@mysql.com
9a7efe36c6 Fixed BUG #14554: mysqldump does not separate "ROW" and trigger 
statement for tables created in the IGNORE_SPACE sql mode.
 2005-11-21 13:36:48 +03:00
mskold@mysql.com
c38fa304c3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-11-21 10:46:17 +01:00
dlenev@mysql.com
b040ad35b1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13825
 2005-11-19 19:07:51 +03:00
konstantin@mysql.com
723baa4d90 A fix for Bug#14845 "mysql_stmt_fetch returns MYSQL_NO_DATA when 
COUNT(*) is 0" (the test case has been pushed already)
 2005-11-19 19:00:02 +03:00
dlenev@mysql.com
d1eb512948 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13825
 2005-11-19 15:11:57 +03:00
dlenev@mysql.com
574e711209 Fix for bug #13825 "Triggers: crash if release savepoint" and for general 
handling of savepoints in stored routines.

Fixed ha_rollback_to_savepoint()/ha_savepoint()/ha_release_savepoint()
functions to properly handle savepoints inside of stored functions and
triggers.
Also now when we invoke stored function or trigger we create new savepoint
level. We destroy it at the end of function/trigger execution and return back
to old savepoint level.
 2005-11-19 15:09:23 +03: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
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
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
jimw@mysql.com
2ff5c55896 Fix mix_innodb_myisam_binlog test and results after merge 2005-11-17 20:17:49 -08:00
evgen@moonbone.local
a031778955 Manually merged 2005-11-18 01:16:15 +03: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
jimw@mysql.com
e21566e908 Merge mysql.com:/home/jimw/my/mysql-4.1-14801 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-11-17 11:44:15 -08:00
jimw@mysql.com
c1261f588f Merge mysql.com:/home/jimw/my/mysql-4.1-12640 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-11-17 10:59:21 -08:00
jimw@mysql.com
cee6671756 Merge mysql.com:/home/jimw/my/mysql-4.1-11796 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-11-17 10:58:46 -08:00
konstantin@mysql.com
a42b3730aa Post-review fixes (Bug#13524). 2005-11-17 19:40:48 +03:00
konstantin@mysql.com
c2a1c6c81f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-13524
 2005-11-17 19:26:58 +03: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
grog@mysql.com
e91e55d643 set_var.cc, mysqld.cc, ha_innodb.h: 
BUG#12701: SHOW VARIABLES does not show correct size of buffer pool.
ha_innodb.cc:
  BUG#12701: SHOW VARIABLES does not show correct size of buffer pool
 2005-11-17 15:08:49 +01:00
konstantin@mysql.com
85f5263284 A fix and a test case for Bug#13524 "lock timeout gives 
incorrect warning on open cursor"
 2005-11-17 16:20:12 +03: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
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
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
ingo@mysql.com
41bb21de16 Bug#14616 - Freshly imported table returns error 124 when using LIMIT 
After merge fix.
 2005-11-16 15:58:17 +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
6651c0876c DbtupRoutines.cpp: 
Auto merged
 2005-11-16 12:08:22 +01:00
pekka@mysql.com
a8ce4d27ce ndb - bug#14007 4.1 [re-commit for LenZ merge] 2005-11-16 11:52:09 +01:00