mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
36478 commits 2781 branches 343 tags 1.6 GiB
Commit graph

1147 commits

Author SHA1 Message Date
schwenke@lmy003.wdf.sap.corp
badfc2e4a9 new build scripts for SAP team 2005-05-18 15:28:51 +02:00
tulin@dl145c.mysql.com
13bbb3dbb3 ndberror.c: 
updated error message for ndb
 2005-05-18 10:22:27 +02:00
tulin@dl145c.mysql.com
23f79bd1f2 merge 2005-05-17 10:17:53 +02:00
tulin@dl145c.mysql.com
9a6cc9172a removed include of bitvector.h 
result fix Tables_in_information_schema -> Tables_in_INFORMATION_SCHEMA
 2005-05-16 13:41:34 +02:00
bell@book.sanja.is.com.ua
1ff9f55920 relaxed DBUG_ASSERT in Item_int_with_ref::new_item() to "any constant" (BUG#10020) 2005-05-16 12:19:10 +03:00
serg@serg.mylan
40ce1e174d merged 2005-05-14 19:28:29 +02:00
konstantin@mysql.com
e5c916f7e8 Merge 2005-05-13 13:26:08 +02:00
konstantin@mysql.com
441379ceab Add myself to the list of users who don't automatically check out 
all version controlled files (should speed up bk citool)
 2005-05-13 11:35:02 +04:00
antony@ltantony.xiphis.org
7b202354aa create select_lex.options2 to store more bits 2005-05-12 18:09:32 +01:00
tulin@dl145c.mysql.com
12b4fb158c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-05-10 20:35:14 +02:00
holyfoot@hf-ibm.(none)
1851a38b2f Fix for bug #10493 (SJIS fields are not correctly saved) 2005-05-10 02:15:59 +05:00
lars@mysql.com
e76c641190 Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1 2005-05-09 11:45:59 +02:00
lars@mysql.com
bf48175cf4 Merge mysql.com:/home/bkroot/mysql-5.1 into mysql.com:/home/bk/mysql-5.1 2005-05-09 11:17:32 +02:00
mskold@mysql.com
9e1117c3e5 Merge 2005-05-08 22:52:55 +02:00
mwagner@ultrafly.mysql.com
b0774772d9 errmsg.txt: 
Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
 2005-05-08 19:14:28 +02:00
antony@ltantony.mysql.com
9341a2b373 Merge ltantony.mysql.com:/usr/home/antony/work2/fixbuild-5.0 
into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-5.1
 2005-05-08 01:49:40 +01:00
antony@ltantony.mysql.com
4c3d1f16b9 Merge ltantony.mysql.com:/usr/home/antony/work2/fixbuild-4.1 
into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-5.0
 2005-05-08 01:20:47 +01:00
antony@ltantony.mysql.com
9eaf381d03 FreeBSD doesn't have /proc/cpuinfo, use sysctl to find cpu model. 2005-05-08 01:18:19 +01:00
mwagner@ultrafly.mysql.com
9f92bd5e25 Merge bk-internal:/home/bk/mysql-4.0 
into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-4.0
 2005-05-07 22:08:05 +02:00
svoj@mysql.com
f0841a2771 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/svoj/devel/mysql/7709-mysql-4.0
 2005-05-07 21:39:29 +05:00
joerg@trift-lap.fambruehe
84af50133b Corrections to test "sp", stored procedure "fib" (see entry 9937 in the bug DB). 2005-05-07 18:06:02 +02:00
jimw@mysql.com
17b6789cf2 Merge 2005-05-07 08:35:55 -07:00
mwagner@ultrafly.mysql.com
ded73eddf7 errmsg.txt: 
Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).
 2005-05-07 15:11:31 +02:00
svoj@mysql.com
c7f0fcab23 BUG#7709 fix - Boolean fulltext query against unsupported engines does not 
fail.
 2005-05-07 15:48:56 +05:00
gbichot@production.mysql.com
a1948f769c [backport of 4.1, because 4.0 autobuild now hits the same problem; 
when merging just use "ul"] In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile.
 2005-05-07 11:35:14 +02:00
antony@ltantony.mysql.com
521b0b6d76 Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1 
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-5.0
 2005-05-07 08:46:42 +01:00
antony@ltantony.mysql.com
67bcc9707f Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616 
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1
 2005-05-06 16:16:05 +01:00
