mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 20:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
43271 commits 2794 branches 343 tags 1.5 GiB
Commit graph

43271 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
3ae2a4411d Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2007-03-02 19:04:15 +01:00
unknown
0336a967f2 Merge trift2.:/MySQL/M50/manpages-5.0 
into  trift2.:/MySQL/M51/manpages-5.1


support-files/mysql.spec.sh:
  Manual merge, adapting to additional "embedded" files in 5.1
 2007-03-02 17:15:13 +01:00
unknown
b2c6d33efd Merge trift2.:/MySQL/M41/manpages-4.1 
into  trift2.:/MySQL/M50/manpages-5.0


support-files/mysql.spec.sh:
  Manual merge, adapting to expanded 5.0 filelist.
 2007-03-02 17:01:24 +01:00
unknown
a74c8eaf9c Merge trift2.:/MySQL/M40/manpages-4.0 
into  trift2.:/MySQL/M41/manpages-4.1


support-files/mysql.spec.sh:
  SCCS merged
 2007-03-02 16:34:29 +01:00
unknown
56eae45c8f More man pages for the RPMs. 
support-files/mysql.spec.sh:
  More man pages.
 2007-03-02 16:32:27 +01:00
unknown
b73f17fb77 Another man page in the RPMs. 
support-files/mysql.spec.sh:
  Another man page.
 2007-03-02 16:30:22 +01:00
unknown
614a55512f Merge trift2.:/MySQL/M50/manpages-5.0 
into  trift2.:/MySQL/M51/manpages-5.1


support-files/mysql.spec.sh:
  Auto merged
 2007-03-02 14:23:12 +01:00
unknown
35c841fb82 Merge trift2.:/MySQL/M41/manpages-4.1 
into  trift2.:/MySQL/M50/manpages-5.0


support-files/mysql.spec.sh:
  Null-merge, the equivalent fix here is a change of its own.
 2007-03-02 14:20:43 +01:00
unknown
00179853d4 Merge trift2.:/MySQL/M40/manpages-4.0 
into  trift2.:/MySQL/M41/manpages-4.1


support-files/mysql.spec.sh:
  Null-merge, the equivalent fix here is a change of its own (NDB).
 2007-03-02 14:17:04 +01:00
unknown
ceab5d2fed Add man pages for NDB to the RPMs. 
support-files/mysql.spec.sh:
  Add man pages for NDB.
 2007-03-02 14:13:13 +01:00
unknown
9e290476f8 Add the man pages for NDB to the RPMs. 
support-files/mysql.spec.sh:
  Add the man pages for NDB.
 2007-03-02 14:08:32 +01:00
unknown
622533fa81 Add the man pages for NDB to the RPMs. 
support-files/mysql.spec.sh:
  Add the man pages for NDB.
 2007-03-02 14:05:43 +01:00
unknown
d26369327e Add missing man pages to the RPMs. 
support-files/mysql.spec.sh:
  Add missing man pages.
 2007-03-02 14:03:28 +01:00
unknown
7124d328bb Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-02 00:56:59 +01:00
unknown
10f632a1cb mysql.sln: 
Correction of embedded build types


VC++Files/mysql.sln:
  Correction of embedded build types
 2007-03-02 00:54:02 +01:00
unknown
a31c7d3994 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-02 00:00:55 +01:00
unknown
fe3711254c mysql.sln: 
Disabled build of all embedded server libraries, "libmysqld.ldd"
  "mysqldemb.lib" and "mysqlserver.lib"


VC++Files/mysql.sln:
  Disabled build of all embedded server libraries, "libmysqld.ldd"
  "mysqldemb.lib" and "mysqlserver.lib"
 2007-03-01 23:48:22 +01:00
unknown
462e3982c5 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1


scripts/make_binary_distribution.sh:
  Auto merged
 2007-03-01 13:48:35 +01:00
unknown
f835ac88b8 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


Docs/Makefile.am:
  Auto merged
 2007-02-28 22:34:34 +01:00
unknown
858ea1bf05 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build


Docs/Makefile.am:
  Auto merged
 2007-02-28 22:33:29 +01:00
unknown
ff71e7311c Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
 2007-02-28 22:31:58 +01:00
unknown
48c3d361e4 Makefile.am: 
EXCEPTIONS-CLIENT is now static part of repository


Docs/Makefile.am:
  EXCEPTIONS-CLIENT is now static part of repository
 2007-02-28 22:30:50 +01:00
unknown
e0ca832bdb Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


Docs/Makefile.am:
  Auto merged
 2007-02-28 22:26:54 +01:00
unknown
f2bd13f6cf Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build


Docs/Makefile.am:
  Auto merged
 2007-02-28 22:14:45 +01:00
unknown
548d23ac5a Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build


Docs/Makefile.am:
  SCCS merged
 2007-02-28 22:13:35 +01:00
unknown
5a232872eb Makefile.am: 
EXCEPTIONS-CLIENT is now static part of repository
EXCEPTIONS-CLIENT:
  BitKeeper file /home/kent/bk/tmp/mysql-4.0/EXCEPTIONS-CLIENT


EXCEPTIONS-CLIENT:
  BitKeeper file /home/kent/bk/tmp/mysql-4.0/EXCEPTIONS-CLIENT
Docs/Makefile.am:
  EXCEPTIONS-CLIENT is now static part of repository
 2007-02-28 22:09:09 +01:00
