mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
19841 commits 2791 branches 343 tags 1.7 GiB
Commit graph

19841 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
jimw@mysql.com
7510c45423 Fix merge of test that left out a drop table. 2005-10-21 19:54:34 -07:00
jimw@mysql.com
2d018862fa Merge mysql.com:/home/jimw/my/mysql-4.1-11203 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-21 17:57:51 -07:00
serg@serg.mylan
721873f7cd compilation failure fixed 2005-10-21 14:56:59 +02:00
bar@mysql.com
a167ddc6e7 Bug#13233 
select distinct char(column) fails with utf8
ctype_utf8.result, ctype_utf8.test:
  Adding test case
sql_yacc.yy:
  Adding new syntax.
item_strfunc.h:
  Fixing wrong max_length calculation.
  Also, adding CHAR(x USING charset),
  for easier migrating from 4.1 to 5.0,
  according to Monty's suggestion.
 2005-10-21 14:41:56 +05:00
jonas@perch.ndb.mysql.com
c8ca75264c Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
 2005-10-21 06:43:33 +02:00
jonas@perch.ndb.mysql.com
6f3caecffd bug#14199 - ndb leak of index opertaions in TC leading to error 288 2005-10-21 06:41:49 +02:00
sergefp@mysql.com
15a78334c3 BUG#9622, stage 2, work together with fix for BUG#12232: 
added "nulls_ignored" index statistics collection method for MyISAM tables.
(notification trigger: this is about BUG#9622).
 2005-10-21 06:29:17 +04:00
msvensson@neptunus.(none)
c7174f18f9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-10-20 10:28:52 +02:00
bar@mysql.com
af3d8bd4ad charset.c: 
Bug#13238 mysqldump and mysqladmin hangs
  Avoid recursion into init_available_charsets.
  Serg's version didn't work for me: I got 
  double mutex locking.
  Pushing this version instead
  (It was approved by Serg anyway)
 2005-10-20 10:30:51 +05:00
aivanov@mysql.com
2a7c88c50d Merge mysql.com:/home/alexi/mysql-4.1 
into  mysql.com:/home/alexi/dev/mysql-4.1-4375
 2005-10-19 21:07:08 +04:00
aivanov@mysql.com
e203a42dfc Fix for BUG#4375: Windows specific directories are copied 
during replication.
 Modified my_dir(). Now this function skips hidden and system
 files which sometimes are created by Windows.
 NOTE. The fix is similar to the previuos one (05 July 2004)
 except for correct setting of the 'attrib' variable value
 (within the previous fix this variable was left uninitialized
 when my_dir() was called with My_flags & MY_WANT_STAT == 0).
 2005-10-19 18:01:23 +04:00
jimw@mysql.com
746251a47c Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-18 10:49:28 -07:00
jimw@mysql.com
e284a57c88 Merge mysql.com:/home/jimw/my/mysql-4.1-13334 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-18 09:45:12 -07:00
jimw@mysql.com
162b3de29a Merge mysql.com:/home/jimw/my/mysql-4.1-13064 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-18 09:44:29 -07:00
jani@ua141d10.elisa.omakaista.fi
1b7a4abf59 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
 2005-10-18 18:04:00 +03:00
jani@ua141d10.elisa.omakaista.fi
8e1dac44b4 Some fixes to avoid compiler warnings. 2005-10-18 18:03:26 +03:00
sergefp@mysql.com
d6903c4566 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug12915-r2
 2005-10-18 14:08:50 +04:00