Commit graph

1695 commits

Author SHA1 Message Date
unknown
9de8ae5fd0 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


mysql-test/mysql-test-run.sh:
  Auto merged
client/mysqltest.c:
  Auto merged
2001-06-08 19:26:11 -06:00
unknown
26ffc5d4de auto-magic replication redirection logic support in the client,
compiles, passes test suite, does magic, has bugs, but none that I know 
at this point. Have not tested everything yet, though. Changed
a lot of code in the client, but normal stuff appears to be working.


BUILD/SETUP.sh:
  make sure client link statically
client/mysqltest.c:
  new commands to test replication probe/parse
include/errmsg.h:
  new error messages
include/mysql.h:
  support for replication auto-magic
libmysql/errmsg.c:
  new error messages
libmysql/libmysql.c:
  replication probe/parse auto-magic
mysql-test/mysql-test-run.sh:
  --client-gdb to run the client in debugger
2001-06-08 19:24:41 -06:00
unknown
2db2a22cbf Merge tonu@work.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/tonu/mysql-4.0
2001-06-08 22:31:43 +03:00
unknown
32692277b9 Fixed compile-time warnings
vio/viossl.c:
  Fixed compile-time warnings by moving code around plus small fixes
2001-06-08 22:28:57 +03:00
unknown
9cda81a4b8 bk resolve work
BitKeeper/etc/logging_ok:
  auto-union
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_lex.h:
  Added SQLCOM_MULTI_DELETE
sql/sql_parse.cc:
  added division of LEX while keeping Monty's code for symlinks
2001-06-07 14:25:45 +03:00
unknown
823586b2c7 Enhancing both multi-table delete and division of LEX
sql/filesort.cc:
  removing of some extra comments
sql/sql_class.h:
  Clear division between new and old stripping code
sql/sql_delete.cc:
  Stripping of unnecessary code and making it more efficient
sql/sql_parse.cc:
  Better split of LEX into two and enhancements in multi table delete
sql/sql_yacc.yy:
  More efficient division of LEX and optional syntax in multi - table delete
sql/uniques.cc:
  fixing some additional bugs
2001-06-07 14:10:58 +03:00
unknown
17bc31504d Removed --use-symbolic-links 2001-06-07 00:23:55 +03:00
unknown
db6d4e9faa Merge work:/my/mysql-4.0 into hundin.mysql.fi:/home/tim/mysql-4.0
BitKeeper/etc/logging_ok:
  auto-union
2001-06-05 04:18:23 +03:00
unknown
d637e1dcd5 violite.h Don't define st_vio if EMBEDDED_LIBRARY.
include/violite.h:
  Don't define st_vio if EMBEDDED_LIBRARY.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-05 04:15:13 +03:00
unknown
53b2430218 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2001-06-05 03:49:56 +03:00
unknown
ab4d92798f Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0


Docs/manual.texi:
  Auto merged
2001-06-05 02:49:55 +02:00
unknown
d82a86e61b merge
client/mysqltest.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
2001-06-05 03:48:25 +03:00
unknown
fe1842d9ee Symlinking of tables should not work.
Fixed error number handling bug in mysqltest.
Fixed that error number from insert delayed is reported correctly.
merged new vio code with old violite code.


client/mysqltest.c:
  Fixed bug that error numbers wasn't tested properly.
myisam/mi_check.c:
  Moved initialization of variables to avoid a bug.
myisam/mi_create.c:
  Fixed bug in symlink handling.
myisam/mi_test_all.sh:
  Fixed script so that it works.
myisam/myisamchk.c:
  Removed --no-symlinks option
mysql-test/mysql-test-run.sh:
  Cleaned up error message
mysql-test/t/bdb.test:
  Fixed wrong error numbers
mysql-test/t/err000001.test:
  Fixed wrong error numbers
mysql-test/t/innodb.test:
  Fixed wrong error numbers
mysql-test/t/overflow.test:
  Fixed wrong error numbers
mysql-test/t/status.test:
  Ensure that we are using myisam tables for the lock test.
mysys/my_delete.c:
  cleanup
mysys/my_symlink2.c:
  Added option to not overwrite files when using symlinks.
sql/Makefile.am:
  Moved vio to avoid link error.
sql/ha_myisam.cc:
  Fixed symlink handling.
sql/mysqld.cc:
  Changed --skip-symlinks to --skip-symlink
sql/sql_insert.cc:
  Fixed that error number from insert delayed is reported correctly
sql/sql_parse.cc:
  Fixed symlink handling.
sql/sql_table.cc:
  Fixed symlink handling.
vio/vio.c:
  cleanup
vio/viosocket.c:
  c
