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

23607 commits

This branch
This branch
All branches
Author SHA1 Message Date
pem@mysql.comhem.se
ca0a72f815 Post-merge fix. 2005-06-10 18:06:12 +02:00
pem@mysql.com
b42bf3cc55 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-06-10 16:56:34 +02:00
pem@mysql.comhem.se
46619fa0e3 Post review and additional fix for BUG#10968: Stored procedures: crash if long loop. 
Fixed valgrind complaints. This fixes the memory leak problems for
  procedured, and partially for functions. There's still a leak involving
  results from functions that turned out to be too involved, so it will be
  fixed separately.
 2005-06-10 16:14:01 +02:00
obarnir@mysql.com
a64115d1f0 Merge obarnir@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/omer/source/src50_0609
 2005-06-10 06:58:26 -07:00
lenz@mysql.com
d11be61a51 Merge mysql.com:/space/my/mysql-4.1-build 
into mysql.com:/space/my/mysql-5.0
 2005-06-10 15:41:30 +02:00
lenz@mysql.com
abaae49cfd Merge mysql.com:/space/my/mysql-4.1-merge 
into mysql.com:/space/my/mysql-4.1-build
 2005-06-10 15:37:21 +02:00
lenz@mysql.com
a610a7749f - added missing files std_data/server-cert.pem and std_data/server-key.pem to make 
the SSL tests pass
 2005-06-10 15:30:16 +02:00
heikki@hundin.mysql.fi
6c38471e87 os0sync.c, os0file.c: 
Apply Georg Richter's fixes to remove compilation errors on 64-bit Windows
 2005-06-10 14:18:36 +03:00
jimw@mysql.com
4441b59711 Update test results. type_varchar changed because the size of the 
key now gets changed along with the size of the field as long
as the original key had the same length as the length of the field
(or is unspecified originally, as in the test).
 2005-06-09 21:20:34 -07:00
jimw@mysql.com
1055c36000 Merge mysql.com:/home/jimw/my/mysql-5.0-10543 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-06-09 19:29:55 -07:00
jimw@mysql.com
153f233627 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-06-09 19:27:45 -07:00
jimw@mysql.com
21f46b3940 Merge mysql.com:/home/jimw/my/mysql-4.1-11122 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-09 18:03:55 -07:00
jimw@mysql.com
bb8f2663ae Merge mysql.com:/home/jimw/my/mysql-4.1-10566 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-09 18:03:18 -07:00
jimw@mysql.com
3c425f1f65 Merge mysql.com:/home/jimw/my/mysql-4.1-10931 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-09 18:02:04 -07:00
jimw@mysql.com
a5285b141e Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-06-09 18:00:47 -07:00
brian@brian-akers-computer.local
12a7b7af04 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0
 2005-06-09 13:11:54 -07:00
jani@a193-229-222-105.elisa-laajakaista.fi
5708d9a076 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2005-06-09 21:54:06 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
9f3daa2371 Fixes in function modify_defaults_file(): 
- Removed unneccessary variables.
- Made a function of that part of code, which actually changes 
  the line under modifications.
- Fixed memory overrun problem with my_malloc. Too little space
  was reserved.
- Fixed problem in case, when new option was added at the end
  of the section. Before, it was added as the last line of the
  section, even if it left empty lines between.
- Fixed so that the configuration file is not saved unneccessarily,
  if no modifications are done. (file timestamp remains)
- This should fix (at least partially) problems described in
  Bug#10806
 2005-06-09 21:50:22 +03:00
obarnir@mysql.com
156d351e1d Adding auxiliary scripts that allow to display messages in result files from within test files 
- show_msg.inc   - displays a message followed by a line of '-' at the length of the messgae
 - show_msg80.inc - displays a message followed by a line of '-' with a fixed length of 80
 2005-06-09 11:01:23 -07:00
acurtis@xiphis.org
57192cb62f Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 
into xiphis.org:/usr/home/antony/work2/p1-bug11028.4
 2005-06-09 18:44:59 +01:00
brian@brian-akers-computer.local
1b602c3d99 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0
 2005-06-09 09:36:44 -07:00
svoj@mysql.com
a3e72ec85a Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/var/tmp/sslbug/mysql-4.1
 2005-06-09 21:22:44 +05:00
