mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
20123 commits 2784 branches 343 tags 1.6 GiB
Commit graph

20123 commits

This branch
This branch
All branches
Author SHA1 Message Date
jimw@mysql.com
b919b29da6 Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-28 18:52:10 -07:00
jimw@mysql.com
27685c0c47 Merge mysql.com:/home/jimw/my/mysql-4.1-13811 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-28 18:43:52 -07:00
patg@krsna.patg.net
22fe31e4d4 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  krsna.patg.net:/home/patg/mysql-build/mysql-4.1
 2005-10-28 18:23:23 -07:00
jimw@mysql.com
0e572ff475 Merge mysql.com:/home/jimw/my/mysql-4.1-13796 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-28 18:19:19 -07:00
jimw@mysql.com
e55f906130 Fix bug in handling of decimal fields in UNION statements that could 
cause a crash or write to an incorrect memory location. (Bug #14216)
 2005-10-28 18:12:57 -07:00
sergefp@mysql.com
8b9bab2763 Fix for BUG#13814: in mi_pack_key(), when processing NULL value for TINYBLOB key segment, 
do advance the source pointer over 2 bytes that specify value length.
 2005-10-28 23:31:32 +04:00
sergefp@mysql.com
f220d87476 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug14139
 2005-10-28 21:42:01 +04: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
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
lenz@mysql.com
0f3192323c - fixed RPM spec file list after merge, removed dupes 2005-10-28 10:46:07 +02:00
jonas@perch.ndb.mysql.com
e02f4eac38 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
 2005-10-28 10:11:08 +02: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
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
jonas@perch.ndb.mysql.com
bfb8a71f2c bug#13078 - ndb 
memleak when doing ordered index scan on index with column larger than 32 bytes
     (recommit for merge to 5.0)
 2005-10-27 17:14:17 +02:00
lenz@mysql.com
6b123044d0 - after merge fixes 2005-10-27 16:53:14 +02:00
jonas@perch.ndb.mysql.com
11563cfc5e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
 2005-10-27 16:47:09 +02:00
jonas@perch.ndb.mysql.com
d54a54c7ab bug#13078 - ndb 
memleak when doing ordered index scan on index with column larger than 32 bytes
 2005-10-27 16:41:55 +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
lenz@mysql.com
f793d7b5bf - Removed obsolete and outdated man page files from the man 
directory - these files are now maintained in the mysqldoc
   repository and included in the source distribution during the
   release build. Updated the configure.in script and Makefiles to
   create the man page file list at build time
 - Updated the file list in the RPM spec file to include all currently
   available man pages (this can not be done with wildcards, as
   the man pages are spread across several subpackages. However, RPM
   warns about unpackaged files, so newly added man pages can be 
   spotted)
 2005-10-27 14:51:58 +02:00
bar@mysql.com
1c64b2c027 conf_to_src.c: 
Dump MY_CS_CSSORT when it's necessary.
 2005-10-27 17:40:21 +05:00
bar@mysql.com
8bd04bf769 conf_to_src.c: 
Updating to conform the current CHARSET_INFO structure.
 2005-10-27 16:48:49 +05:00
bar@mysql.com
dfe9480497 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b13347
 2005-10-27 13:41:09 +05:00
patg@krsna.patg.net
bd0497ce3b Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  krsna.patg.net:/home/patg/mysql-build/mysql-4.1
 2005-10-26 09:22:47 -07:00
aivanov@mysql.com
a9a127e0bc Removed innobase/my_cnf, innobase/include/makefilewin.i, 
and innobase/*/makefilewin (which are unused now).
 2005-10-26 20:06:08 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
0e6b53f172 Imported fix from 5.0. 2005-10-26 16:12:41 +03:00
kent@mysql.com
a2d7a9da90 mysql-test-run.pl: 
Added MTR_BUILD_THREAD to control the port range
 2005-10-26 01:24:03 +02:00
kent@mysql.com
5561697158 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-10-25 23:56:08 +02:00
kent@mysql.com
983b7ad153 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/Users/kent/mysql/bk/mysql-4.0
 2005-10-25 23:52:18 +02:00
patg@krsna.patg.net
7243b7bb49 BUG# 12123 
Made change to mysqlimport to set character_set_database to binary to 
make importing various charsets/columns work correctly.
 2005-10-25 14:50:08 -07:00
sergefp@mysql.com
2219ada7f6 BUG#14139: When handling "CREATE TABLE(field_X type_spec,...) SELECT smth AS field_X, ...." 
avoid multiplying length of field_X by charset->mbmaxlen twice when calculating space 
required for field_X in the new table.
 2005-10-26 00:56:17 +04:00
jimw@mysql.com
a01cd74647 Merge mysql.com:/home/jimw/my/mysql-4.1-12925 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-25 10:11:47 -07:00
jimw@mysql.com
e8eed35c6a Fix incorrect casts in my_getopt code that capped the maximum of longlong 
options to the wrong value. (Bug #12925)
 2005-10-25 10:10:53 -07:00
evgen@moonbone.local
b5d426623f Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/14016-bug-4.1-mysql
 2005-10-25 20:37:45 +04:00
evgen@moonbone.local
90cf3e78f0 Fix bug #14016 date_format() 2nd parameter was compared using case insensitive 
collation

By default constant strings in second parameter of date_time() have case
insensitive collation. Because of this expressions date_format(f,'%m') and 
date_format(f,'%M') wrongly becomes equal, which results in choosing wrong 
column to sort by.

Now if second parameter of date_format() is constant then it's collation is 
changed to case sensitive.
 2005-10-25 20:37:26 +04:00
evgen@moonbone.local
1d30f8e082 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/13392-bug-4.1-mysql
 2005-10-25 20:04:44 +04:00
evgen@moonbone.local
8cb0dff904 Fix bug#13392 Wrong VALUES() behaviour in INSERT SELECT with ON DUPLICATE 
VALUES() can only refer to table insert going to. 
But Item_insert_value::fix_fields() were passing to it's arg full table list,
This results in finding second column which shouldn't be found, and
failing with error about ambiguous field.

Item_insert_value::fix_fields() now passes only first table of full table
list.
 2005-10-25 20:04:12 +04:00
jani@ua141d10.elisa.omakaista.fi
3e599c0907 Imported fixes from 4.1 and 5.0 to 4.0. 2005-10-25 16:56:25 +03:00
joerg@mysql.com
6d1821f2e6 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2005-10-25 13:59:25 +02:00
bar@mysql.com
a6e1f72d84 Bug#13347: empty result from query with like and cp1250 charset 
ctype-win1250ch.c:
  Like range prefix tables were wrong.
ctype_cp1250_ch.result, ctype_cp1250_ch.test:
  Adding test case.
 2005-10-25 14:49:04 +05:00
jani@ua141d10.elisa.omakaista.fi
3042591a9f Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
 2005-10-25 12:12:10 +03:00
jani@ua141d10.elisa.omakaista.fi
45066745cc Changed some dbug print options. 2005-10-25 12:11:31 +03:00