mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
56409 commits 2778 branches 343 tags 1.6 GiB
Commit graph

724 commits

Author SHA1 Message Date
kent@kent-amd64.(none)
65183d54d2 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-11-29 14:28:05 +01:00
kostja@bodhi.local
2525e16c73 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-11-29 11:44:37 +03:00
kostja@bodhi.local
5fea0724bc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-11-29 02:44:12 +03:00
kostja@bodhi.local
bf3fbb44ae Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
 2006-11-29 02:39:17 +03:00
kent@kent-amd64.(none)
2264dc7da0 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-11-28 18:31:53 +01:00
gkodinov@dl145s.mysql.com
32c9e11df9 Merge bk-internal:/home/bk/mysql-5.1 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-11-28 17:14:16 +01:00
kent@kent-amd64.(none)
e99c548bcd Merge mysql.com:/home/kent/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/mysql-5.1
 2006-11-27 23:12:05 +01:00
kent@mysql.com/kent-amd64.(none)
029dbbc2b2 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/mysql-5.0-merge
 2006-11-27 21:45:16 +01:00
kent@mysql.com/kent-amd64.(none)
12c3e410d4 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/kent/bk/mysql-4.1-merge
 2006-11-27 21:38:53 +01:00
kent@mysql.com/kent-amd64.(none)
cbe9d22927 Merge mysql.com:/home/kent/bk/mysql-4.1 
into  mysql.com:/home/kent/bk/mysql-5.0
 2006-11-27 18:47:07 +01:00
kent@mysql.com/kent-amd64.(none)
6c85ba399d gen_rec.awk: 
Fix undefined behaviour.
Many files:
  Reenabled build outside ource tree
 2006-11-27 18:29:50 +01:00
gkodinov@dl145s.mysql.com
e74c9add47 Merge bk-internal:/home/bk/mysql-5.0 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-11-27 16:25:52 +01:00
monty@nosik.monty.fi
89570bf966 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-11-22 14:11:36 +02:00
monty@mysql.com/nosik.monty.fi
e825879800 Remove compiler warnings 
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)
 2006-11-20 22:42:06 +02:00
holyfoot/hf@deer.(none)
dd0b81885d Merge mysql.com:/home/hf/work/mysql-5.0-mrg 
into  mysql.com:/home/hf/work/mysql-5.1-mrg
 2006-11-17 18:27:28 +04:00
kroki/tomash@moonlight.intranet
f6e4e2317e Fix after manual merge: remove dead declaration. 2006-11-17 13:56:11 +03:00
kroki/tomash@moonlight.intranet
1f699a4422 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23383 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug23383
 2006-11-17 12:33:59 +03:00
kroki/tomash@moonlight.intranet
6d4558f7c3 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23383 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23383
 2006-11-17 12:30:26 +03:00
kroki/tomash@moonlight.intranet
5e2ef3a68e BUG#23383: mysql_affected_rows() returns different values than 
mysql_stmt_affected_rows()

The problem was that affected_rows for prepared statement wasn't updated
in the client library on the error.  The solution is to always update
affected_rows, which will be equal to -1 on the error.
 2006-11-17 12:21:32 +03:00
holyfoot/hf@mysql.com/deer.(none)
497ccd6b87 Merge mysql.com:/home/hf/work/mysql-4.1-mrg 
into  mysql.com:/home/hf/work/mysql-5.0-mrg
 2006-11-16 23:16:44 +04:00
holyfoot/hf@deer.(none)
385541131b Merge mysql.com:/home/hf/work/embt/my50-embt 
into  mysql.com:/home/hf/work/embt/my51-embt
 2006-11-13 20:16:46 +04:00
holyfoot/hf@mysql.com/deer.(none)
7ece4caad3 several fixes to make tests pass in embedded-server mode 2006-11-13 20:06:45 +04:00
holyfoot/hf@mysql.com/deer.(none)
7805cdef84 Merge mysql.com:/home/hf/work/embt/my41-embt 
into  mysql.com:/home/hf/work/embt/my50-embt
 2006-11-13 10:45:22 +04:00
holyfoot/hf@mysql.com/deer.(none)
6e0045ed20 embedded-mode tests fixed 2006-11-13 10:39:15 +04:00
mmj@tiger.local[mmj]
da721fe7aa Bug #23427: incompatible ABI change in 5.0.26? 
Revert 1 June change enough to restore ABI compatibility with previous
versions.
 2006-10-24 19:05:11 +02:00