antony@ltantony.mysql.com
bf17b75a28 Bug#6616 
MySQL server 100% CPU if FLUSH TABLES WITH READ LOCK + INSERT
  Infinite loop caused by missing update to thd version.
 2005-05-06 14:42:28 +01:00
rburnett@bk-internal.mysql.com
ad6de2c05a Merge bk-internal.mysql.com:/users/rburnett/bug9721 
into bk-internal.mysql.com:/users/rburnett/mysql-5.0
 2005-05-06 15:15:48 +02:00
rburnett@bk-internal.mysql.com
c95e33fadf Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 
into bk-internal.mysql.com:/users/rburnett/bug9721
 2005-05-06 15:10:01 +02:00
lars@mysql.com
05cbb3962c Manual merge 5.0->5.1 2005-05-06 15:04:07 +02:00
jani@ibmlab.site
0e91a7131f Merge ibmlab.site:/home/my/bk/mysql-4.1 
into ibmlab.site:/home/my/bk/mysql-5.0
 2005-05-06 13:42:30 +03:00
jani@ibmlab.site
fa25b9b49d A fix for Bug#8467. 2005-05-06 12:18:37 +03:00
bar@mysql.com
b1431c222a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/root/mysql-5.0
 2005-05-06 13:08:28 +05:00
bar@mysql.com
1f14cfcb35 merging cp932 from 4.1 2005-05-06 12:00:25 +05:00
ramil@mysql.com
802360fbc2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/ram/work/5.0
 2005-05-06 08:34:50 +05:00
shuichi@mysql.com
f0fb08dd79 Merge stamagawa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/shuichi/apps/mysql/bk/4.1/mysql
 2005-05-05 10:46:14 -07:00
shuichi@mysql.com
720418fe46 Added cp932 character set 2005-05-05 10:36:17 -07:00
rburnett@bk-internal.mysql.com
e7d7c0f236 Bug #9721 net_write_timeout not used on Windows 
Added an extra parameter to all calls to timeout().  
1 means we want to set the write timeout
0 means we wnat to set the read timeout

viossl.c:
  Add which parameter to ssl timeout routine
vio_priv.h:
  Added which parameter to vio_ignore_timeout and vio_ssl_timeout
violite.h:
  Add which parameter to vio_timeout sigs
net_serv.cc:
  Use proper which code in call to vio_timeout to set the proper timeout
viosocket.c:
  Set the appropriate timeout in vio_timeout
 2005-05-05 17:17:57 +02:00
holyfoot@mysql.com
556504287b Merge 2005-05-05 20:10:50 +05:00
holyfoot@hf-ibm.(none)
2c8e9df232 A lot of fixes to Precision math 
Mostly about precision/decimals of the results of the operations
 2005-05-05 20:06:49 +05:00
ram@ram-book.(none)
65f5a15a2d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into ram-book.(none):/home/ram/work/5.0
 2005-05-05 19:22:33 +05:00