2001-06-05 03:38:10 +03:00
unknown
011b141574 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
2001-06-04 18:06:27 -06:00
unknown
0b4000fe07 manual.texi mysqlhotcopy reads [mysqlhotcopy] option group,
manual.texi	not [mysql-hot-copy].


Docs/manual.texi:
  mysqlhotcopy reads [mysqlhotcopy] option group,
  not [mysql-hot-copy].
2001-06-04 18:53:20 -05:00
unknown
bd58e5e12f Merge work:/home/bk/mysql-4.0
into threads.polyesthetic.msg:/home/tim/my/4
2001-06-04 19:40:44 -04:00
unknown
1baef9839d Merge work:/home/bk/mysql-4.0
into threads.polyesthetic.msg:/home/tim/my/4


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-04 19:39:55 -04:00
unknown
fdff9c0a45 Merge mysql.sashanet.com:/home/sasha/src/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysys/tree.c:
  Auto merged
sql-bench/bench-init.pl.sh:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
2001-06-04 17:34:11 -06:00
unknown
09db695543 vio.c Vio code bugfix
violite.h	Code cleanup


include/violite.h:
  Code cleanup
vio/vio.c:
  Vio code bugfix
2001-06-05 02:28:33 +03:00
unknown
2197533b9b manual.texi @xref{safe_mysqld}
manual.texi	-> @xref{safe_mysqld, @code{safe_mysqld}}
manual.texi	Unixes -> versions of Unix (or similar edit)
manual.texi	@xref{mysqlxxx} -> @xref{mysqlxxx, @code{mysqlxxx}}


Docs/manual.texi:
  @xref{safe_mysqld}
  -> @xref{safe_mysqld, @code{safe_mysqld}}
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-04 17:39:47 -05:00
unknown
bc0befda9c Various changes to get libmysqld in sync with latest sources.
BitKeeper/etc/ignore:
  Added libmysqld/uniques.cc
client/mysqltest.c:
  Don't core dump if --socket isn't specified.
  
  Add --test-file option, to facilitate running mysqltest under debugger.
libmysqld/Makefile.am:
  We need uniques.cc
libmysqld/lib_sql.cc:
  Tiny cleanup.
libmysqld/libmysqld.c:
  Split mysql_real_query() into mysql_send_query() and
  mysql_read_query_results().
2001-06-04 18:34:04 -04:00
unknown
c866beb513 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2001-06-04 15:16:41 +03:00
unknown
5fa38499a6 .
Changed usage of sumlink/realpath  in fn_format() to be compatbile
with old MySQL code


mysys/mf_format.c:
  Changed usage of sumlink/realpath to be compatbile with old MySQL code.
2001-06-04 15:16:26 +03:00
unknown
9d77fddc79 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2001-06-04 04:08:54 +03:00
unknown
83c9bb3b73 Fixed portability problem.
sql-bench/Comments/postgres.benchmark:
  Added warning about PostgreSQL 7.1.1
2001-06-04 04:08:30 +03:00
unknown
9d4272bbac manual.texi website address change
row0sel.c	CHECK TABLE now also for InnoDB, a join speed optimization
trx0trx.c	CHECK TABLE now also for InnoDB, a join speed optimization
rem0cmp.c	CHECK TABLE now also for InnoDB, a join speed optimization
row0mysql.c	CHECK TABLE now also for InnoDB, a join speed optimization
page0page.c	CHECK TABLE now also for InnoDB, a join speed optimization
row0mysql.h	CHECK TABLE now also for InnoDB, a join speed optimization
trx0trx.h	CHECK TABLE now also for InnoDB, a join speed optimization
btr0btr.h	CHECK TABLE now also for InnoDB, a join speed optimization
btr0cur.h	CHECK TABLE now also for InnoDB, a join speed optimization
btr0pcur.h	CHECK TABLE now also for InnoDB, a join speed optimization
btr0pcur.ic	CHECK TABLE now also for InnoDB, a join speed optimization
btr0btr.c	CHECK TABLE now also for InnoDB, a join speed optimization
btr0cur.c	CHECK TABLE now also for InnoDB, a join speed optimization
btr0sea.c	CHECK TABLE now also for InnoDB, a join speed optimization
innodb.result	CHECK TABLE now also for InnoDB, a join speed optimization
ha_innobase.cc	CHECK TABLE now also for InnoDB, a join speed optimization
ha_innobase.h	CHECK TABLE now also for InnoDB, a join speed optimization


sql/ha_innobase.cc:
  CHECK TABLE now also for InnoDB, a join speed optimization
sql/ha_innobase.h:
  CHECK TABLE now also for InnoDB, a join speed optimization
