1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Commit Graph

6099 Commits

Author SHA1 Message Date
d367d5ddb8 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/mysqld.cc:
  Auto merged
2003-03-13 11:23:34 +01:00
c7551b8840 Merge bk-internal:/home/bk/mysql-3.23/
into serg.mysql.com:/usr/home/serg/Abk/mysql
2003-03-13 10:53:58 +01:00
3dfcd944fe Added PeterG's new internals documenation.
Docs/internals.texi:
  Added PeterG's new internals documentation.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-03-12 21:35:57 -08:00
606a23f551 VC++ InstallShield Setup Programs for 4.0.XX tree 2003-03-12 23:16:36 -04:00
8fa237edd3 better help message 2003-03-13 01:23:43 +01:00
b12b64a0c3 added comment 2003-03-12 22:50:22 +02:00
da9d94997c making sure that test works. 2003-03-12 20:33:41 +02:00
8209eb579e ha_myisam.cc:
typo fixed


sql/ha_myisam.cc:
  typo fixed
2003-03-12 18:32:27 +01:00
32208e0255 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-12 17:23:23 +02:00
8a2bd0d4ba Better fix for "Halloween" effect ... 2003-03-12 17:11:48 +02:00
ce194f04c5 Fix for a bug with column privileges ... 2003-03-12 17:08:48 +02:00
f16873ec9a Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-3.23
2003-03-12 16:43:37 +02:00
72f44dafe6 NEWDATE -> DATE in anylyse() output
Changed that analyse(#) also affects strings


mysql-test/r/analyse.result:
  Better analyse test
mysql-test/t/analyse.test:
  Better analyse test
sql/sql_analyse.cc:
  NEWDATE -> DATE in anylyse() output
  Changed that analyse(#) also affects strings
  Fixed that number of elements in ENUM is limited by # not by #+1
2003-03-12 16:43:01 +02:00
40a781a6d6 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0


sql/sql_parse.cc:
  Auto merged
2003-03-12 14:48:00 +02:00
4976cd5529 Fix for --new option (Timestamp in YYYY-MM-DD HH:MM:SS format)
sql/field.cc:
  Fix for --new option
sql/field.h:
  Fix for --new option
2003-03-12 14:34:54 +02:00
cbbe5e8e2b A little bit improved test case 2003-03-12 14:34:07 +02:00
ab3c0ac156 Proper fix for INSERT DELAYED and --max-delayed-threads 2003-03-12 08:08:07 +02:00
0e812fc4b1 Fix for replication of INSERT | REPLACE | CREATE ... SELECT
sql/sql_select.cc:
  Fix for repllication of INSERT | REPLACE | CREATE  ... SELECT
2003-03-12 07:51:08 +02:00
5cd07da765 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0


mysql-test/mysql-test-run.sh:
  Auto merged
2003-03-12 05:21:31 +02:00
6d7aa8336c Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0


sql/sql_select.cc:
  Auto merged
2003-03-12 01:06:21 +01:00
5dd8180a8e Fix for bug #136. We must write the
INSERT into u SELECT * from t
to the binlog
BEFORE unlocking t (which was read-locked at least in MyISAM),
and not the contrary.
2003-03-12 01:05:04 +01:00
fa4f6e8998 Simple fixes (nothing notable)
dbug/dbug.c:
  Remove duplicate va_end() call
mysql-test/mysql-test-run.sh:
  Longer stack trace from valgrind
mysys/my_lib.c:
  Fixed wrong dbug printf
sql/slave.cc:
  Simple optimization
sql/sql_class.cc:
  Added DBUG info
2003-03-12 01:40:06 +02:00
ddd2f4fc3e - Fixed man page for apropos/whatis (thanks to Christian Hammers from Debian
for the patch) (bug #135)
2003-03-11 22:47:29 +01:00
ae9698cfd3 Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/greg/bk/mysql-4.0
2003-03-11 15:46:21 -05:00
b0a3c1c905 Merge sanja.is.com.ua:/home/bell/mysql/mysql-3.23
into sanja.is.com.ua:/home/bell/mysql/work-rand-3.23
2003-03-11 22:38:32 +02:00
8218d49dce Merge bk-internal:/home/bk/mysql-3.23/
into serg.mysql.com:/usr/home/serg/Abk/mysql
2003-03-11 21:21:11 +01:00
dccac58396 fixed an obscure bug in group by + having + Item_ref::get_date 2003-03-11 21:20:53 +01:00
6361cd89fc merge with 3.23 to get:
- Better detection of crashed .MYI file
- Ignore writeable config files


mysql-test/mysql-test-run.sh:
  Auto merged
mysys/default.c:
  Auto merged
myisam/mi_open.c:
  merge with 3.23
sql/mysqld.cc:
  merge with 3.23
2003-03-11 21:45:39 +02:00
d69a5630ff Cleaned up disk_pos_assert() to be more general. 2003-03-11 21:25:17 +02:00
564a134ced Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-11 20:09:49 +02:00
7f7e7220c2 - made test for multiple --user options more sh-compatible 2003-03-11 18:54:57 +01:00
fd59fb1031 A bug fix for multi-table updates with InnoDB storage engine 2003-03-11 19:40:49 +02:00
8162aec6b9 fixed bug of unchecked random part of WHERE clause (bug #142)
mysql-test/r/select.result:
  test of random WHERE clause
mysql-test/t/select.test:
  test of random WHERE clause
sql/sql_select.cc:
  fixed bug of unchecked random part of WHERE clause
2003-03-11 18:34:00 +02:00
11e0756966 - fixed C++-style comments in .c files to make IBM compiler happy
(it barfs on these with a syntax error)


sql/net_serv.cc:
   - fixed C++-style comment (this file is copied as libmysql_r/net.c)
strings/ctype-tis620.c:
   - fixed many C++-style comments
2003-03-11 15:37:31 +01:00
b65aee401c Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-03-11 15:40:09 +02:00
7b19426648 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-11 14:42:07 +02:00
f1662f3be9 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.last


BitKeeper/etc/logging_ok:
  auto-union
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
2003-03-11 13:52:19 +04:00
3ab655681c Openssl test
client/mysqltest.c:
  For openssl test
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-03-11 13:41:53 +04:00
0f88392dae novell40c.patch
netware/mysqld_safe.c:
  Import patch novell40c.patch
2003-03-10 18:32:38 -05:00
3f68b65e65 Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-3.23


mysql-test/mysql-test-run.sh:
  Auto merged
2003-03-11 00:17:34 +02:00
f26a8b6fb8 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-03-11 00:08:53 +02:00
f88ce7545d crash-me.sh:
misprint correction


sql-bench/crash-me.sh:
  misprint correction
2003-03-11 02:32:24 +05:00
cdb123c25b - added missing file mysql_secure_installation to server RPM subpackage
(bug #141) (please merge with 4.1 and onwards)


support-files/mysql.spec.sh:
  - added missing file mysql_secure_installation to server RPM subpackage
    (bug #141)
2003-03-10 20:21:11 +01:00
312f0366bc Merge bk-internal:/home/bk/mysql-3.23/
into serg.mysql.com:/usr/home/serg/Abk/mysql
2003-03-10 16:56:06 +01:00
326a93ff7d more propection in mi_open against badly corrupted MYI headers 2003-03-10 16:48:13 +01:00
39dbf6cb9b A fix for an obvious bug in hash generating proram. 2003-03-10 17:14:01 +02:00
530659e8a0 A fix for privilege checking bug.
sql/sql_parse.cc:
  Fix for a privilege bug in multi-table updates.
  Seems like better fix then chec_table_access.
2003-03-10 16:58:07 +02:00
9bfbea6882 - typo fix for newly added error message 2003-03-10 13:41:37 +01:00
605bfe93ef warning added 2003-03-10 13:16:59 +01:00
a6ea34ee5b merge
BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-delete.result:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/delete.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/delete.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2003-03-10 14:13:46 +02:00