ramil@ram-book.(none)
b9ccbfd1f3 A fix (bug #10179: error in default value setting). 2005-05-05 17:17:55 +05:00
konstantin@mysql.com
753959cd88 Manual merge 2005-05-05 13:47:09 +04:00
tulin@dl145b.mysql.com
243e76a1af Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-05-04 13:33:16 +02:00
tulin@dl145b.mysql.com
ccac26a27a logging_ok: 
Logging to logging@openlogging.org accepted
NDBT_ResultRow.cpp, ndb_restore.test, ndb_restore.result:
  BUG#10287
 2005-05-04 10:16:03 +02:00
bell@book.sanja.is.com.ua
3be81d4299 Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0 
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-test-5.0
 2005-05-03 18:47:53 +03:00
tomas@poseidon.ndb.mysql.com
145ae3c6f5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
 2005-05-02 13:18:26 +02:00
monty@mysql.com
28a5491d3d Merge with 4.1 2005-04-30 09:46:08 +03:00
evgen@moonbone.local
b11705a2b0 Fix bug #9703 "Error 1032 with GROUP BY query and large tables" 
Reset old error if tmp table was successfully created.

Test data is large and can be found in bug report along with test query.
 2005-04-29 21:19:39 +04:00
lars@mysql.com
1bd55e471e Merging 5.0->5.1 2005-04-19 11:09:54 +02:00
geert@kriem.kemuri.org
2c36f4c821 Merge gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0
 2005-04-09 10:55:38 +02:00
acurtis@xiphis.org
dcc40a080d Merge xiphis.org:/var/db/bk/work-acurtis/bug6776.1 
into xiphis.org:/var/db/bk/work-acurtis/bug6776.2
 2005-04-09 00:36:08 +01:00
acurtis@xiphis.org
e82edda6c6 Merge xiphis.org:/var/db/bk/work-acurtis/bug6776 
into xiphis.org:/var/db/bk/work-acurtis/bug6776.1
 2005-04-08 21:40:50 +01:00
geert@kriem.kemuri.org
dd1f0267ad Merge gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0
 2005-04-08 14:11:22 +02:00
gluh@mysql.com
decfc86fbb Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286
 2005-04-06 14:14:13 +05:00
gluh@eagle.intranet.mysql.r18.ru
6f18d7d26f Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variables 2005-04-06 14:13:06 +05:00
serg@serg.mylan
ea673c1afd Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-04-05 19:52:22 +02:00
serg@serg.mylan
4962ba7f8a merged 2005-04-05 19:44:39 +02:00
geert@kriem.kemuri.org
8c42aceb0a Adding --show-warnings option for the mysql command line tool so warnings, 
if any, are shown after execution of a statement in both batch and 
interactive mode. 
In interactive mode \w means show the warnings and \W means don't 
show the warnings.
 2005-04-05 15:30:17 +02:00
serg@serg.mylan
3c3defaa0a add changeset key to the bk commit mail 2005-04-05 15:16:15 +02:00
gluh@eagle.intranet.mysql.r18.ru
fed0ba272a Code optimization(discussed with Monty) 2005-04-05 14:31:46 +05:00
gluh@eagle.intranet.mysql.r18.ru
f1773668a8 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into eagle.intranet.mysql.r18.ru:/home/gluh/MySQL/Bugs/mysql-5.0.9344
 2005-04-04 12:12:50 +05:00
patg@patrick.local
8e0eb65f9a 5.0 to 5.1 merge 2005-04-01 12:32:17 -08:00
magnus@msdesk.mysql.com
e8434aadca BUG#8585 ndb_cache2 
- When deleting from a cursor the m_rows_changed variable was not properly incremented to indicate that m_share->commit_count should be cleared at end of trans.
 2005-03-31 14:33:50 +02:00
gluh@eagle.intranet.mysql.r18.ru
1f38b5bdd1 Fix for bug #9344 INFORMATION_SCHEMA, wrong content, numeric columns 
The columns CHARACTER_MAXIMUM_LENGTH and CHARACTER_OCTET_LENGTH 
  of INFORMATION_SCHEMA.COLUMNS must be NULL for numeric columns
 2005-03-31 13:44:42 +05:00
kent@mysql.com
bb713b13df Do-compile: 
Added option --with-big-tables
 2005-03-30 02:41:08 +02:00
pekka@mysql.com
727015dbb3 Merge 2005-03-28 23:06:19 +02:00
serg@serg.mylan
2dd1847bc2 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-03-26 19:49:24 +01:00
bar@eagle.intranet.mysql.r18.ru
2a1ad57732 Merge 2005-03-25 10:43:35 +04:00
serg@serg.mylan
091f069671 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-03-23 21:10:01 +01:00
gbichot@quadita2.mysql.com
19499229ed "After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication": 
s/sleep/safe_sleep (thread safe); sleep 0/1/2/3/4/5/5/5 (get slave less late);
no message on error log (deadlock is too common sometimes), a global counter
instead (SHOW STATUS LIKE 'slave_retried_transactions').
Plus a fix for libmysql/Makefile.shared
 2005-03-23 19:19:36 +01:00
serg@serg.mylan
d6bedfa8e0 merged 2005-03-23 09:42:24 +01:00
mysqldev@mysql.com
ad26a667e6 sql_acl.cc, sql_acl.h, sql_parse.cc 
New privilege CREATE USER (CREATE_USER_ACL, Create_user_priv) added
grant2.test:
  new tests (mostly backported from jani's patch)
system_mysql_db.result, sp.result, grant2.result, grant.result:
  results updated
 2005-03-22 15:54:18 +01:00
gbichot@production.mysql.com
56495a3691 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod
 2005-03-22 00:28:33 +01:00
gbichot@production.mysql.com
c766efdc5d Last part of WL#1062: better replication of timezones: no more use 
of SET ONE_SHOT; storing tz info directly in event (if this info is needed),
it's now allowed to have different global tz on master and slave.
 2005-03-22 00:26:12 +01:00
lars@mysql.com
c198ce2ab7 Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1 2005-03-21 09:23:09 +01:00
serg@serg.mylan
1ccb9dd214 don't allow to commit as mysqldev 2005-03-18 09:00:46 +01:00
igor@rurik.mysql.com
d53423383b Manual merge 2005-03-17 21:47:46 -08:00
brian@zim.(none)
4634b7c724 Merge zim.(none):/home/brian/mysql/mysql-5.0 
into zim.(none):/home/brian/mysql/mysql-5.1
 2005-03-17 17:21:51 -08:00
paul@frost.snake.net
cf5f436236 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0 
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0
 2005-03-17 11:43:56 -06:00
paul@frost.snake.net
86f9b77756 Update URL. 2005-03-17 11:33:07 -06:00
gbichot@quadxeon.mysql.com
7ee2ecbe5d Merge quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon 
into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.1-4xeon
 2005-03-17 17:00:44 +01:00
gbichot@quadxeon.mysql.com
3cb85a4740 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon
 2005-03-17 15:51:52 +01:00
gbichot@quadxeon.mysql.com
d823bee92a safer creation of temp files used in replication of LOAD DATA INFILE. 
When we come to create these, they may already exist and it's necessary to delete these old, useless copies.
 2005-03-17 14:39:39 +01:00
brian@zim.(none)
473e1ffd3a Removed support for RAID, mit-threads, and MySQL FS (really, if someone wants this feature look at a web-dav hookup). 2005-03-16 16:22:56 -08:00
tomas@poseidon.ndb.mysql.com
1d1be36d87 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
 2005-03-16 02:50:02 +01:00
patg@krsna.
24bc862456 This changeset contains changes approved in code review by 
Konstja and Georg, change sets 1.1806, 1.1805. These changes has been successfully 
tested on both my own workstation (Suse 9.0) and production.mysql.com.
 2005-03-15 00:32:21 -08:00
paul@snake-hub.snake.net
4af3c8a23a mysql.1.in: 
Fix path that needs no parameterization.
 2005-03-14 19:59:00 -06:00
reggie@mdk10.(none)
75e1b9e765 Bug #6660 mysqldump creates bad pathnames on Windows 
This really should not happen on Windows and part of the problem not fixed here is why show create table includes data directory when being run on Windows.  However, this patch fixes the bug in mysqldump.c

mysqldump.c:
  Added fixPaths function to convert \ to / in data directory and index directory entries only on Windows
 2005-03-14 16:47:35 -06:00
mskold@bk-internal.mysql.com
ca3391c7e7 Removed files that disabled ndb tests 2005-03-14 12:27:02 +01:00
msvensson@neptunus.(none)
13ec961c3a BUG#6554 Problem Building MySql on Fedora Core 3 
- Moved static variables defined inside of function to file scope to avoid this linking problem on FC3
 2005-03-14 12:07:49 +01:00
mskold@bk-internal.mysql.com
c30095c920 Marked missing file gone 2005-03-14 11:37:26 +01:00
mskold@bk-internal.mysql.com
c7f46d678a Removed 2005-03-14 11:12:54 +01:00
serg@serg.mylan
956682de1a merged 2005-03-09 14:09:06 +01:00
acurtis@ltantony.rdg.cyberkinetica.homeunix.net
be3c863ba0 Merge in fix Bug#3788 2005-03-08 22:32:09 +00:00
tomas@poseidon.ndb.mysql.com
8e17bedeee Merge 2005-03-08 10:40:52 +01:00
gbichot@quadita2.mysql.com
fa27e11923 Default value of slave_transaction_retries is now 10 
(whereas it's 0 in 4.1, for safety as this is new code).
 2005-03-07 12:49:38 +01:00
georg@lmy002.wdf.sap.corp
473f2f9409 New Project files for Windows Ithanium 64-bit builds 2005-03-06 14:22:28 +01:00
bar@mysql.com
d50d213162 Merge 2005-03-05 18:20:35 +04:00