mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-05 10:43:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
14622 commits 2857 branches 349 tags 1.7 GiB
Commit graph

14622 commits

Author SHA1 Message Date
unknown
81d8e1b01f Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1


sql/ha_ndbcluster.cc:
  Auto merged
 2004-09-13 22:31:16 +02:00
unknown
5fc83a473b Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-09-13 20:09:55 +02:00
unknown
b39ddcf9b9 Fix ; when compiling release 2004-09-13 18:46:56 +02:00
unknown
21d95d33bc Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-09-13 18:07:51 +02:00
unknown
5d2fc66942 Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-09-13 17:14:57 +02:00
unknown
f0e23df61a Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-09-13 16:20:42 +02:00
unknown
736963b5e0 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-bug-tina


sql/handler.h:
  Auto merged
 2004-09-13 16:26:01 +04:00
unknown
193453969e Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-09-13 13:12:02 +02:00
unknown
b9c0f6b77e select send_error cleanup (not everything is fixed) 2004-09-13 11:22:01 +02:00
unknown
356840594d un-reserving "RETURNS" 2004-09-13 11:19:38 +02:00
unknown
e9e714459f indentation cleanup 2004-09-13 11:16:34 +02:00
unknown
786f841f7f Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5428
 2004-09-13 13:34:18 +05:00
unknown
050a196b9f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-09-13 09:59:58 +02:00
unknown
bbf4e17506 mysql.cc: 
Bug : wrong server character set in "status" command
  More character set variables.


client/mysql.cc:
  Bug : wrong server character set in "status" command
  More character set variables.
 2004-09-13 12:51:08 +05:00
unknown
a07c535d51 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5428


strings/ctype-simple.c:
  Auto merged
 2004-09-13 12:39:04 +05:00
unknown
a791904678 Persian collation, contibuted by Jody McIntyre 2004-09-13 12:07:01 +05:00
unknown
ce763f8b2c Merge mysql.com:/home/jonas/src/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-09-13 06:49:16 +02:00
unknown
b4f59e866b Fix dict error code on list tables 
Check g_ndb before deleting it
Wait until ready(10) if get mgm connection
 2004-09-13 06:40:25 +02:00
unknown
b28118abfb Fix for BUG#5117: 
* Renamed handler::estimate_number_of_rows to handler::estimate_rows_upper_bound function, which can also return "unknown"
 * made filesort to use full sort buffer if number of rows to sort is not known.


sql/examples/ha_tina.h:
  Renamed estimate_number_of_rows -> estimate_rows_upper_bound
sql/filesort.cc:
   * Fix for BUG#5117: made filesort() to use full sort buffer if number of rows to sort is not known.
   * Comments and assertion added
sql/ha_berkeley.cc:
  Renamed estimate_number_of_rows -> estimate_rows_upper_bound
sql/ha_berkeley.h:
  Renamed estimate_number_of_rows -> estimate_rows_upper_bound
sql/ha_innodb.cc:
  Renamed estimate_number_of_rows -> estimate_rows_upper_bound
sql/ha_innodb.h:
  Renamed estimate_number_of_rows -> estimate_rows_upper_bound
sql/handler.h:
  Renamed estimate_number_of_rows -> estimate_rows_upper_bound
 2004-09-13 06:14:25 +04:00
unknown
c6d8121cba Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-09-12 21:59:17 +02:00
unknown
bac0f41da6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-09-12 09:24:53 +02:00
unknown
e933fe63af Fix command line options 2004-09-12 09:23:05 +02:00
unknown
4e639af733 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1


sql/item_func.cc:
  Auto merged
 2004-09-12 10:41:06 +04:00
unknown
a2a0a61b20 libmysql.c: 
Fix typos noticed while poking around in file.


libmysql/libmysql.c:
  Fix typos noticed while poking around in file.
 2004-09-11 14:38:23 -05:00
unknown
180abf8338 Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1


ndb/include/mgmcommon/ConfigRetriever.hpp:
  Auto merged
ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/src/common/mgmcommon/LocalConfig.cpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
 2004-09-11 20:56:06 +02:00
unknown
387df2f6a5 Reomeved compiler warnings 2004-09-11 20:53:57 +02:00
unknown
00d5f66af5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-09-11 13:57:02 +02:00
unknown
9ecf15ed74 Fix for bug : FIND_IN_SET fails if set ends with a comma 2004-09-11 15:48:23 +04:00
unknown
3ffc483275 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug4788
 2004-09-11 12:31:28 +02:00
