mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
16249 commits 2784 branches 343 tags 1.6 GiB
Commit graph

16249 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
8c7f711404 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
 2004-12-07 14:18:14 +02:00
unknown
301582c189 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1.6840
 2004-12-07 15:18:13 +03:00
unknown
31099d116b Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1.6077
 2004-12-07 15:14:28 +03:00
unknown
d23c70e9cf merge fix 2004-12-07 15:13:47 +03:00
unknown
9f48eedb4e Fix for bug #6840: Default value is not checked in ALTER column SET DEFAULT 'x' 2004-12-07 14:08:56 +03:00
unknown
abaeea4993 merge 
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/t/key_cache.test:
  Auto merged
sql/field.cc:
  Auto merged
 2004-12-07 13:56:48 +03:00
unknown
568aa832a2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-12-07 10:31:55 +01:00
unknown
a700754e71 Removed getTableForAlteration 2004-12-07 10:27:22 +01:00
unknown
6c68f27cc4 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.6755
 2004-12-07 11:20:11 +04:00
unknown
b9d9c31430 merge 
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
 2004-12-07 09:07:37 +02:00
unknown
e1248f4fc3 Fix for crummy compiler that didn't udnerstand for declaration. Another fix for example storage engine to pass, not skip, test. 
mysql-test/r/have_exampledb.require:
  Fix for test for examples.
sql/examples/ha_archive.cc:
  Fix for compiler that had problem with ANSI C.
 2004-12-06 16:26:05 -08:00
unknown
e2d4dc23c4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-12-06 22:58:15 +01:00
unknown
8ec6cf2cd5 UCS2 support in ENUM and SET, which also fixes: 
Bug #5174 SHOW CREATE TABLE hangs up if the table contains half-with katakana enum values
UCS2 values are stored in HEX encoding in FRM file
 2004-12-06 20:45:32 +04:00
unknown
678fff408a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5823


sql/sql_parse.cc:
  Auto merged
 2004-12-06 20:45:31 +04:00
unknown
0d8d061f73 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1.6840
 2004-12-06 19:45:30 +03:00
unknown
45fc838439 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1.6840
 2004-12-06 19:03:39 +03:00
