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
19861 commits 2788 branches 343 tags 1.7 GiB
Commit graph

19861 commits

This branch
This branch
All branches
Author SHA1 Message Date
monty@mysql.com
19502e8eb5 Review of new pushed code 
Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)
Mark that add_time(), time_diff() and str_to_date() can return null values
 2005-11-01 13:00:02 +02:00
ramil@mysql.com
fdcb437bdf Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/mysql-4.1
 2005-11-01 09:52:45 +04:00
joerg@mysql.com
4c73ac6671 Accept any shared library for "libz", not just the static one. Bug#6584 2005-10-31 18:35:26 +01:00
ramil@mysql.com
afbd0fafd3 Check for NULLs only if we don't replace column results, 
get real results after all checks.
(see bug #14254: func_crypt.test fails on FreeBSD with --ps-protocol).
 2005-10-31 16:28:45 +04:00
hf@deer.(none)
5150bd8f9f Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.12839
 2005-10-31 12:24:43 +04:00
hf@deer.(none)
16c66d49ca Additional fix for #12839 2005-10-31 12:05:27 +04:00
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
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
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
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
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
kent@mysql.com
6a5a451cfb Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-10-25 02:36:51 +02:00
kent@mysql.com
4e44fead18 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread 
into mysql.com:/Users/kent/mysql/bk/mysql-4.0
 2005-10-25 02:29:08 +02:00
kent@mysql.com
257b17ba2f Makefile.am: 
Option to set environment variable MTR_BUILD_THREAD to a small
  number, from what mysql-test-run calculate port numbers that
  will not conflict with other runs with different thread num
 2005-10-25 02:27:55 +02:00
monty@mysql.com
3e653fb922 Added more tests for new UPDATE ... ORDER BY ... LIMIT optimization 2005-10-25 02:27:40 +03:00
sergefp@mysql.com
ea3ea9ed10 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-nulls-stats-r2
 2005-10-23 02:49:57 +04:00
sergefp@mysql.com
e3f623d6e8 BUG#9622: post-review-fixes: better comments 2005-10-23 02:46:10 +04:00