unknown
6607b50754 Put Ramil patch to be able push me code (test suite already is included in query_cache.test) 2004-09-10 22:19:52 +03:00
unknown
9d80a396db Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-09-10 21:40:18 +03:00
unknown
cd573513a3 removed shaky test case 2004-09-10 17:40:02 +00:00
unknown
d4e230afad configure.in: 
bumped up version to 3.5.1


configure.in:
  bumped up version to 3.5.1
 2004-09-10 17:29:10 +00:00
unknown
7c80446c4e BUG#4788 - show create table provides incorrect statement. 
Added code to adjust the field_length of user variables 
in dependence on the field type.
Aded new constants for numeric field widths.


include/mysql_com.h:
  BUG#4788 - show create table provides incorrect statement.
  Introduced definitions for default field width of numeric types.
  So common values can be used at different places in the code.
mysql-test/r/variables.result:
  BUG#4788 - show create table provides incorrect statement.
  New test results.
mysql-test/t/variables.test:
  BUG#4788 - show create table provides incorrect statement.
  Added a test for the bug.
sql/item_func.cc:
  BUG#4788 - show create table provides incorrect statement.
  Added code to adjust the field_length of user variables 
  in dependence on the field type.
sql/sql_parse.cc:
  BUG#4788 - show create table provides incorrect statement.
  Changed numeric literals to the new constants.
 2004-09-10 18:56:47 +02:00
unknown
0c140b7b48 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge


ndb/src/common/mgmcommon/NdbConfig.c:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
 2004-09-10 15:04:40 +00:00
unknown
68d99512f9 Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-09-10 16:55:43 +02:00
unknown
9c71d59d08 bug#5435 2004-09-10 14:55:42 +00:00
unknown
32dc386d5e information about different variables agged to query cache (BUG#5515, BUG#5394) 
mysql-test/r/query_cache.result:
  test of QC with different variables
mysql-test/t/query_cache.test:
  test of QC with different variables
sql/mysql_priv.h:
  new information for query key calculation
sql/sql_cache.cc:
  new information for query key calculation
sql/sql_cache.h:
  removed unused definitions
 2004-09-10 16:28:18 +03:00
unknown
dc37e041d2 removed debug printout that slipped in 2004-09-09 21:53:01 +00:00
unknown
0d413d1e8d Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-09-09 22:43:43 +02:00
unknown
e2252a49f7 fixed compile error 2004-09-09 20:43:42 +00:00
unknown
fb7d91e708 added possibility to use comma-separated connectstring 
compile error/warning fixes
added force of heartbeat
added ability to force heartbeat


ndb/src/common/mgmcommon/LocalConfig.cpp:
  added possibility to use comma-separated connectstring
ndb/src/common/mgmcommon/NdbConfig.c:
  compile error/warning fixes
ndb/src/mgmsrv/MgmtSrvr.cpp:
  added force of heartbeat
ndb/src/mgmsrv/main.cpp:
  changed help text
ndb/src/ndbapi/ClusterMgr.cpp:
  added ability to force heartbeat
ndb/src/ndbapi/Ndbinit.cpp:
  added comment
 2004-09-09 19:52:03 +00:00
unknown
dc21dcd2a1 Merge 
ndb/src/mgmsrv/main.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  SCCS merged
 2004-09-09 16:43:11 +00:00
unknown
4ea4e9ee2e main.cpp: 
removed shhor switch for nodaemon


ndb/src/mgmsrv/main.cpp:
  removed shhor switch for nodaemon
 2004-09-09 16:41:20 +00:00
unknown
0450e21c91 MgmtSrvr.cpp: 
Added ability to force heartbeat


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Added ability to force heartbeat
 2004-09-09 16:40:15 +00:00
unknown
96a45ab066 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
 2004-09-09 16:34:25 +00:00
unknown
759644bce9 mysql_protocols.result: 
fix test result.


mysql-test/r/mysql_protocols.result:
  fix test result.
 2004-09-09 11:22:23 -05:00
unknown
647d895acc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into build.mysql.com:/users/tulin/mysql-4.1-ndb-merge


ndb/include/mgmapi/mgmapi.h:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
 2004-09-09 16:22:47 +02:00
unknown
10ce6d0b26 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into poseidon.(none):/home/tomas/mysql-4.1-ndb
 2004-09-09 14:22:46 +00:00
unknown
ea018f2042 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into poseidon.(none):/home/tomas/mysql-4.1-ndb
 2004-09-09 13:57:23 +00:00