mysql-test/r/innodb.result:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/btr/btr0btr.c:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/btr/btr0cur.c:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/btr/btr0sea.c:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/btr0btr.h:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/btr0cur.h:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/btr0pcur.h:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/btr0pcur.ic:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/row0mysql.h:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/trx0trx.h:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/page/page0page.c:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/rem/rem0cmp.c:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/row/row0mysql.c:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/row/row0sel.c:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/trx/trx0trx.c:
  CHECK TABLE now also for InnoDB, a join speed optimization
Docs/manual.texi:
  website address change
2001-06-03 22:58:03 +03:00
unknown
4e886689b2 These are actually two changesets. One for splitting LEX in two and
the other for multi-table delete


sql/filesort.cc:
  Fixed some bugs for Unique class
sql/item.cc:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc
sql/item_sum.cc:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc
sql/mysql_priv.h:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc
sql/sql_class.h:
  Adding multi table delete
sql/sql_delete.cc:
  Added multi-table delete
sql/sql_lex.cc:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc
sql/sql_lex.h:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc
sql/sql_parse.cc:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc, plus added multi-table delete
sql/sql_select.cc:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc
sql/sql_update.cc:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc
sql/sql_yacc.yy:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc, plus added multi-table delete
sql/uniques.cc:
  Fixed some bugs in duplicate stripping
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-03 17:07:26 +03:00
unknown
5ec76be436 Declare stpcpy() to fix portability problem on AIX with gcc 2.95.3
Fixed problem with command line arguments on 64 bit machines when
we use ~0 to indicate 'no limit'


include/m_string.h:
  Declare stpcpy() to fix portability problem on AIX with gcc 2.95.3
mysys/getvar.c:
  Fixed problem on 64 bit machines when we use ~0 to indicate 'no limit'.
sql-bench/Comments/postgres.benchmark:
  U
2001-06-03 16:45:49 +03:00
unknown
45c6bb8aa5 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2001-06-03 12:26:46 +03:00
unknown
cf42a95562 Added ABS() to make tests more portable.
New postgresql crash-me file.
Increased blob size in benchmarks from 65K to 1M.


mysql-test/t/select.test:
  Added ABS() to make tests more portable