unknown
e94fc374c5 Syntax extention: 'ALTER DATABASE' without db name (after review) 2004-12-06 19:01:51 +03:00
unknown
1f1257bd52 A fix (bug #5823: mysql_install_db fails due to incorrect max_allowed_packet). 
scripts/fill_help_tables.sh:
  percent_xxx variables added to avoid /0 error.
scripts/mysql_install_db.sh:
  A fix (bug #5823: mysql_install_db fails due to incorrect max_allowed_packet).          
  --net_buffer_length=16K added.
sql/net_serv.cc:
  Typo fixed.
sql/sql_parse.cc:
  A fix (bug #5823: mysql_install_db fails due to incorrect max_allowed_packet).
  Auto extend net buffer in bootstrap mode.
 2004-12-06 18:45:41 +04:00
unknown
6e4a848dcc Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-12-06 14:57:29 +01:00
unknown
15c0d3373b Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-12-06 14:51:38 +01:00
unknown
df1faeb48c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into build.mysql.com:/users/rburnett/mysql-4.1-new2
 2004-12-06 14:51:37 +01:00
unknown
c6b3c442a5 Fix for bug#6935 table rename does not work with ndb tables 2004-12-06 14:51:10 +01:00
unknown
04866cf0f1 New fix for bug#6796 Wrong outcome of update operation of ndb table 2004-12-06 14:34:02 +01:00
unknown
0e554fdebd Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-12-06 14:21:33 +01:00
unknown
3af775dfd4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1


sql/sql_update.cc:
  Auto merged
 2004-12-06 14:15:52 +01:00
unknown
21f2d3aa3f Fixed thar proper charset was not set in Field_set::val_str() 2004-12-06 16:22:51 +04:00
unknown
878a155e50 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


configure.in:
  Auto merged
 2004-12-06 08:54:53 +00:00
unknown
ca2e6e8192 wixed ndb-debug option for configure 2004-12-06 08:49:34 +00:00
unknown
88f1b90a70 Fix for bug #6755 (ALTER TABLE ENABLE KEYS corrupts spatial index) 
myisam/mi_check.c:
  Spatial keys should not be filesort-ed.
  Specific function neede to insert key into spatial index
mysql-test/r/gis-rtree.result:
  Appropriate test result
mysql-test/t/gis-rtree.test:
  Test case
 2004-12-06 11:42:41 +04:00
unknown
77a9eede5d Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-4.1


configure.in:
  Auto merged
 2004-12-06 10:58:40 +04:00
unknown
1b3c814d42 configure.in: 
latin1_spanish_ci produced unknown collation error.


configure.in:
  latin1_spanish_ci produced unknown collation error.
 2004-12-06 10:57:22 +04:00
unknown
80b3339f69 Integrate suggestions from Tomas Ulin's mail. (r.e. reporting an error in the case of endianness mismatch). 
ndb/src/mgmsrv/Services.cpp:
  - initialise endian= 0;
    args.get will not set if not found
  
  - change error message to be clearer
 2004-12-06 11:43:02 +11:00
unknown
a5cc93b923 Add (optional) endian parameter to 'get nodeid' to warn on endian conflicts. 
ndb/src/mgmapi/mgmapi.cpp:
  Send an extra (optional) parameter to 'get nodeid' to detect potential endianness conflicts.
  
  endian: big
  endian: small
  
  Server will deny our nodeid request if we're not compatible.
  
  If parameter is not specified, we behave how we used to (work or fail).
ndb/src/mgmsrv/Services.cpp:
  Add extra (optional) parameter to 'get nodeid' to detect potential endianness conflicts.
  
  endian: big
  endian: little
  
  we will deny the nodeid request if the endian parameter is provided and the endian doesn't match.
  
  This should preserve compatibility with all clients.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2004-12-06 11:41:16 +11:00
unknown
f8cdf57097 ndb: fix solaris (etc) ndb startup problem in mysql-test-run 
ndb/src/common/util/NdbOut.cpp:
  avoid printf("%s", (char*)0)
 2004-12-04 15:17:13 +01:00
unknown
07fc5f7813 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/bXXXX-4.1 2004-12-04 13:10:36 +01:00
unknown
b6aa3489fe help text corrected 2004-12-04 10:06:38 +01:00
unknown
56080a8d1e postreview fixes 
mysql-test/r/subselect_innodb.result:
  fixed result of test
mysql-test/t/subselect_innodb.test:
  fixed test layout
 2004-12-04 00:14:18 +02:00
unknown
863c73898f added configure option to control extra ndb debug options, 
for release debug build please configure with --without-ndb-debug
 2004-12-03 21:26:14 +00:00
unknown
b2f7b5bd64 merge 2004-12-03 23:24:41 +02:00
unknown
c2780e1258 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
 2004-12-03 22:40:11 +02:00
unknown
c9f0aaa653 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-global-4.1


sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
 2004-12-03 22:13:53 +02:00
unknown
67aec82f79 Fix t/rpl_create_database.test: replace version in SHOW BINLOG RESULTS 
mysql-test/t/rpl_create_database.test:
  need to replace version in results
mysql-test/r/rpl_create_database.result:
  version gets replaced
 2004-12-03 18:42:35 +01:00
unknown
a1fb39e7ba Merge 
sql/sql_insert.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_class.h:
  SCCS merged
 2004-12-03 17:48:19 +01:00
unknown
77e833d529 compatibility fix (2G filesize limit) 2004-12-03 17:35:50 +01:00
unknown
0284e541b3 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-12-03 16:10:20 +01:00
unknown
3456a512d9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-12-03 15:43:26 +01:00
unknown
684f91e6ce Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-12-03 15:38:07 +01:00
unknown
f2d6046eda Due to a compiler bug, slave.cc:tables_ok() sometimes wrongly returns 
1 if the return type is int or int_fast8_t.  The test case that showed
this problem is rpl000001 and the tested version was MySQL 5.0.2.  The
compiler with the problem is GCC 3.0.4 runing on "Linux bitch 2.4.18
#2 Thu Apr 11 14:37:17 EDT 2002 sparc64 unknown".

By changing the return type to bool the problem disappear.  (Another
way to make the problem disappear is to simply print the returned
value with printf("%d",?).  The printed returned value is always 0 in
the test cases I have run.)  This is only a partial solution to the
problem, since someone could later change the return type of the
function back to int or some other type that does not work.


sql/slave.cc:
  Changed type
sql/slave.h:
  Changed type
 2004-12-03 15:18:25 +01:00
unknown
68755d7f59 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/sql_insert.cc:
  Auto merged
 2004-12-03 15:05:35 +01:00
unknown
390f680016 Merge mysql.com:/home/jonas/src/mysql-4.1-fix 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-12-03 15:04:06 +01:00