mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
22456 commits 2788 branches 343 tags 1.7 GiB
Commit graph

22456 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
gbichot@quadita2.mysql.com
d11607b08f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
 2005-05-05 14:40:10 +02:00
konstantin@mysql.com
ca9aeb5707 Post merge fixes (merge of Bug#9777) 2005-05-05 16:31:18 +04:00
gbichot@quadita2.mysql.com
b72ae4fe57 Approximative fixes for BUG#2610,2611,9100 i.e. WL#2146 binlogging/replication of routines (stored procs and functions). 
Approximative, because it's using our binlogging way (what we call "query"-level) and this is not as good as record-level binlog (5.1) would be. It imposes several
  limitations to routines, and has caveats (which I'll document, and for which the server will try to issue errors but that is not always possible).
  Reason I don't propagate caller info to the binlog as planned is that on master and slave
  users may be different; even with that some caveats would remain.
 2005-05-05 14:20:53 +02:00
konstantin@mysql.com
753959cd88 Manual merge 2005-05-05 13:47:09 +04:00
konstantin@mysql.com
15dbab1c12 A fix and test case for Bug#9777 " Empty set returned by Prepared Statement when it 
should return a non empty one"
(see comments for the changed files for details).
 2005-05-05 12:55:09 +04:00
kent@mysql.com
5198f49639 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
 2005-05-05 09:36:19 +02:00
kent@mysql.com
038ef8f865 mwcc-wrapper, compile-darwin-mwcc, mwar-wrapper: 
Initial Metrowerks CodeWarrior compiler support
  new file
 2005-05-05 09:34:15 +02:00
jan@hundin.mysql.fi
3cddcc63fa Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2005-05-05 10:15:15 +03: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
jan@hundin.mysql.fi
71f620890c Fig compiler error. 2005-05-05 08:08:39 +03:00
petr@mysql.com
25f44eab31 Merge pchardin@10.100.1.170:/home/bk/mysql-5.0 
into mysql.com:/home/cps/mysql/trees/mysql-5.0
 2005-05-04 19:35:33 +04:00
petr@mysql.com
560a908315 fix --defaults-file and --defaults-extra-file broken by a wrong merge 2005-05-04 18:46:29 +04:00
konstantin@mysql.com
c78b2d25ac Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/opt/local/work/mysql-5.0-root
 2005-05-04 17:21:49 +04:00
lenz@mysql.com
60c4ce90fc Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-bug9444
 2005-05-04 15:07:29 +02:00
lenz@mysql.com
74baaca4e5 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/space/my/mysql-5.0
 2005-05-04 15:06:53 +02:00
lenz@mysql.com
e4907dcdb7 Merge mysql.com:/space/my/mysql-4.1-bug9444 
into mysql.com:/space/my/mysql-5.0
 2005-05-04 15:00:18 +02:00
lenz@mysql.com
59930b6e84 - adjusted the start and stop priority level in the mysql.server init script for chkconfig on 
Red Hat Linux (BUG#9444) - we now match the levels used by the MySQL as shipped with Red Hat Linux
  (e.g. RHEL3/RHEL4)
 2005-05-04 14:58:43 +02:00
konstantin@mysql.com
0b6066e77a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/opt/local/work/mysql-5.0-root
 2005-05-04 16:54:36 +04:00
konstantin@mysql.com
70a6d6c9de Post-merge fixes for Bug#9096 "select doesn't return all matched 
records if prepared statements is used" (see comments to 
the changed files).
 2005-05-04 16:53:10 +04:00
joreland@mysql.com
f972fd2ee3 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-04 13:30:37 +02:00
joreland@mysql.com
ef23f4295f bug#10330 - linking with ndb fails 
changes to handling of new/delete cxa_pure_virtual has changed in mysys
  remove "ndb"'s own impl. as they are no longer needed as we link mysys at all places
 2005-05-04 13:29:15 +02:00
lenz@mysql.com
68dd50b10a Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/space/my/mysql-5.0
 2005-05-04 11:26:15 +02:00
jan@hundin.mysql.fi
91640e9d60 Initial value for a auto_increment can now be set using ALTER TABLE 
AUTO_INCREMENT = X; or CREATE TABLE .. AUTO_INCREMENT = X; This
change is backported from 5.0 (Bug #7061).
 2005-05-04 12:24:56 +03:00
jan@hundin.mysql.fi
df8380e0dd Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2005-05-04 12:24:55 +03:00
lenz@mysql.com
236754a534 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-05-04 11:24:54 +02:00
lenz@mysql.com
e84f31ad03 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2005-05-04 11:11:41 +02:00
lenz@mysql.com
d0334d932b Merge mysql.com:/space/my/mysql-4.1-build 
into mysql.com:/space/my/mysql-5.0-build
 2005-05-04 10:55:12 +02:00
lenz@mysql.com
210969a3d9 - added missing el_term.h to the source distribution (BUG#10352) 2005-05-04 10:49:42 +02:00
tulin@dl145b.mysql.com
ccac26a27a logging_ok: 
Logging to logging@openlogging.org accepted
NDBT_ResultRow.cpp, ndb_restore.test, ndb_restore.result:
  BUG#10287
 2005-05-04 10:16:03 +02:00
bell@book.sanja.is.com.ua
3be81d4299 Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0 
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-test-5.0
 2005-05-03 18:47:53 +03:00
konstantin@mysql.com
92e4e1a3f8 Manual merge of Bug#9096 2005-05-03 19:32:29 +04:00
konstantin@mysql.com
018b8025c0 Merge mysql.com:/opt/local/work/mysql-4.1-root 
into mysql.com:/opt/local/work/mysql-4.1-9096-fresh
 2005-05-03 12:49:22 +04:00
konstantin@mysql.com
3589e78fda A fix and test case for Bug#9096 "select doesn't return all matched 
records if prepared statements is used".
This fix changes equality evaluation method of basic constants from
by-name to by-value, thus effectively enabling use of parameter markers
in some optimizations (constants propagation, evaluation of possible
keys for query).
 2005-05-03 12:47:27 +04:00
sergefp@mysql.com
ee3bb57aa3 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-test-valgrind
 2005-05-03 07:42:36 +00:00
jan@hundin.mysql.fi
2f65c531a8 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2005-05-03 09:46:52 +03:00
sergefp@mysql.com
e9838c7c70 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-test-valgrind
 2005-05-03 10:23:10 +04:00
heikki@hundin.mysql.fi
e8233c3afc ha_innodb.cc: 
Return a value from innobase_repl_report_sent_binlog()
 2005-05-03 08:40:35 +03:00
jimw@mysql.com
395e51a0ef Update test results 2005-05-02 11:45:06 -07:00
jimw@mysql.com
36869043ec Resolve merge of fix for #8166. 2005-05-02 10:25:47 -07:00
jimw@mysql.com
5bd0fabd38 Merge mysql.com:/home/jimw/my/mysql-5.0-7293 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-05-02 10:20:54 -07:00
jimw@mysql.com
2d44d93ce6 Merge mysql.com:/home/jimw/my/mysql-5.0-5354 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-05-02 10:20:22 -07:00
jimw@mysql.com
7bab94f36b Clean up merge from 4.1 2005-05-02 10:19:37 -07:00
serg@serg.mylan
1727ac74a3 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-05-02 17:17:43 +02:00
jimw@mysql.com
8e87db9318 Merge mysql.com:/home/jimw/my/mysql-4.1-9947 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-02 08:12:27 -07:00
jimw@mysql.com
0b0e4f1166 Merge mysql.com:/home/jimw/my/mysql-4.1-9761 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-02 08:12:03 -07:00
jimw@mysql.com
7370017daf Merge mysql.com:/home/jimw/my/mysql-4.1-9136 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-02 08:11:32 -07:00
jimw@mysql.com
2aea94f483 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-02 08:05:58 -07:00
msvensson@neptunus.(none)
3e03f3bf1a Fix typo in ha_backhole.cc 2005-05-02 11:25:01 +02:00