mysys/tree.c:
  Added missing call to tree->free  (MySQL didn't use this)
sql-bench/Comments/postgres.benchmark:
  Updated documentation
sql-bench/bench-init.pl.sh:
  Updated version number (changed blob size)
sql-bench/limits/pg.cfg:
  New postgres results
sql-bench/server-cfg.sh:
  Updated to PostgreSQL 7.1.1
sql-bench/test-connect.sh:
  Changed select_big -> select_big_str
tests/fork_big.pl:
  Added count(distinct) test
2001-06-03 12:26:24 +03:00
unknown
0105fae75f Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
BitKeeper/etc/logging_ok:
  auto-union
sql/mysqld.cc:
  Auto merged
2001-06-03 09:06:12 +02:00
unknown
b6cb800dbe misplaced #ifdef fixed
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-03 09:03:24 +02:00
unknown
1da42e7b8a some code for replication awareness support - this is a temporary
commit - it compiles, and test suite still passes, but it is not finished . The
purpose of the commit is backup/code sharing/code review


include/mysql.h:
  API prototypes for replication-aware client
libmysql/libmysql.c:
  some code for replication awareness support
2001-06-02 20:02:43 -06:00
unknown
46c2c71016 Merge paul@work.mysql.com:/home/bk/mysql
into central.snake.net:/home/paul/mysql


Docs/manual.texi:
  Auto merged
2001-06-02 12:56:19 -05:00
unknown
05cfa81185 manual.texi ISAM Tables: show how to convert to MySQL so mysqlcheck
manual.texi	can be used.


Docs/manual.texi:
  ISAM Tables: show how to conver to MySQL so mysqlcheck
  can be used.
2001-06-02 12:48:05 -05:00
unknown
1b4d4338d4 Added missing flag latvia.eps
Fixed file permissions in Flags


Docs/Flags/australia.eps:
  Change mode to -rw-rw-r--
Docs/Flags/australia.txt:
  Change mode to -rw-rw-r--
Docs/Flags/austria.eps:
  Change mode to -rw-rw-r--
Docs/Flags/austria.txt:
  Change mode to -rw-rw-r--
Docs/Flags/canada.eps:
  Change mode to -rw-rw-r--
Docs/Flags/canada.txt:
  Change mode to -rw-rw-r--
Docs/Flags/czech-republic.eps:
  Change mode to -rw-rw-r--
Docs/Flags/czech-republic.txt:
  Change mode to -rw-rw-r--
Docs/Flags/germany.eps:
  Change mode to -rw-rw-r--
Docs/Flags/germany.txt:
  Change mode to -rw-rw-r--
Docs/Flags/great-britain.eps:
  Change mode to -rw-rw-r--
Docs/Flags/great-britain.txt:
  Change mode to -rw-rw-r--
Docs/Flags/hungary.eps:
  Change mode to -rw-rw-r--
Docs/Flags/hungary.txt:
  Change mode to -rw-rw-r--
Docs/Flags/israel.eps:
  Change mode to -rw-rw-r--
Docs/Flags/israel.txt:
  Change mode to -rw-rw-r--
Docs/Flags/italy.eps:
  Change mode to -rw-rw-r--
Docs/Flags/italy.txt:
  Change mode to -rw-rw-r--
Docs/Flags/japan.eps:
  Change mode to -rw-rw-r--
Docs/Flags/japan.txt:
  Change mode to -rw-rw-r--
Docs/Flags/russia.eps:
  Change mode to -rw-rw-r--
Docs/Flags/russia.txt:
  Change mode to -rw-rw-r--
Docs/Flags/south-korea.eps:
  Change mode to -rw-rw-r--
Docs/Flags/south-korea.txt:
  Change mode to -rw-rw-r--
Docs/Flags/sweden.eps:
  Change mode to -rw-rw-r--
Docs/Flags/sweden.txt:
  Change mode to -rw-rw-r--
Docs/Flags/taiwan.eps:
  Change mode to -rw-rw-r--
Docs/Flags/taiwan.txt:
  Change mode to -rw-rw-r--
Docs/Flags/usa.eps:
  Change mode to -rw-rw-r--
Docs/Flags/usa.txt:
  Change mode to -rw-rw-r--
2001-06-02 11:36:14 +03:00
unknown
2cf8889f57 do not show user/pass for slave unless running with show-slave-auth-info
cleanup of register_slave_on_master()


mysql-test/r/rpl000002.result:
  new output of show slave hosts
sql/mysqld.cc:
  user and password are shown in show slave hosts only if show-slave-auth-info option is on
sql/slave.cc:
  cleanup of register_slave_on_master()
sql/sql_repl.cc:
  do not show user/pass for slave unless running with show-slave-auth-info
sql/sql_repl.h:
  show-slave-auth-info
2001-06-01 21:15:15 -06:00
unknown
6b5d02ac53 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-06-01 20:06:51 -06:00
unknown
20763b0dbc sql/slave.cc
fixed bad merge


sql/slave.cc:
  fixed bad merge
2001-06-01 17:53:52 -06:00
unknown
e223bd30b3 Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2001-06-01 17:50:19 -06:00
unknown
2c15fdb556 Merge mysql.sashanet.com:/home/sasha/src/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-06-01 17:44:02 -06:00
unknown
d405cfb996 test if dirty close releases global read lock held by a thread 2001-06-01 17:43:32 -06:00
unknown
57546cb792 merge 2001-06-02 00:20:06 +02:00
unknown
8414e43deb Fixed bugs in symlink code
client/errmsg.c:
  Added portuguese error messages.
2001-06-02 01:16:26 +03:00
unknown
e587f1cbe6 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
sql/slave.cc:
  Auto merged
2001-06-01 16:08:40 -06:00
unknown
dc1104c1ff fixed new bug in fn_format()
mysys/mf_format.c:
  fixed a typo bug
2001-06-01 16:07:14 -06:00
unknown
9f0b7b7cf7 merge
BitKeeper/etc/logging_ok:
  auto-union
include/my_sys.h:
  Auto merged
myisam/myisamchk.c:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/sql_table.cc:
  Auto merged
2001-06-01 23:51:23 +02:00
unknown
3be9c739c1 worked around one bug in the new symlink code, but hit another
test case included ( drop) - currently fails, along with rpl000009


mysql-test/r/drop.result:
  new test
mysql-test/t/drop.test:
  expose a bug in the new symlink table code
sql/slave.cc:
  turn off symlink bit to avoid a bug
sql/sql_repl.cc:
  turn off symlink bit to avoid a bug
2001-06-01 15:13:02 -06:00
unknown
3e8412b89b Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
Docs/manual.texi:
  Auto merged
2001-06-02 00:03:39 +03:00
unknown
7c077e68f6 Fixed bug that caused client to hang because mysqld never did send an
error message if the table open or the index creation failed.
Updated portuguese error messages.
Fix for OS/2 that affected CHECK TABLE.


Docs/manual.texi:
  Changelog.
libmysql/errmsg.c:
  Updated portuguese error messages
mysys/my_copy.c:
  Fix for OS/2
sql/net_pkg.cc:
  cleanup
sql/share/portuguese/errmsg.txt:
  Updated portuguese error messages
sql/slave.cc:
  Cleanup.
  Fixed bug that caused client to hang because mysqld never did
  send an error message if the table open or the index creation failed.
sql/sql_parse.cc:
  Moved handling of 'no_send_ok' to fetch_nx_table.
sql/sql_table.cc:
  Cleanup.
2001-06-02 00:03:16 +03:00