Commit graph

27608 commits

Author SHA1 Message Date
jimw@mysql.com
552c208bfe Update test with changed result after merge 2005-10-28 10:16:44 -07:00
msvensson@neptunus.(none)
06c17bac2a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 19:10:05 +02:00
msvensson@neptunus.(none)
3c696721f6 Update after merge, include libtaoint-integer.o into libtaocrypt.a 2005-10-28 17:12:30 +02:00
lenz@mysql.com
7decf21c02 - after merge fix: removed pack_isam from the RPM spec file list again 2005-10-28 16:50:52 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
2e127c9207 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-10-28 17:50:06 +03:00
aivanov@mysql.com
0156fd9424 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/alexi/dev/mysql-4.1-10511
2005-10-28 17:25:26 +04:00
aivanov@mysql.com
c807cd2e26 Fix BUG#10511: Wrong padding of UCS2 CHAR columns in
ON UPDATE CASCADE
2005-10-28 17:16:22 +04:00
pem@mysql.com
1eaf95d5ca Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/bug14256/mysql-5.0
2005-10-28 14:55:01 +02:00
msvensson@neptunus.(none)
1be4e65794 Use replace_result to mask portnumber printed from failing connect 2005-10-28 14:03:24 +02:00
bell@sanja.is.com.ua
186017b468 disabling archive_gis 2005-10-28 14:56:55 +03:00
msvensson@neptunus.(none)
74c39cc118 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 13:51:42 +02:00
bell@sanja.is.com.ua
38dec6c811 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner7-5.0
2005-10-28 14:49:02 +03:00
lenz@mysql.com
303ba37044 - added man page for the mysqlmanager in the RPM spec file list 2005-10-28 13:31:19 +02:00
evgen@moonbone.local
cc5d7c0715 Fix bug #14138 ROLLUP and PROCEDURE ANALYSE() hang server
Procedure analyse() redefines select's fields_list. setup_copy_fields() assumes
that fields_list is a part of all_fields_list. Because select have only 
3 columns and analyse() redefines it to have 10 columns, int overrun in
setup_copy_fields() occurs and server goes to almost infinite loop.

Because fields_list used not only to send data ad fields types, it's wrong 
to allow procedure redefine it. This patch separates select's fileds_list 
and procedure's one. Now if procedure is present, copy of fields_list is 
created in procedure_fields_list and it is used for sending data and fields.
2005-10-28 15:24:46 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
1fdee50f16 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-10-28 14:04:06 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
28cb5aefcf NetWare specific change to use a LibC API instead of a
kernel function to prevent CPU hogs.
2005-10-28 14:01:00 +03:00
petr@mysql.com
27cb3d93c9 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2005-10-28 14:48:39 +04:00
petr@mysql.com
922cdfa025 fix Bug #14103 IM tests fail on SCO 2005-10-28 14:29:46 +04:00
pem@mysql.com
d201f2443d Fixed BUG#14256: definer in view definition is not fully qualified
Changed the parser test for wildcards in hostname to checking for empty
  strings instead (analogous with the test in default_view_definer()),
  since wildcards do appear in the definer's host-part sometimes.