brian@brian-akers-computer.local
2d9c00b2f3 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0
 2005-06-09 09:20:00 -07:00
igor@rurik.mysql.com
36a4f39bc6 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-06-09 09:19:57 -07:00
igor@rurik.mysql.com
e093250d5d select.test, select.result: 
Added a test case for bug #10084.
sql_yacc.yy:
  Fixed bug #10084: STRAIGHT_JOIN for expressions with ON was
  added.
 2005-06-09 09:16:16 -07:00
acurtis@xiphis.org
3b8c3bd7e1 Merge 2005-06-09 17:15:06 +01:00
acurtis@xiphis.org
cb7961bd9b Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1 
into xiphis.org:/usr/home/antony/work2/p1-bug11028.3
 2005-06-09 16:44:03 +01:00
acurtis@xiphis.org
304bb0c66d Bug#11028 Crash on create table like 
Report error instead of crashing
 2005-06-09 16:06:15 +01:00
konstantin@mysql.com
95e620485c A fix and test case for Bug#10729 "mysql_stmt_attr_set 
CURSOR_TYPE_READ_ONLY". The bug was that we (me) don't perform proper
cleanups of the prepared statement when done fetching from a cursor.
Another patch.
 2005-06-09 18:17:45 +04:00
konstantin@mysql.com
6a5b215443 Fix broken test suite. 2005-06-09 18:00:50 +04:00
svoj@mysql.com
d08d1a88e0 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
 2005-06-09 17:15:50 +05:00
holyfoot@hf-ibm.(none)
717d92f6a6 Fix for bug #10083 (round doesn't increase scale) 2005-06-09 15:27:26 +05:00
gluh@mysql.com
f183ee49eb Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/gluh/MySQL/Merge/4.1
 2005-06-09 15:26:46 +05:00
joreland@mysql.com
7d5960a5a6 update result file for ps7_ndb 2005-06-09 12:26:45 +02:00
gluh@eagle.intranet.mysql.r18.ru
8574ed6fc6 Fix for bug#10732: Set SQL_MODE to NULL gives garbled error message 
generate proper error message if we use SET ... = NULL for 'set'
  variables
 2005-06-09 14:39:29 +05:00
joreland@mysql.com
cce5aea0c7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-push
 2005-06-09 11:37:10 +02:00
svoj@mysql.com
8209f84d49 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
 2005-06-09 13:45:43 +05:00
hf@deer.(none)
1fdc59ac33 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.8482
 2005-06-09 13:31:29 +05:00
ramil@mysql.com
90ddbe87d6 a fix (bug #11193: error messages gets garbled after reggies latest changeset: ChangeSet@1.2260.1.). 2005-06-09 13:13:02 +05:00
hf@deer.(none)
cc007a5c09 Fix for bug #8482 (Incorrect rounding) 2005-06-09 12:44:44 +05:00
joreland@mysql.com
5c9dee551a Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-push
 2005-06-09 08:12:14 +02:00
joreland@mysql.com
a5a13ea8c8 ndb - autotest 
small script fixes
  - Don't use hostname -s as it's linux specific
  - Don't remove result unless scp worked
 2005-06-09 08:07:48 +02:00
joreland@mysql.com
872c84b382 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-06-09 07:57:10 +02:00
joreland@mysql.com
3c82fb642c Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-06-09 07:52:02 +02:00
joreland@mysql.com
3765bb2df9 ndb - uint overflow when running on 64-bit platform with more than 4Gb of mem 
bug#10711
bug#10058
bug#9363
bug#9025
bug#8918
 2005-06-09 07:49:48 +02:00
brian@brian-akers-computer.local
f5434a93bf Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0
 2005-06-08 22:29:10 -07:00
jimw@mysql.com
927418b199 Make sure we don't mistake a "grep mysqld" for a mysqld process 
when checking if the server is running in mysqld_safe. (Bug #11122)
 2005-06-08 18:57:39 -07:00
dlenev@mysql.com
207ac74905 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-bgmd
 2005-06-09 01:54:18 +04:00
konstantin@mysql.com
9b2e653af0 Disable dynamic SQL in stored routines. 
This is to close Bug#10975, Bug#7115, Bug#10605 
This feature will be implemented in a future release.
 2005-06-09 01:46:30 +04:00
dlenev@mysql.com
fae0b7f7af Manual merge 2005-06-09 01:13:20 +04:00