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

15836 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
ce85816690 Try to lower the probability of a stall of mysqldump AND most client connections, when mysqldump does a FLUSH TABLES WITH READ LOCK 
(doing FLUSH TABLES first).


client/mysqldump.c:
  try to lower the probability of a stall of mysqldump AND most client connections, when mysqldump does a FLUSH TABLES WITH READ LOCK
  (doing FLUSH TABLES first).
 2004-11-14 17:45:37 +01:00
unknown
d6f7134d55 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2004-11-14 17:19:26 +01:00
unknown
6a8bfdbe10 allowing --master-data without arg to be compatible with < 4.1.8 mysqldump. 2004-11-14 17:18:31 +01:00
unknown
20cfd8fd4e fixed incorrect using of THD::is_fatal_error 2004-11-14 10:25:38 +02:00
unknown
ae39bbf7cc Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.0 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-4.1


Docs/Makefile.am:
  Auto merged
 2004-11-12 14:15:51 -06:00
unknown
0f3b604dbf Makefile.am: 
Add -acc flag for texi2html to handle accented characters.


Docs/Makefile.am:
  Add -acc flag for texi2html to handle accented characters.
 2004-11-12 14:15:06 -06:00
unknown
c77cb0a321 Fixed a function call. 2004-11-12 20:47:41 +02:00
unknown
75a4c71b67 Merge with 4.0 2004-11-12 20:38:58 +02:00
unknown
20d88eb76f Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
 2004-11-12 19:54:49 +02:00
unknown
d605d88797 Code cleanup and some optimizations. 2004-11-12 19:54:25 +02:00
unknown
c7b66f9dde Removed an unneccessary for() and variable. 2004-11-12 19:22:58 +02:00
unknown
870b048b8e Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-11-12 19:08:33 +02:00
unknown
7dad39859f Fix to allow usage of 4.0 tables with 4.1 2004-11-12 19:01:49 +02:00
unknown
34d46e6b92 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1


tests/client_test.c:
  Auto merged
 2004-11-12 18:31:11 +02:00
unknown
a046b88e1e Added possibility to run only certain tests by giving the test name(s) 
as argument(s) after options.

Added option -T to display all current test names.
 2004-11-12 18:30:30 +02:00
unknown
e3db43894b Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-11-12 16:48:02 +01:00
unknown
4e561d743f Merge on pull 
sql/mysqld.cc:
  Auto merged
 2004-11-12 17:48:01 +02:00
unknown
55ae2e7880 After merge fixes 
client/mysqldump.c:
  Merge with 4.0 (and reordering of options)
client/mysqltest.c:
  Added DB as a user variable
myisam/mi_check.c:
  Trivial cleanup
mysql-test/r/grant.result:
  Move test to be in same order as in 4.0
mysql-test/r/mix_innodb_myisam_binlog.result:
  Updated results
mysql-test/r/ps_1general.result:
  Updated tests to work after privilege fixes
mysql-test/r/timezone3.result:
  Updated results to 4.1
mysql-test/t/ps_1general.test:
  Updated tests to work after privilege fixes
sql-common/my_time.c:
  Applied sub-second patch from 4.0
sql/sql_acl.cc:
  More debugging
 2004-11-12 17:44:17 +02:00
unknown
2c6a3b9773 typos in error messages fixed 
sql/share/french/errmsg.txt:
  typos fixed
sql/share/greek/errmsg.txt:
  typos fixed
sql/share/portuguese/errmsg.txt:
  typos fixed
sql/share/romanian/errmsg.txt:
  typos fixed
sql/share/serbian/errmsg.txt:
  typos fixed
sql/share/spanish/errmsg.txt:
  typos fixed
sql/share/swedish/errmsg.txt:
  typos fixed
 2004-11-12 16:41:53 +01:00
unknown
5cc4a6e928 fill_help_tables.sh: 
Recognize another Texinfo tag.


scripts/fill_help_tables.sh:
  Recognize another Texinfo tag.
 2004-11-12 08:45:58 -06:00
unknown
c1400a8421 mysqldump.c: 
Add missing sentinel.


client/mysqldump.c:
  Add missing sentinel.
 2004-11-12 07:13:46 -06:00
unknown
44070705ea merge with 4.0 
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-Makefile.am:
  Delete: Docs/Images/Makefile.am
Build-tools/Bootstrap:
  Auto merged
Docs/Makefile.am:
  Auto merged
configure.in:
  Auto merged
include/mysql.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysys/default.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/log.cc:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
client/mysqldump.c:
  merge with 4.0
  (This only reorders options)
sql/ha_innodb.cc:
  merge with 4.0 (Keep original code)
sql/time.cc:
  Note that part of this patch is done in my_time.c
 2004-11-12 11:17:53 +02:00
unknown
5cc756f6b9 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b6564
 2004-11-12 12:38:07 +04:00
unknown
4374aaa5d8 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6551
 2004-11-12 12:36:42 +04:00
unknown
6a1bc4a52a Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-11-12 10:22:15 +02:00
unknown
b19eb67f08 Bug#6123 - GRANT USAGE creates useless mysql.db row 
Prevent creation of a row which grants no rights
  Test included