holyfoot/hf@deer.(none)
e203abf0a1 Merge mysql.com:/home/hf/work/current_stmt/my50-current_stmt 
into  mysql.com:/home/hf/work/current_stmt/my51-current_stmt
 2006-10-24 17:53:15 +05:00
holyfoot/hf@mysql.com/deer.(none)
887e6af60c Merge mysql.com:/home/hf/work/0current_stmt/my41-current_stmt 
into  mysql.com:/home/hf/work/current_stmt/my50-current_stmt
 2006-10-24 17:50:46 +05:00
holyfoot/hf@mysql.com/deer.(none)
d0ef58b6a4 Bug #23427 (incompatible ABI change) 
the incompatibility was caused by current_stmt member added to the MYSQL
structure.
It's possible to move it to THD structure instead which saves ABI
 2006-10-24 17:19:02 +05:00
cmiller@zippy.cornsilk.net
b96ab282ea Bug #23427: incompatible ABI change in 5.0.26? 
Revert 1 June change enough to restore ABI compatibility with previous
versions.
 2006-10-20 17:17:24 -04:00
holyfoot/hf@mysql.com/deer.(none)
ff25d2b71a libmysqld/Makefile.am fixed 2006-10-19 16:39:24 +05:00
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
1ddf03dab1 Makefile.am: 
Quote variable in "for"-loop head, in case it can be empty.
 2006-10-19 04:38:16 +02:00
holyfoot/hf@mysql.com/deer.(none)
b8e31d05f1 bug #23369 (Embedded library can't be linked) 
Problem is that some files moved to storage/*/ still are dependent
on sql/ code (usually use members of THD structure)
that can get different being compiled with another #define-s
Code added to recompile these for the embedded server
 2006-10-18 17:03:37 +05:00
dlenev@mockturtle.local
5ba1b83c98 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
 2006-09-14 23:53:35 +04:00
rburnett@bk-internal.mysql.com
cf1a0b3250 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-09-11 16:43:56 +02:00
brian@zim.(none)
5e46ea7f03 Moves Innodb handler to the Innodb storage directory. 2006-09-07 08:23:58 -07:00
rburnett@production.mysql.com
926d98d973 Merge production.mysql.com:/usersnfs/rburnett/tmp_merge2 
into  production.mysql.com:/usersnfs/rburnett/mysql-5.1
 2006-09-06 18:27:26 +02:00
ahristov@bk-internal.mysql.com
75eeececb1 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-runtime 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-wl3337
 2006-09-06 14:35:27 +02:00
brian@zim.(none)
7216b5bc7a Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/home/brian/mysql/arch-5.1
 2006-08-25 14:07:30 -07:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
b68f0437e7 fix for windows build 2006-08-24 22:10:55 -07:00
kent@mysql.com/g4-2.local
b329f2c3ef Many files: 
Deleted config/ac-macros/ha_berkeley.m4
  Removed more referenses to bdb
 2006-08-21 15:34:29 +02:00
brian@zim.(none)
f68ce0ddef This changeset moves the ha_myisam files to their storage directories. It also includes updates for all engines include patch for windows builds. 2006-08-19 17:38:42 -07:00
brian@zim.(none)
800e348740 Update to push all of merge into the merge storage directory. 2006-08-19 10:23:22 -07:00
brian@zim.(none)
849fac1496 Moved heap into its own directory. 2006-08-19 08:02:52 -07:00
holyfoot/hf@mysql.com/deer.(none)
4d8e38a693 bug #16513 (no mysql_set_server_option in libmysqld.dll export) 2006-08-19 15:15:36 +05:00
brian@zim.(none)
4d7f7fb878 Removed warnings for Windows build issues. Edited Windows README to remove reference to BDB. 2006-08-14 14:45:48 -07:00
andrey@example.com
53089a19d9 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 
into  example.com:/work/mysql-5.1-runtime-wl3337
 2006-08-14 15:26:59 +02:00
baker/brian@zim.(none)
5a466cc48c Removed bdb test cases. 2006-08-10 18:29:25 -07:00
brian@zim.(none)
c37e1b4839 First stage removeal of BDB. 2006-08-09 17:33:08 -07:00
patg@govinda.patg.net
8d1e5a5bb1 Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-holyfoot 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-5.0-merge2

Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:

bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
 2006-08-08 09:01:32 -07:00
jimw@rama.(none)
f7e19b40f3 Merge rama.(none):/home/jimw/my/tmp_merge 
into  rama.(none):/home/jimw/my/mysql-5.1-clean
 2006-07-28 15:51:48 -07:00