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

19814 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
sergefp@mysql.com
b91173af11 BUG#12915: post-review fixes 2005-10-18 14:04:14 +04:00
jonas@perch.ndb.mysql.com
d10326a3dc 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-17 09:56:56 +02:00
jonas@perch.ndb.mysql.com
a36faf33d3 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-17 09:55:30 +02:00
jonas@perch.ndb.mysql.com
f3f7f07131 ndb - hugo 
Disable tests of lock upgrade paths that are currently unsupported
 2005-10-17 09:51:16 +02:00
guilhem@mysql.com
b709578f1f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/mysql_src/mysql-4.1
 2005-10-14 15:35:57 +02:00
guilhem@mysql.com
845b9fbf58 fix for Valgrind errors: query_id needs to be inited early (already fixed in 5.0 by Konstantin) and so does client_capabilities (not fixed in 5.0); 
because they are used by net_printf() and push_warning(), which can be called if check_connection() fails.
 2005-10-14 15:34:52 +02:00
mskold@mysql.com
997e78c7f4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-10-14 11:52:52 +02:00
mskold@mysql.com
f9b58b0805 Fix for Bug #13961 Triggers on tables with auto_increment insert bogus values into table (clean version) 2005-10-14 11:23:02 +02:00
bar@mysql.com
48238e1b90 Merge mysql.com:/usr/home/bar/mysql-4.1.b13487 
into  mysql.com:/usr/home/bar/mysql-4.1
 2005-10-14 14:07:22 +05:00
bar@mysql.com
3369f5bd89 Merge mysql.com:/usr/home/bar/mysql-4.1.b13145 
into  mysql.com:/usr/home/bar/mysql-4.1
 2005-10-14 13:57:38 +05:00
bar@mysql.com
5df9c6c2a3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
 2005-10-14 11:54:10 +05:00
bar@mysql.com
58343bede3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
 2005-10-14 09:09:25 +05:00
bell@sanja.is.com.ua
f89b2ab09b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
 2005-10-14 00:04:40 +03:00
bell@sanja.is.com.ua
6d6e107f12 - set 'updating' in both tables list if we have two of them (because of subquery) (BUG#13236) 
- fixed test
 2005-10-14 00:02:38 +03:00
lenz@mysql.com
2115b397ca Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-10-13 22:29:50 +02:00
lenz@mysql.com
b72e1afbcc Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2005-10-13 22:11:49 +02:00
lenz@mysql.com
c93927eef0 - added a usermod call in the postinstall section of the RPM spec file 
to assign a potential existing mysql user to the correct user group (BUG#12823)
 2005-10-13 22:10:54 +02:00
lenz@mysql.com
a315d1be76 RPM spec file fixes: 
- added a usermod call to assign a potential existing mysql user to the
   correct user group (BUG#12823)
 - Save the perror binary built during Max build so it supports the NDB
   error codes (BUG#13740)
 - added a separate macro "mysqld_group" to be able to define the
   user group of the mysql user seperately, if desired.
 2005-10-13 22:01:02 +02:00
monty@mysql.com
829a4831b1 Fixes during review of new code 2005-10-13 19:24:01 +03:00
monty@mysql.com
852a745966 Use 4.1 code 2005-10-13 18:48:58 +03:00
joerg@mysql.com
952f0c461c Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2005-10-13 16:53:46 +02:00
hf@deer.(none)
19869bd19f Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.clean
 2005-10-13 19:53:45 +05:00
hf@deer.(none)
27d8bc5b1f merging 2005-10-13 19:51:07 +05:00