mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
24002 commits 2780 branches 343 tags 1.6 GiB
Commit graph

832 commits

Author SHA1 Message Date
ndbdev@dl145b.mysql.com
558488d592 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-16 19:10:32 +02:00
joerg@mysql.com
bd0386839c "configure.in": Correct equality comparison: In shell 'test', it is single '=' (bug#11007). 2005-06-16 13:44:08 +02:00
ndbdev@dl145b.mysql.com
8d44b54295 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-10 07:22:27 +02:00
jimw@mysql.com
153f233627 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-06-09 19:27:45 -07:00
jimw@mysql.com
927418b199 Make sure we don't mistake a "grep mysqld" for a mysqld process 
when checking if the server is running in mysqld_safe. (Bug #11122)
 2005-06-08 18:57:39 -07:00
joerg@mysql.com
bccd45ca03 Builds of 5.0.7 have begun, so anything added into this tree here will go into 5.0.8. 2005-06-07 19:28:43 +02:00
ndbdev@dl145b.mysql.com
2fb1fb5877 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-07 06:50:50 +02:00
monty@mysql.com
775f17667b Merge with 4.1 2005-06-07 00:31:53 +03:00
serg@serg.mylan
6a5349028c a compiler must see '#pragma implementation' *before* 
'#pragma interface' (that comes with the #include'd header file)
 2005-06-05 19:38:52 +02:00
tomas@poseidon.ndb.mysql.com
85d0906201 configure.in: 
merge
 2005-06-02 00:52:51 +02:00
tomas@poseidon.ndb.mysql.com
925548d349 Merge 2005-06-02 00:51:30 +02:00
lenz@mysql.com
9afd2563e9 Merge of 4.1 -> 5.0 2005-06-01 15:11:14 +02:00
lenz@mysql.com
e877e71b17 Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2005-06-01 13:06:15 +02:00
lenz@mysql.com
7bd3dd7cb3 - removed references to some obsolete files (BUG#10824) 
- removed obsolete mysql-max.spec.sc RPM spec file (Max is built out of the standard
  spec file)
 2005-06-01 12:59:10 +02:00
lenz@mysql.com
c58535f6d3 - merged the 4.1.12a Changes back into the main tree 2005-05-26 11:43:47 +02:00
lenz@mysql.com
4a296d4f00 - bumped up version number string to 4.1.12a 2005-05-24 15:14:21 +02:00
msvensson@neptunus.(none)
3f97312341 Change to 5.0.7(again) 2005-05-20 00:04:43 +02:00
msvensson@neptunus.(none)
08d8be1461 Cset exclude: matt@mysql.com|ChangeSet|20050519052223|06259 
Cset exclude: msvensson@neptunus.(none)|ChangeSet|20050425090838|60886
 2005-05-19 23:52:17 +02:00
tulin@dl145c.mysql.com
be861a7ccf merge 2005-05-19 09:04:24 +02:00
matt@mysql.com
8091707afe configure.in: 
Increment to next version.
 2005-05-19 07:22:23 +02:00
tulin@dl145c.mysql.com
03590c20bd merge 2005-05-18 22:26:23 +02:00
jimw@mysql.com
3f6aad900c Resolve merge from 4.1 2005-05-18 11:06:34 -07:00
monty@mysql.com
db40af2a6f Fix warnings from icc 
Added BUILD scripts for icc
Fixed (one time) memory leak in grant handling
 2005-05-18 19:00:21 +03:00
matt@mysql.com
8ed0aaacdf Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/data0/mysqldev/my/mysql-4.1-build
 2005-05-18 04:06:27 +02:00
ndbdev@dl145c.mysql.com
1513aad1e9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-05-17 20:07:03 +02:00
serg@serg.mylan
56fa40e558 sql_yacc.yy: 
missing semicolon added
sql_base.cc:
  bad merge fixed
sp_head.cc, view.test, view.result:
  Correct restoring view name in SP table locking BUG#9758
configure.in:
  restore -fno-implicit-templates -fno-exceptions -fno-rtti in configure
 2005-05-17 17:08:43 +02:00
tulin@dl145c.mysql.com
23f79bd1f2 merge 2005-05-17 10:17:53 +02:00
msvensson@neptunus.(none)
ffd6f926ca Build fixes 2005-05-16 11:24:41 +02:00
konstantin@mysql.com
89bd09fed2 Manual merge (again) 2005-05-14 12:38:12 +04:00
lenz@mysql.com
f6593cb7d4 - added a check for "u_int32_t" to configure.in that will define 
HAVE_U_INT32_T when available (needed to fix a double typedef in
  libedit)
 2005-05-12 18:18:37 +02:00
kent@mysql.com
7c65e20e32 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
 2005-05-10 13:56:08 +02:00
kent@mysql.com
faf8f825b5 Makefile.am, configure.in: 
Enable creation of embedded lib when --with-darwin-mwcc
 2005-05-10 13:53:47 +02:00
kent@mysql.com
2f9a28b4cc configure.in: 
Bumped up version number to indicate 4.1.12 was branched off
 2005-05-09 18:14:10 +02:00
gbichot@production.mysql.com
a1948f769c [backport of 4.1, because 4.0 autobuild now hits the same problem; 
when merging just use "ul"] In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile.
 2005-05-07 11:35:14 +02:00
lars@mysql.com
05cbb3962c Manual merge 5.0->5.1 2005-05-06 15:04:07 +02:00
shuichi@mysql.com
2244ae8cef Added cp932 character set 2005-05-05 11:37:52 -07:00
serg@sergbook.mylan
6b053194db Merge bk-internal:/home/bk/mysql-5.0 
into sergbook.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-05-05 16:22:32 +02:00
serg@sergbook.mylan
83dfc216a7 gcc 2.92 compatibility 2005-05-05 16:21:17 +02:00
konstantin@mysql.com
753959cd88 Manual merge 2005-05-05 13:47:09 +04:00
kent@mysql.com
c4acdc6e0f terminal.c, sql_bitmap.h, my_sys.h, configure.in, config.h: 
Initial Metrowerks CodeWarrior compiler support
 2005-05-05 09:15:14 +02:00
tomas@poseidon.ndb.mysql.com
4f1e27ed00 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
 2005-05-03 00:10:52 +02:00
tomas@poseidon.ndb.mysql.com
145ae3c6f5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
 2005-05-02 13:18:26 +02:00
serg@serg.mylan
530b6ba541 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-05-01 23:10:55 +02:00
serg@serg.mylan
9c332d8d2a yassl changeset 2: 
remove FIX_GCC_LINKING_PROBLEM and -DDEFINE_CXA_PURE_VIRTUAL
  replace echo in configure.in with AC_MSG_WARN/AC_MSG_ERROR
  don't set -DUSE_MYSYS_NEW for gcc 2.95
  set $USE_MYSYS_NEW even if CXX is g++
  yassl bugfixes
  instantiate all yassl templates explicitly
 2005-04-30 19:48:45 +02:00
monty@mysql.com
28a5491d3d Merge with 4.1 2005-04-30 09:46:08 +03:00
serg@serg.mylan
328f2e434a Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-04-29 19:31:56 +02:00
jimw@mysql.com
bc27c14ea9 Merge mysql.com:/home/jimw/my/mysql-4.0-9690 
into mysql.com:/home/jimw/my/mysql-4.0-clean
 2005-04-29 08:26:33 -07:00
monty@mysql.com
fbf31c4a8c CAST(string_argument AS UNSIGNED) didn't work for big integers above the signed range. (Bug #7036) 
Produce warnings of wrong cast of strings to signed/unsigned.
Don't block not resolved IP's if DNS server is down (Bug #8467)
Fix compiler problems with MinGW (Bug #8872)
 2005-04-29 17:03:34 +03:00
serg@serg.mylan
e9b0411110 Merge 2005-04-29 15:44:24 +02:00
jimw@mysql.com
b31960f71d Fix tiny typo in configure.in 2005-04-28 07:47:59 -07:00