unknown
f629d608d5 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


configure.in:
  SCCS merged
 2007-02-28 21:28:01 +01:00
unknown
c96275aa0a Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-02-28 21:24:11 +01:00
unknown
77e5eb3c00 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build


configure.in:
  SCCS merged
 2007-02-28 21:20:57 +01:00
unknown
7d1ff29c0d Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
 2007-02-28 21:19:19 +01:00
unknown
83f36c1580 Merge trift2.:/MySQL/M50/upward-5.0 
into  trift2.:/MySQL/M51/merge-5.1


scripts/make_binary_distribution.sh:
  Null merge, it is a backport from 5.1 to 5.0 anyway.
 2007-02-28 18:05:22 +01:00
unknown
793a137ddd added initialization of 'cmp_type' variable(to remove compiler warning) 2007-02-28 15:44:57 +04:00
unknown
912a907636 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-02-28 11:24:34 +01:00
unknown
e1426fee11 A binary package should also contain the "mysqld-debug" server (backport from 5.1). 2007-02-28 11:23:00 +01:00
unknown
53c5511a9b Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-02-28 13:26:20 +04:00
unknown
8010d9872d valgrind error fix 2007-02-28 13:25:49 +04:00
unknown
8dfbc1b684 Merge mysql.com:/home/kent/bk/mysql-5.1.16-release 
into  mysql.com:/home/kent/bk/mysql-5.1.16-build


client/sql_string.h:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
 2007-02-27 20:24:43 +01:00
unknown
9cf5f2c94a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/psergey/mysql-5.1-bug26117
 2007-02-27 22:05:52 +03:00
unknown
b68a22019e BUG#26117 "index_merge sort-union over partitioned table crashes" 
Before the fix: 
  ha_partition objects had ha_partition::m_part_info==NULL and that caused
  crash
After: 
- The new ha_partition::clone() function makes the clones use parent's
  m_part_info value.
- The parent ha_partition object remains responsible for deallocation of
  m_part_info.


mysql-test/r/partition_innodb.result:
  BUG#26117 "index_merge sort-union over partitioned table crashes"
   - Testcase
mysql-test/t/partition_innodb.test:
  BUG#26117 "index_merge sort-union over partitioned table crashes"
   - Testcase
 2007-02-27 22:01:03 +03:00
unknown
ae72e39450 Fix (last) compiler warnings 
storage/innobase/pars/lexyy.c:
  Fix compiler warnings (fix is also in pars0lex.l)
support-files/compiler_warnings.supp:
  Extra safety to ensure we really get rid of warning :)
 2007-02-27 20:06:37 +02:00
unknown
3956f5911e Remove compiler warnings 
mysql-test/mysql-test-run.pl:
  Fix warning when using --extern
sql/field.cc:
  Fix wrong fix
sql/ha_ndbcluster.cc:
  Better fixes to remove compiler warnings
sql/ha_ndbcluster_binlog.cc:
  Better fixes to remove compiler warnings
sql/log.cc:
  Fix compiler warnings
sql/sql_parse.cc:
  Indentation fix
sql/sql_table.cc:
  Indentation fixes
storage/myisammrg/ha_myisammrg.cc:
  Fix compiler warnings
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Fix compiler warnings
support-files/compiler_warnings.supp:
  Suppress all 'safe' warnings, as detected by win64
win/README:
  Fixed typo
 2007-02-27 19:31:49 +02:00
unknown
175507b766 Fixes for compiler warnings. 
include/my_dbug.h:
  Added macro for fixing compiler warnings.
sql/field.cc:
  Fixed compiler warnings.
sql/ha_ndbcluster.cc:
  Fixed compiler warnings.
sql/ha_ndbcluster_binlog.cc:
  Fixed compiler warnings.
  Changed some tabs into spaces.
sql/rpl_injector.h:
  Fixed compiler warnings.
sql/sql_binlog.cc:
  Fixed compiler warnings.
sql/sql_repl.cc:
  Fixed compiler warnings.
sql/sql_table.cc:
  Fixed compiler warnings.
storage/myisammrg/ha_myisammrg.cc:
  Fixed compiler warnings.
strings/ctype-ucs2.c:
  Fixed compiler warnings.
strings/ctype-utf8.c:
  Fixed compiler warnings.
support-files/compiler_warnings.supp:
  Added suppressed warnings.
 2007-02-27 11:27:04 +02:00
unknown
13f1e40b7e Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


sql/sql_select.cc:
  Auto merged
 2007-02-27 12:39:05 +04:00
unknown
3a520a785e removed unused variable 2007-02-27 12:37:17 +04:00
unknown
6e13352534 after merge fix 2007-02-27 12:16:41 +04:00
unknown
81dfa8a9ba BUG#20013 No pentium_cflags in SETUP.sh 
---
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-20013
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
---
reorder lines from BUG#20013 to resemble order in 5.0 


BUILD/SETUP.sh:
  BUG#20013 No pentium_cflags in SETUP.sh
  ---
  reorder lines from BUG#20013 to resemble order in 5.0
 2007-02-26 17:06:10 +01:00
unknown
79a6e0fefe after merge fix 2007-02-26 19:49:24 +04:00
unknown
6247e1b2ee Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2007-02-26 17:47:50 +04:00
unknown
536adef69d Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2007-02-26 17:46:52 +04:00
unknown
de5d4e32fb Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2007-02-26 16:57:45 +04:00