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
18617 commits 2780 branches 343 tags 1.6 GiB
Commit graph

18617 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
ce2f345a7d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-12 11:27:30 +01:00
unknown
2123dc6ba3 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-12 11:25:54 +01:00
unknown
40649e92f7 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0


libmysql_r/Makefile.am:
  Auto merged
mysql-test/r/analyse.result:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
 2005-01-12 11:24:46 +01:00
unknown
ed6c9afd6d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-01-12 11:20:05 +01:00
unknown
7e36a0b7cb ndb - fix 64-bit problem in autotest 
ndb/test/src/CpcClient.cpp:
  Fix 64-bit problem
 2005-01-12 11:17:03 +01:00
unknown
2ee0dc0936 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
 2005-01-12 09:22:10 +01:00
unknown
dd3cfa8d88 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-look-valgrind
 2005-01-12 09:05:10 +03:00
unknown
2b73271ceb Fix for use of unitialized variable errors: Manually delete 
{min,max}_functions_it as it is not allocated on the pool.
 2005-01-12 08:15:46 +03:00
unknown
d67a56cb21 uncommented the drop table statement 
mysql-test/t/ctype_eucjp_ms.test:
  uncommnented the drop table statement
 2005-01-11 20:26:43 -08:00
unknown
37a15ec061 added new character set - cp932, eucjp_ms 
config/ac-macros/character_sets.m4:
  added cp932, eucjp_ms character set
include/m_ctype.h:
  added cp932, eucjp_ms character set
libmysql/Makefile.shared:
  added cp932, eucjp_ms character set
mysys/charset-def.c:
  added cp932, eucjp_ms character set
sql/share/charsets/Index.xml:
  added cp932, eucjp_ms character set
strings/Makefile.am:
  added cp932, eucjp_ms character set
 2005-01-11 17:45:36 -08:00
unknown
a964b18269 change to using public enum for log events 
ndb/include/Makefile.am:
  added ndb_logevent to source dist
 2005-01-11 23:25:45 +01:00
unknown
d5a3f4a6e3 ndbcluster.sh: 
increased timeouts to see if more tests get started automatically


mysql-test/ndb/ndbcluster.sh:
  increased timeouts to see if more tests get started automatically
 2005-01-11 23:09:10 +01:00
unknown
0f44ad64d0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2005-01-11 23:02:14 +01:00
unknown
90d6c0629f Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jwinstead2/mysql-4.1-clean
 2005-01-11 21:55:39 +01:00
unknown
6eb792304c Merge mysql.com:/home/jwinstead2/mysql-4.1-6418 
into mysql.com:/home/jwinstead2/mysql-4.1-clean
 2005-01-11 21:53:39 +01:00