mysql-test/r/grant.result:
  Test for Bug#6123
mysql-test/t/grant.test:
  Test for Bug#6123
sql/sql_acl.cc:
  Bug#6123
    Prevent creation of useless row
 2004-11-11 20:59:03 +00:00
unknown
0f0935efe8 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
 2004-11-11 14:56:44 -06:00
unknown
72c53dadfd mysqldump.c: 
Reorder options, revise --hex-blob help string.


client/mysqldump.c:
  Reorder options, revise --hex-blob help string.
 2004-11-11 14:55:55 -06:00
unknown
9ae3dde8b5 mi_write: fix for ft2 when found word (in the tree) has different length as the word to insert 
myisam/mi_check.c:
  one more correctness check for CHECK of fulltext indexes
 2004-11-11 21:26:24 +01:00
unknown
946f042dd3 trx0purge.c: 
Remove duplicated innodb max purge lag code


innobase/trx/trx0purge.c:
  Remove duplicated innodb max purge lag code
 2004-11-11 21:17:44 +02:00
unknown
3afd8e7901 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug6469


sql/sql_yacc.yy:
  Auto merged
 2004-11-11 17:12:25 +00:00
unknown
e4a0b794d9 Merge pcgem.rdg.cyberkinetica.com:/mnt/staff/repositories/mysql-4.1 
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug6469


sql/sql_yacc.yy:
  Auto merged
 2004-11-11 17:07:57 +00:00
unknown
df6f098813 ndb_test_platform.cpp: 
better printouts in ndb_test_platform


ndb/tools/ndb_test_platform.cpp:
  better printouts in ndb_test_platform
 2004-11-11 16:51:38 +00:00
unknown
0fa48ea490 waiter.cpp: 
fixed so that connectring option works


ndb/tools/waiter.cpp:
  fixed so that connectring option works
 2004-11-11 16:38:15 +00:00
unknown
75f9f5f154 mysql-test-run.sh: 
made sleep time for second master larger so that it has time to start


mysql-test/mysql-test-run.sh:
  made sleep time for second master larger so that it has time to start
 2004-11-11 16:06:47 +00:00
unknown
9fe89939d0 basestring_vsnprintf fix for size==0 2004-11-11 15:53:33 +00:00
unknown
98b31cd63c Some code clean-up and optimization. 2004-11-11 16:59:36 +02:00
unknown
baf1c89e3d A fix (bug #6564: QUOTE(NULL) returns NULL, not the string 'NULL') 2004-11-11 18:20:40 +04:00
unknown
ce62fb28c0 Removed check for .ini file elsewhere, except on Windows. 2004-11-11 16:20:39 +02:00
unknown
9ef7c86dc2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-11-11 15:22:34 +02:00
unknown
3048dc0fa2 forgot a return 0 
removed some errorcodes not used


ndb/src/mgmclient/CommandInterpreter.cpp:
  forgot a return 0
ndb/src/ndbapi/ndberror.c:
  removed some errorcodes not used
 2004-11-11 13:22:33 +00:00
unknown
ac083bb688 Write fatal errors even if silent is used in client_test 
mysql-test/t/client_test.test:
  Fix crash when user has a conflicting defaults file
tests/client_test.c:
  Write fatal errors even if silent is used
 2004-11-11 14:59:13 +02:00
unknown
784a9a9fda ndbcluster.sh: 
fixed typo


mysql-test/ndb/ndbcluster.sh:
  fixed typo
 2004-11-11 11:08:37 +00:00
unknown
082701e58d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-11-11 10:31:34 +00:00
unknown
8d072e64d2 added ndb error codes and better explanations 2004-11-11 10:05:28 +00:00
unknown
eb8cbe8c17 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean


sql/sql_yacc.yy:
  Auto merged
 2004-11-11 10:25:28 +01:00
unknown
f1b82eb2fa Fix for autobuild failure: forgotten ';' (bison 1.875 accepts if it's not there, but 1.75 does not) 
sql/sql_yacc.yy:
  forgotten ';' (bison 1.875 accepts if it's not there, but 1.75 does not)
 2004-11-11 10:24:16 +01:00
unknown
d2a3420dd3 A fix (bug #6551: UMASK_DIR & UMASK not taken into account (mysqld.cc my_init.c inconsistency)). 
my_umask and my_umask_dir initialization has been moved to the my_init() func.


mysys/my_init.c:
  A fix (bug #6551: UMASK_DIR & UMASK not taken into account (mysqld.cc my_init.c inconsistency))
sql/mysqld.cc:
  A fix (bug #6551: UMASK_DIR & UMASK not taken into account (mysqld.cc my_init.c inconsistency))
 2004-11-11 12:35:55 +04:00
unknown
02d8fa2952 Added ending ';' for the start_transaction_opts: 2004-11-11 10:50:46 +04:00
unknown
bdea2dc949 fill_help_tables.sh: 
Handle some additional Texinfo tags that were being missed.


scripts/fill_help_tables.sh:
  Handle some additional Texinfo tags that were being missed.
 2004-11-10 22:43:09 -06:00