mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-02 09:13:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
19218 commits 2853 branches 349 tags 1.7 GiB
Commit graph

19218 commits

Author SHA1 Message Date
lenz@mysql.com
eb19f12fbf - manual merge from 4.0 into 4.1: used the local version of ha_innodb.cc, merged 
the rpm spec file changelog
 2005-08-04 12:35:13 +02:00
bar@mysql.com
1b40adcb06 grant.result, grant.test: 
fixing tests accordingly
item.cc:
  Bug  user variables not auto cast for comparisons
  When mixing strings with different character sets,
  and coercibility is the same, we allow conversion
  if one character set is superset for other character set.
 2005-08-04 15:25:03 +05:00
hf@deer.(none)
39ef54fd8e Fix for bug (errorlog file isn't closed) 
4.1 version of the patch
 2005-08-04 15:23:21 +05:00
lenz@mysql.com
307c920354 - Fixed the creation of the mysql user group account in the postinstall section of 
the MySQL-server RPM spec file (BUG#12348)
 2005-08-04 12:22:51 +02:00
lenz@mysql.com
08694dc2ac - fixed enabling the Archive storage engine for the mysqld-max RPM binary 2005-08-04 11:57:30 +02:00
hf@deer.(none)
e1fded437a merging 2005-08-04 14:06:40 +05:00
hf@deer.(none)
e53f24ab95 merging 2005-08-04 13:28:54 +05:00
jimw@mysql.com
f58e5033fb Skip two tests that fail on Windows that just reflect limitations of 
that platform, not real failures. (Bug , Bug )
 2005-08-03 17:38:55 -07:00
sasha@asksasha.com
c44fe70d02 patch for BUG#4680 - drop database breaking replication if there were extra files 
in the database directory on the master
 2005-08-03 18:08:20 -06:00
elliot@mysql.com
fc5829d651 BUG#12330 Adding updated result file which I missed in last changeset. 
Adds --replace_column to make test results deterministic.
 2005-08-03 16:12:06 -04:00
elliot@mysql.com
96dd197dd1 Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1 
into  mysql.com:/Users/emurphy/src/work/mysql-4.1-bug12330
 2005-08-03 15:20:21 -04:00
elliot@mysql.com
fcaff839de BUG#12330 Add --replace_column in order to make test deterministic. 2005-08-03 15:08:03 -04:00
joerg@mysql.com
3af1cec51b Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2005-08-03 20:11:06 +02:00
joerg@mysql.com
595e4ec3db Manual merge: Current 4.1.14 has precedence over 4.1.10b 2005-08-03 20:03:21 +02:00
lenz@mysql.com
7ce49334f8 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-08-03 19:52:38 +02:00
heikki@hundin.mysql.fi
ff111df4f1 Merge hundin.mysql.fi:/home/heikki/mysql-4.0 
into  hundin.mysql.fi:/home/heikki/mysql-4.1
 2005-08-03 18:58:43 +03:00
heikki@hundin.mysql.fi
353b3a2cad ha_innodb.cc: 
Fix compilation error in previous commit
 2005-08-03 18:47:50 +03:00
heikki@hundin.mysql.fi
82b2a0a366 buf0buf.c: 
Fix a bug: InnoDB could in a crash recovery print a big false corruption warning if the first page of an ibdata file was 'recreated' in the buffer pool; this could happen, for example, if a table was dropped, and the page used later
 2005-08-03 18:21:38 +03:00
heikki@hundin.mysql.fi
d1562a13dd Merge hundin.mysql.fi:/home/heikki/mysql-4.0 
into  hundin.mysql.fi:/home/heikki/mysql-4.1
 2005-08-03 18:18:43 +03:00
heikki@hundin.mysql.fi
c9c6b82404 ha_innodb.cc: 
Backport of Bug  to 4.0: assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED)
 2005-08-03 18:11:55 +03:00
hf@deer.(none)
a64c9aae3a Merge bk@192.168.21.1:/usr/home/bk/mysql-4.0 
into deer.(none):/home/hf/work/mysql-4.0.10226
 2005-08-03 18:09:05 +05:00
lenz@mysql.com
6893e5969a Portability fixes: 
- Moved a few DBUG_ENTER statements after the variable declarations to satisfy some
   compilers (e.g. gcc-2.95.x, gcc-2.96, IBM xlc_r) in ndb/src/common/portlib/NdbMutex.c
   and ndb/src/common/portlib/NdbThread.c
 - portability fix for FreeBSD 4.x and HPUX: replaced atoll() with strtoll() in 
   ndb/tools/config.cpp
 2005-08-03 13:46:38 +02:00
stewart@mysql.com
98d8c2fbe8 BUG#11538 mysql compile fails with certain ndb options 
--with-ndb-ccflags would include "yes" as a CFLAG and pass it to GCC (who didn't agree).
 2005-08-03 17:52:43 +10:00
sasha@asksasha.com
bb76e143a3 The earlier commit for BUG#10456 did not add the test file 2005-08-02 15:15:28 -06:00
sasha@asksasha.com
302c85cbb3 Added a test case for BUG#10456 2005-08-02 15:13:56 -06:00
igor@rurik.mysql.com
5e851429de item_sum.cc: 
Reversed the changes to fix bug  after review
  done by SergeyG. Applied a fix suggested by him.
  Added my comment.
 2005-08-02 13:12:41 -07:00
igor@rurik.mysql.com
8420d76f8d sql_select.cc, sql_class.h: 
Reversed the changes to fix bug  after review
  done by SergeyG. Applied a fix suggested by him.
 2005-08-02 11:58:52 -07:00
jimw@mysql.com
4340fa114e Fix parsing of dates with 'T' between date and time, as in ISO-8601 
date format. (Bug )
 2005-08-02 11:31:01 -07:00
lenz@mysql.com
1e2e10afac Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2005-08-02 14:16:09 +02:00
lenz@mysql.com
9217c90a77 - Fixed the Requires: tag for the server RPM (BUG#12233), make sure to list all 
required commands/packages so the installation succeeds. Removed the superflouus
  Requires field from the source RPM.
 2005-08-02 13:59:02 +02:00
svoj@mysql.com
007de019ce Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/svoj/devel/mysql/BUG12075/mysql-4.1
 2005-08-02 14:28:30 +05:00
svoj@mysql.com
315e4efc3f Fix for BUG#12075. 
FULLTEXT non-functional for big5 strings
 2005-08-02 14:27:52 +05:00
svoj@mysql.com
a4d6113d22 After merge fix. 2005-08-02 12:57:26 +05:00
svoj@mysql.com
0f98bf44ef Merge mysql.com:/home/svoj/devel/mysql/BUG11684/mysql-4.0 
into  mysql.com:/home/svoj/devel/mysql/BUG11684/mysql-4.1
 2005-08-02 12:12:37 +05:00
svoj@mysql.com
19fe33e16c BUG#11684 fix. 
Repair crashes mysql when table has fulltext index.
 2005-08-02 11:33:26 +05:00
jimw@mysql.com
ca56883011 Merge mysql.com:/home/jimw/my/mysql-4.1-9947 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-01 17:12:30 -07:00
jimw@mysql.com
c3e40306b7 Merge mysql.com:/home/jimw/my/mysql-4.1-11402 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-01 17:11:49 -07:00
jimw@mysql.com
9a5560683f Merge mysql.com:/home/jimw/my/mysql-4.1-10724 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-01 17:10:35 -07:00
sasha@asksasha.com
3055ce9ecc Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1
 2005-08-01 13:34:04 -06:00
patg@krsna.patg.net
8109934e1d BUG 11104 (same as changeset 1.1891 on the 5.0 tree, but realised this 
needed to be fixed in earlier versions)
Fixed the iteration of how substrings are handled with negative indexes in 
SUBSTRING_INDEX
 2005-07-31 21:28:52 -07:00
igor@rurik.mysql.com
da33db7558 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-07-31 04:33:15 -07:00
igor@rurik.mysql.com
620f865cbb null_key.result, null_key.test: 
Modified test case for bug .
 2005-07-31 04:28:01 -07:00
igor@rurik.mysql.com
f8375c6cb3 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2005-07-31 02:36:21 -07:00
igor@rurik.mysql.com
fea0fb2c8b Fixed bug : a join query with GROUP_CONCAT over a single row table. 
If GROUP_CONCAT is calculated we always put its argument into a temp
table, even when the argument is a constant item.
 2005-07-31 02:32:33 -07:00
sasha@asksasha.com
fa7897c62a updates for BUG#10780 - fixed slave I/O thread running status to No while attempting 
to connect
 2005-07-29 21:00:28 -06:00
georg@lmy002.wdf.sap.corp
10615d54fb fix for bug#12665 
macro floatget was missing in config-win.h
 2005-07-29 14:51:08 +02:00
hf@deer.(none)
c396a32f46 Fix for bug (query_cache test fails) 
notembedded-specific part moved to the new test
 2005-07-29 17:14:21 +05:00
joerg@mysql.com
3503b1316e Security fix in "zlib": 
- upgrade zlib to 1.2.2
  (originally:  2005/03/23 21:08:13+01:00 serg@serg.mylan )
- fixed linking with zlib
  (originally:  2005/05/24 22:42:43+02:00 lenz@mysql.com )
- one more build fix for zlib.lib - added libpath to the mysql_test_run_new project files
  (originally:  2005/05/25 10:55:21+02:00 lenz@mysql.com )
- Do not build the RPMs statically on i386 by default, only when adding either
  "--with static" or "--define '_with_static 1'" to the RPM build options.
  Static linking really only makes sense when linking against the specially patched
  glibc 2.2.5.
  (originally:  2005/06/14 21:39:08+02:00 lenz@mysql.com )
- Apply security patch to bundled zlib for CAN-2005-2096. (Bug )
  (originally:  2005/07/11 10:37:21-07:00 jimw@mysql.com )
- applied a security fix to inftrees.h from the bundled zlib to resolve a second
  potential zlib security vulnerability (CAN-2005-1849). Fix was taken from the
  official zlib-1.2.3 distribution (no other zlib-1.2.3 changes were applied)
  (originally:  2005/07/27 14:55:08+02:00 lenz@mysql.com )
- build the RPM binaries against the bundled zlib, when static linking is requested
  (originally:  2005/07/27 16:42:13+02:00 lenz@mysql.com )
 2005-07-29 13:49:25 +02:00
lenz@mysql.com
c36a0fa5ac - fixed a typo in C++Files/client/mysqlclient_ia64.dsp: ctype-cp963.c -> ctype-cp932.c 
(thanks to JoergB for spotting it)
 2005-07-29 12:37:27 +02:00
joerg@mysql.com
1b4e19f3e6 Increase version number (prepare for new build including security fixes in "zlib"). 2005-07-29 11:54:22 +02:00