unknown
f214faa8ad Replace ZLIB_LIBS in mysql_config. (Bug #6418) 
scripts/Makefile.am:
  Replace ZLIB_LIBS
 2005-01-11 21:50:30 +01:00
unknown
8c71efbcd4 strict.result, strict.test: 
Clean-up for the previous change: VARCHAR and trailing spaces.


mysql-test/t/strict.test:
  Clean-up for the previous change: VARCHAR and trailing spaces.
mysql-test/r/strict.result:
  Clean-up for the previous change: VARCHAR and trailing spaces.
 2005-01-11 23:28:57 +04:00
unknown
c7fbf424c7 Merging fixed 2005-01-11 23:28:56 +04:00
unknown
cd3b9f5790 ndb compile warnings 
ndb/test/include/NDBT_Test.hpp:
  compile warnings
ndb/test/ndbapi/bank/BankLoad.cpp:
  compile warnings
ndb/test/ndbapi/testOIBasic.cpp:
  compile warnings
ndb/test/src/HugoCalculator.cpp:
  compile warnings
ndb/test/src/NDBT_Test.cpp:
  compile warnings
ndb/test/src/NdbBackup.cpp:
  compile warnings
ndb/test/src/NdbRestarts.cpp:
  compile warnings
 2005-01-11 19:45:57 +01:00
unknown
a1b522f809 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-01-11 22:15:29 +04:00
unknown
9318c3d453 Documentation: NdbError is no longer a class, 
it's a struct now.


ndb/include/ndbapi/Ndb.hpp:
  NdbError is no longer a class, it's a struct now.
 2005-01-12 03:55:53 +10:00
unknown
22de488557 Fixed Bug#2813, "analyse does not quot string values in enams from string". 2005-01-11 19:40:33 +02:00
unknown
533bd8fc3f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2005-01-11 18:36:35 +01:00
unknown
ccbe896a24 removed getBaseTable, was wrong and will not work 2005-01-11 18:32:02 +01:00
unknown
53e0c172da Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-11 18:28:59 +01:00
unknown
4f113ac4f3 Merging conflicts resolved 
VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_sys.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/strfunc.cc:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Libraries changed
mysys/default.c:
  get_defaults_files implementation added
sql/sql_base.cc:
  merging
sql/sql_show.cc:
  merging
 2005-01-11 21:00:53 +04:00
unknown
58034683dc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
 2005-01-11 17:20:14 +01:00
unknown
b395e45dbe Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-11 17:14:02 +01:00
unknown
6dbadfa12e merge 2005-01-11 17:02:30 +01:00
unknown
577b8e4e28 removed compiler warnings from ha_ndbcluster 
sql/ha_ndbcluster.cc:
  removed compiler warnings
 2005-01-11 17:00:31 +01:00
unknown
7bb97a4ad8 Bug #7730 Server crash using soundex on an utf8 table 
Don't use my_tolower: it works only for 8bit charsets.
 2005-01-11 19:58:53 +04:00
unknown
427bdc28ee Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.5920


client/mysql.cc:
  Auto merged
 2005-01-11 19:58:52 +04:00
unknown
febd527e03 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-01-11 16:49:52 +01:00
unknown
4245f22b56 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2005-01-11 16:02:45 +01:00
unknown
62113c1011 A fix for Bug#7365 "embedded server for MacOS: problem with prepared 
statements": no test case, the test case is there already, 
libmysqld/examples/client_test.c, we just need to run it on a daily basis.


libmysqld/lib_sql.cc:
  Convert statement id to least significant byte first format,
  uset for data transmission in MySQL protocol. It's assumed to be 
  in this format by mysql_stmt_execute.
 2005-01-11 18:02:44 +03:00
unknown
27354d5654 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-01-11 16:02:42 +01:00
unknown
a31c35022d bug fixed parsing with comments on same line 2005-01-11 16:00:11 +01:00
unknown
d75de3a77c Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-11 15:46:43 +01:00
unknown
962512ad1b - Create the mysqld binaries with the correct file names during the build 
instead of renaming them in the packaging stage with Do-win-build later:
  mysqld-opt.exe -> mysqld.exe, mysqld.exe -> mysqld-debug.exe
 2005-01-11 15:41:42 +01:00
unknown
c9079c1340 - Housekeeping: removed a few unreferenced variables, noticed while doing 
Windows builds


sql/sql_base.cc:
  - removed an unreferenced variable
sql/strfunc.cc:
  - removed an unreferenced variable
 2005-01-11 15:38:03 +01:00
unknown
c951307478 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-01-11 14:56:49 +01:00
unknown
5e6debe6b1 Suma.cpp: 
same as prev fix, wrong read of 64 bit value


ndb/src/kernel/blocks/suma/Suma.cpp:
  same as prev fix, wrong read of 64 bit value
 2005-01-11 14:54:58 +01:00
unknown
927eef9ea1 Backup.cpp: 
bug#7660


ndb/src/kernel/blocks/backup/Backup.cpp:
  bug#7660
 2005-01-11 14:49:35 +01:00
unknown
64b4131cf0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-01-11 14:29:22 +01:00
unknown
7233b5d563 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.7330
 2005-01-11 17:29:21 +04:00
unknown
0dcd8b6e24 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.7330
 2005-01-11 17:27:54 +04:00
unknown
95fa0d99e1 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-01-11 14:21:58 +01:00
unknown
4ebb09797b Removed compiler warnings 2005-01-11 14:06:44 +01:00
unknown
d067695909 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0


sql/net_serv.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
 2005-01-11 13:56:06 +01:00
unknown
f2e368483d Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0


mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
 2005-01-11 13:50:28 +01:00