2005-10-28 12:11:32 +02:00
msvensson@neptunus.(none)
68fa03258a Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 11:45:30 +02:00
lenz@mysql.com
8303ca007a - after merge fixes 2005-10-28 11:10:29 +02:00
msvensson@neptunus.(none)
b1189769c9 Merge neptunus.(none):/home/msvensson/mysql/bug12258/my50-bug12258
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 11:09:10 +02:00
petr@mysql.com
314a33c864 fix a typo 2005-10-28 13:02:26 +04:00
msvensson@neptunus.(none)
be6f7a3f82 Merge neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 11:00:54 +02:00
msvensson@neptunus.(none)
22c0d6489c After reiview fix
- Use msg argument to determine if param is required or not in safe_get_param
2005-10-28 10:58:57 +02:00
lenz@mysql.com
0f3192323c - fixed RPM spec file list after merge, removed dupes 2005-10-28 10:46:07 +02:00
hf@deer.(none)
fda75b1519 Fix for bug #9551 (Show commands fail) 2005-10-28 12:15:46 +05:00
bell@sanja.is.com.ua
b5d2e34572 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner7-5.0
2005-10-28 10:12:36 +03:00
jimw@mysql.com
009bcc7442 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-27 18:46:00 -07:00
jani@ua141d10.elisa.omakaista.fi
74b8b449a4 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-28 03:26:56 +03:00
kent@mysql.com
a49940c359 Makefile.am:
Added "base64.h" to enable "make dist" to work
2005-10-28 02:17:41 +02:00
jani@ua141d10.elisa.omakaista.fi
ada29913ac Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-28 03:16:28 +03:00
jani@ua141d10.elisa.omakaista.fi
af50eff0d2 Merge 4.1 - 5.0 2005-10-28 02:36:19 +03:00
tim@siva.hindu.god
c704130389 BUG#14358: in mysql.cc, don't neglect to strip delimiter off lines < 9 characters long. 2005-10-28 12:13:34 +13:00
bell@sanja.is.com.ua
c399932a72 fixe of typos, comments & layout 2005-10-28 00:56:44 +03:00
bell@sanja.is.com.ua
6143c6543e Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner7-5.0
2005-10-28 00:24:13 +03:00
evgen@moonbone.local
77723c2438 Fix bug#14186 select datefield is null not updated
Date field was declared as not null, thus expression 'datefield is null'
was always false. For SELECT special handling of such cases is used. 
There 'datefield is null' converted to 'datefield eq "0000-00-00"'.

In mysql_update() before creation of select added remove_eq_conds() call.
It makes some optimization of conds and in particular performs conversion
from 'is null' to 'eq'. 
Also remove_eq_conds() makes some evaluation of conds and if it founds that
conds is always false then update statement is not processed further.
All this allows to perform some update statements process faster due to
optimized conds, and not wasting resources if conds known to be false.
2005-10-28 01:24:11 +04:00
bell@sanja.is.com.ua
1b164c7b83 support of view underlying tables and SP functions security check added (BUG#9505) (WL#2787) 2005-10-28 00:18:23 +03:00
jani@ua141d10.elisa.omakaista.fi
cbe21a8eb6 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-27 23:43:20 +03:00
msvensson@neptunus.(none)
bb571de368 BUG#12985 Do-mysqlclient-test: Can't find -lyassl when linking
- Remove yassl_libsfrom CLIENT_LIBS var
 - Add yassl_libs to libmysql and libmysqld
2005-10-27 21:48:43 +02:00
monty@mysql.com
a9b1ff4095 Add DROP TABLE before trying to create view (in mysqldump)
Cleaned up xxxx_gis.test's and made gis_generic.inc independent of ndb
(Note that archive_gis.test fails, but this is independent of this patch)
2005-10-27 22:45:18 +03:00
monty@mysql.com
faba744caf Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-10-27 21:11:41 +03:00
jimw@mysql.com
7a8bd252d2 Merge mysql.com:/home/jimw/my/mysql-4.1-14009
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-27 10:20:38 -07:00
lenz@mysql.com
92266c95de Merge mysql.com:/data0/mysqldev/lenz/mysql-4.0
into mysql.com:/data0/mysqldev/lenz/mysql-4.1
2005-10-27 18:34:20 +02:00
mysqldev@mysql.com
b3263c032e - cleanup: removed the empty NEW-RPMS directory and all references
- cleanup: removed obsolete support-files/MacOSX/make_mysql_pkg.pl
   script (we now use Do-pkg for building OS X packages)
2005-10-27 18:32:14 +02:00
lenz@mysql.com
6b123044d0 - after merge fixes 2005-10-27 16:53:14 +02:00
evgen@moonbone.local
a57c08d468 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/13855-bug-4.1-mysql
2005-10-27 18:36:49 +04:00
evgen@moonbone.local
ec009d6963 select.result:
After merge fix
2005-10-27 18:36:11 +04:00
evgen@moonbone.local
71b731e92e Manually merged 2005-10-27 17:44:28 +04:00
aivanov@mysql.com
4a11f3cbd2 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/alexi/dev/mysql-4.1-innobase
2005-10-27 17:27:07 +04:00