mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
28417 commits 2781 branches 343 tags 1.6 GiB
Commit graph

28417 commits

This branch
This branch
All branches
Author SHA1 Message Date
bell@sanja.is.com.ua
7f162c7899 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
 2005-11-21 21:15:48 +02:00
bell@sanja.is.com.ua
fe44e364ca Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
 2005-11-21 21:14:36 +02:00
bell@sanja.is.com.ua
87a199fc2a Avoiding removing dummy TABLE allocated on the stack (BUG#14726). 2005-11-21 21:11:02 +02:00
joerg@mysql.com
84bc725fb9 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-11-21 18:31:36 +01:00
bar@mysql.com
3d1c1d7f68 cast.result: 
Fixing test results accordingly.
item_timefunc.cc:
  Displaying BINARY or CHAR in error messages,
  depending on the character set.
 2005-11-21 21:11:28 +04:00
bar@mysql.com
225d009c6a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b14255
 2005-11-21 20:01:16 +04:00
bar@mysql.com
435c2ba671 Additional fix for Bug#14255 CAST(x AS BINARY(N)) does not pad 
cast.result:
cast.test:
  Avoid 0x00 byte in test results, use HEX instead.
 2005-11-21 19:59:58 +04:00
eric@mysql.com
519139b63a Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/eric/fed-err-mysql-5.0
 2005-11-21 07:52:21 -08:00
pem@mysql.com
7b78489e2d Check for zlib with a zzlibCompileFlags() function in config/ac-macros/zlib.m4. 
(Patch provided by serg)
 2005-11-21 16:05:40 +01:00
eric@mysql.com
ec341f0303 Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/eric/fed-err-mysql-5.0
 2005-11-21 07:05:14 -08:00
joerg@mysql.com
b3b124f9e4 Merge the last 5.0.16 (Unix, Windows) and 5.0.16a (Netware) changes to the general tree. 2005-11-21 15:49:34 +01:00
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
bar@mysql.com
174d28e4cc Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b14255
 2005-11-21 17:57:14 +04: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
serg@serg.mylan
5663843d3b Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-11-21 10:18:54 +01:00
bell@sanja.is.com.ua
806f9e24ff Inefficient usage of String::append() fixed. 
Bad examples of usage of a string with its length fixed.
The incorrect length in the trigger file configuration descriptor
  fixed (BUG#14090).
A hook for unknown keys added to the parser to support old .TRG files.
 2005-11-20 20:47:07 +02:00
konstantin@mysql.com
b42d9eb915 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/opt/local/work/mysql-5.1-new
 2005-11-20 21:05:49 +03:00
pekka@mysql.com
ce21b10258 ndb - bug#14007 5.1 (merge 5.0->5.1) 2005-11-20 11:15:13 +01:00
kent@mysql.com
521f4b61f2 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 21:35:11 +01:00
konstantin@mysql.com
1fa45d6121 Merge mysql.com:/opt/local/work/mysql-5.0-8568 
into  mysql.com:/opt/local/work/mysql-5.1-new
 2005-11-19 19:26:22 +03: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
guilhem@mysql.com
b3845d1f60 Fix after merge of 5.0 into 5.1. Failed tests before merge: bdb-deadlock, ndb_cache2, ndb_multi2, 
ps_6bdb (this one fails circa once over 4 runs). After the merge: the same PLUS mysql_client_test&sp (due to problem in fix of BUG#14845 which has also
been noticed in 5.0 too and Konstantin is looking at it) PLUS mysqlcheck (just consequence of mysql_client_test).
And a replication bugfix (thd->spcont must be taken into account when calling tables_ok(), as in 5.0,
and so some brackets were missing which changed one test).
Pekka will look at the NDB code where I just used "ul": ndb_charset test, and storage/ndb/src/kernel/vm/SimulatedBlock.cpp
and storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp (SimulatedBlock.hpp automerged);
please also check storage/ndb/src/ndbapi/NdbRecAttr.cpp. Petr please check ha_tina.cc.
 2005-11-19 15:56:55 +01:00
kent@mysql.com
58fc48046c Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
 2005-11-19 13:17:20 +01: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
guilhem@mysql.com
a7c3aed5f4 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
 2005-11-19 13:06:16 +01:00
kent@mysql.com
133c00beb4 configure.in: 
Corrected "include/readline" link for "make distcheck"
 2005-11-19 12:58:22 +01:00
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
guilhem@mysql.com
7d7eb22ed1 fix after merge of 5.0 into 5.1 2005-11-18 21:34:54 +01: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
jamppa@suse9-x86.mysql.com
a50cc250ff Netware specific changes for 5.0.16a 2005-11-18 18:25:46 +01: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