1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-07 17:42:39 +03:00
Commit Graph

4447 Commits

Author SHA1 Message Date
lenz@mysql.com
216ca1e15d - fixed BUG#968 ("test: argument expected" error) - thanks to Alex Kiernan
for the patch
2003-08-01 10:09:23 +02:00
unknown
476bc61ae8 Merge oak.local:/home/kostja/mysql/mysql-4.1-root
into oak.local:/home/kostja/mysql/mysql-4.1
2003-07-18 11:53:50 +04:00
kostja@oak.local
9f98b79e3a Merge oak.local:/home/kostja/mysql/mysql-4.1-root
into oak.local:/home/kostja/mysql/mysql-4.1
2003-07-18 11:53:50 +04:00
unknown
96627521e8 fixed bug with location of mysql_create_sytem_tables 2003-07-17 12:15:41 -04:00
vva@eagle.mysql.r18.ru
e76d784864 fixed bug with location of mysql_create_sytem_tables 2003-07-17 12:15:41 -04:00
unknown
b1646502dd - removed options sort_buffer and key_buffer from calls to (my)isamchk
in mysqld_safe (commented out by default), to not override any options
   defined in my.cnf (thanks to Axel Schwenke from Jobpilot.de for the
   suggestion)
2003-07-15 12:50:17 +02:00
lenz@mysql.com
ca8831e1ad - removed options sort_buffer and key_buffer from calls to (my)isamchk
in mysqld_safe (commented out by default), to not override any options
   defined in my.cnf (thanks to Axel Schwenke from Jobpilot.de for the
   suggestion)
2003-07-15 12:50:17 +02:00
unknown
f200fa15db Fix for BUG#812
"mysqlhotcopy fails to copy tables but does not indicate a failure"
("does not indicate a failure");
this is about "mysqlhotcopy fails to copy tables".


mysql-test/t/rpl_error_ignored_table-slave.opt:
  added a missing newline
scripts/mysqlhotcopy.sh:
  Fix for BUG#812.
  The problem was that with many tables to copy (10000 in the bug's example),
  the generated 'cp' command line was 1MB long, whereas (at least on my Linux) it
  should not exceed 128 kB. Testing the 'cp' in a shell terminal gives
  "arguments list too long".
  So we issue several small (100 kB) 'cp' command lines instead of a big one.
  Of course, this will still fail on systems where the limit is below 100 kB.
  We now have safe_system() which cuts the command line in pieces,
  and calls safe_simple_system() (execution) for each piece.
2003-07-10 16:03:29 +02:00
guilhem@mysql.com
2ca501f7ea Fix for BUG#812
"mysqlhotcopy fails to copy tables but does not indicate a failure"
("does not indicate a failure");
this is about "mysqlhotcopy fails to copy tables".
2003-07-10 16:03:29 +02:00
unknown
2b16d5457b Merging 4.1 into 5.0 (second pass; post-merge fixes).
One test in subselect.test still wrong.
Had to reconstruct all errmsg.txt files completely, since auto-merge made
a mess of the lot. :-(


mysql-test/r/sp-error.result:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
mysql-test/r/subselect.result:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
  One test still wrong (different from 4.1), left for Sanja. :)
mysql-test/r/variables.result:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
mysql-test/t/sp-error.test:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
mysql-test/t/subselect.test:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
  One test still wrong (different from 4.1), left for Sanja :)
scripts/mysql_create_system_tables.sh:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/item.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/item_cmpfunc.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/item_subselect.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/item_sum.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/mysql_priv.h:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/mysqld.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/danish/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/dutch/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/english/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/estonian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/french/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/german/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/greek/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/hungarian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/italian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/japanese/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/korean/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/norwegian-ny/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/norwegian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/polish/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/portuguese/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/russian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/serbian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/slovak/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/spanish/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/swedish/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/ukrainian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sp.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_base.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_cache.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_insert.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_parse.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_select.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_update.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
2003-07-09 17:07:12 +02:00
pem@mysql.telia.com
a8a29a39d2 Merging 4.1 into 5.0 (second pass; post-merge fixes).
One test in subselect.test still wrong.
Had to reconstruct all errmsg.txt files completely, since auto-merge made
a mess of the lot. :-(
2003-07-09 17:07:12 +02:00
unknown
b5b615942c - Fixed mysqlhotcopy to actually abort if copying the tables failed.
(BUG#812)


scripts/mysqlhotcopy.sh:
   - Actually die if copying the tables fails instead of going on as if
     nothing was wrong (BUG#812)
2003-07-08 23:29:55 +02:00
lenz@mysql.com
7326dcbf23 - Fixed mysqlhotcopy to actually abort if copying the tables failed.
(BUG#812)
2003-07-08 23:29:55 +02:00
unknown
48b88d1a64 mysqlhotcopy.sh:
Undo serg's patch that used my_print_defaults,
  and instead simply do not define $opt{user}.
  This allows the script to use option files properly.


scripts/mysqlhotcopy.sh:
  Undo serg's patch that used my_print_defaults,
  and instead simply do not define $opt{user}.
  This allows the script to use option files properly.
2003-07-08 11:25:46 -05:00
paul@teton.kitebird.com
a5a3eb9439 mysqlhotcopy.sh:
Undo serg's patch that used my_print_defaults,
  and instead simply do not define $opt{user}.
  This allows the script to use option files properly.
2003-07-08 11:25:46 -05:00
unknown
d6b336359a Merge 4.1 into 5.0 (first pass).
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-cron-build:
  Delete: netware/BUILD/cron-build
BitKeeper/deleted/.del-crontab:
  Delete: netware/BUILD/crontab
BitKeeper/triggers/post-commit:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
netware/BUILD/compile-AUTOTOOLS:
  Auto merged
netware/BUILD/compile-linux-tools:
  Auto merged
netware/BUILD/compile-netware-END:
  Auto merged
netware/BUILD/compile-netware-START:
  Auto merged
netware/BUILD/compile-netware-all:
  Auto merged
netware/BUILD/compile-netware-debug:
  Auto merged
netware/BUILD/compile-netware-standard:
  Auto merged
netware/BUILD/mwasmnlm:
  Auto merged
netware/BUILD/mwccnlm:
  Auto merged
netware/BUILD/mwldnlm:
  Auto merged
netware/BUILD/nwbootstrap:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_error.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
2003-07-08 17:50:23 +02:00
pem@mysql.telia.com
9c3a7a6ba3 Merge 4.1 into 5.0 (first pass). 2003-07-08 17:50:23 +02:00
unknown
072162dff7 added missing ~/.my.cnf support to mysqlhotcopy (bug #808) 2003-07-08 17:27:22 +02:00
serg@serg.mylan
dbf893fbd4 added missing ~/.my.cnf support to mysqlhotcopy (bug #808) 2003-07-08 17:27:22 +02:00
unknown
4c2d3b0554 Fixed a compatibility bug in mysqlhotcopy between different
versions of DBD. New mysqlhotcopy version supports both old
and new DBD versions while versions elder than 1.19 support
only old DBD versions.
2003-07-04 23:06:21 +03:00
jani@rhols221.adsl.netsonic.fi
fe025d40c4 Fixed a compatibility bug in mysqlhotcopy between different
versions of DBD. New mysqlhotcopy version supports both old
and new DBD versions while versions elder than 1.19 support
only old DBD versions.
2003-07-04 23:06:21 +03:00
unknown
dbb088b034 First version of new authentification procedure: now authentification is one-stage (instead of two-stage in 4.1)
For now following tasks have been done:
- PASSWORD() function was rewritten. PASSWORD() now returns SHA1
  hash_stage2; for new passwords user.password contains '*'hash_stage2; sql_yacc.yy also fixed; 

- password.c: new functions were implemented, old rolled back to 4.0 state

- server code was rewritten to use new authorization algorithm (check_user(), change
  user, and other stuff in sql/sql_parse.cc)

- client code was rewritten to use new authorization algorithm
  (mysql_real_connect, myslq_authenticate in sql-common/client.c)

- now server barks on 45-byte-length 4.1.0 passwords and refuses 4.1.0-style
  authentification. Users with 4.1.0 passwords are blocked (sql/sql_acl.cc)

- mysqladmin.c was fixed to work correctly with new passwords

Tests for 4.0-4.1.1, 4.1.1-4.1.1 (with or without db/password) logons was performed;
mysqladmin also was tested. Additional check are nevertheless necessary.


BitKeeper/etc/ignore:
  Added start_mysqld.sh mysys/main.cc to the ignore list
client/mysqladmin.c:
  fixed with new password api
include/mysql.h:
  So as scramble_323 accepts only null-terminated message, two scramble buffs are necessary.
  gotta be fixed
include/mysql_com.h:
  new constants and password.c api changes
libmysql/libmysql.c:
  mysql_change_user rewritten to work with new password api
scripts/mysql_create_system_tables.sh:
  fixed 'Password' column length to 41
scripts/mysql_fix_privilege_tables.sql:
  fixed 'Password' column length to 41
sql-common/client.c:
  mysql_real_connect rewritten to support new handshake procedure
sql/item_strfunc.cc:
  Item_func_password and Item_func_old_password rewritten with new password api
sql/item_strfunc.h:
  bit commented, numbers replaced with #defined constants
sql/mysql_priv.h:
  removed unnecessary declaration as now all constants defined is in mysql_com.h
sql/mysqld.cc:
  scramble initialization moved to sql_parce.cc:check_connection
sql/password.c:
  All 4.1 functions were rolled back to 4.0 with attempt to save all possible 4.0-4.1 changes.
  Names for 4.0 functions were suffixed with '_323'
  Functions for new handshake were added.
sql/slave.cc:
  Fixed to new constant; Bug #766 remains to be fixed
sql/slave.h:
  fixed to new constant; Buf #766 remains to be fixed
sql/sql_acl.cc:
  rewritten to support new passwords (41 byte-long) and password api
sql/sql_acl.h:
  ditto
sql/sql_class.cc:
  initialization for new members added
sql/sql_class.h:
  same thing as in struct mysql - scramble is used for new family of functions, scramble_323 - for old
sql/sql_parse.cc:
  check_connections was renamed to check_connection as this name reflects better what this function does
  authorization part of check_connection was rewritten
  check_user was rewritten with new password and acl api
  new function 'authenticate', which optionally re-request scramble from client was added
  fixed some typos
  COM_CHANGE_USER piece of dipsatch_command() was rewritten
sql/sql_repl.h:
  HASH_PASSWORD_LENGTH replaced with SCRAMBLED_PASSWORD_CHAR_LENGTH
  bug #766 remains
sql/sql_yacc.yy:
  Two-argument form of PASSWORD() was removed
  PASSWORD() function was fixed with new password api.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-07-01 23:40:59 +04:00
kostja@oak.local
7df0475847 First version of new authentification procedure: now authentification is one-stage (instead of two-stage in 4.1)
For now following tasks have been done:
- PASSWORD() function was rewritten. PASSWORD() now returns SHA1
  hash_stage2; for new passwords user.password contains '*'hash_stage2; sql_yacc.yy also fixed; 

- password.c: new functions were implemented, old rolled back to 4.0 state

- server code was rewritten to use new authorization algorithm (check_user(), change
  user, and other stuff in sql/sql_parse.cc)

- client code was rewritten to use new authorization algorithm
  (mysql_real_connect, myslq_authenticate in sql-common/client.c)

- now server barks on 45-byte-length 4.1.0 passwords and refuses 4.1.0-style
  authentification. Users with 4.1.0 passwords are blocked (sql/sql_acl.cc)

- mysqladmin.c was fixed to work correctly with new passwords

Tests for 4.0-4.1.1, 4.1.1-4.1.1 (with or without db/password) logons was performed;
mysqladmin also was tested. Additional check are nevertheless necessary.
2003-07-01 23:40:59 +04:00
unknown
11e9c572ad Bug fixed: mysql-test failure on rpl tests
scripts/mysql_create_system_tables.sh:
  Fixed bug: mysql-test failure on rpl tests
2003-06-26 09:39:23 +05:00
gluh@gluh.mysql.r18.ru
7455759f11 Bug fixed: mysql-test failure on rpl tests 2003-06-26 09:39:23 +05:00
unknown
40654c71f4 mysql_create_system_tables.sh:
Type fix


scripts/mysql_create_system_tables.sh:
  Type fix
2003-06-24 15:55:39 +05:00
bar@bar.mysql.r18.ru
63235ceeef mysql_create_system_tables.sh:
Type fix
2003-06-24 15:55:39 +05:00
unknown
fff1f663c2 Fixed some new memory leaks
Updated VC++ files


VC++Files/client/mysql.dsp:
  Update of VC++ files
VC++Files/client/mysqlclient.dsp:
  Update of VC++ files
VC++Files/libmysqld/examples/test_libmysqld.dsp:
  Update of VC++ files
VC++Files/libmysqld/libmysqld.def:
  Update of VC++ files
VC++Files/libmysqld/libmysqld.dsp:
  Update of VC++ files
VC++Files/myisam/myisam.dsp:
  Update of VC++ files
VC++Files/mysql.dsw:
  Update of VC++ files
VC++Files/sql/mysqld.dsp:
  Update of VC++ files
include/mysql.h:
  Add missing client functions to embedded server
libmysql/libmysql.def:
  sort functions to enable comparison with libmysqld.def
libmysqld/libmysqld.c:
  Add missing client functions to embedded server
libmysqld/libmysqld.def:
  sort functions to enable comparison with libmysql.def
  Added missing functions
myisam/mi_preload.c:
  Fixed compiler warning.
  Small code cleanup
scripts/make_win_src_distribution.sh:
  Fixed typo
  Don't run zip in verbose mode
scripts/mysql_create_system_tables.sh:
  Change so that localhost has full access (to make this like 4.0)
scripts/mysql_fix_privilege_tables.sh:
  Allow on to run this from the source distribution
sql-common/client.c:
  Fixed memory leak
sql/item_sum.cc:
  Removed compiler warning
sql/slave.cc:
  Cleanup
sql/sql_client.cc:
  Portability fix
sql/sql_help.cc:
  Fixed memory leak
2003-06-24 12:10:35 +03:00
monty@narttu.mysql.fi
1bd306ccd4 Fixed some new memory leaks
Updated VC++ files
2003-06-24 12:10:35 +03:00
unknown
75689220fa - make sure that scripts/*.sql files are being added to the source
distribution as well
2003-06-20 13:57:51 +02:00
lenz@kallisto.local
7a6059cc88 - make sure that scripts/*.sql files are being added to the source
distribution as well
2003-06-20 13:57:51 +02:00
unknown
254cf2d5c7 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2003-06-18 09:49:56 +02:00
lenz@mysql.com
e7e5ccb547 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2003-06-18 09:49:56 +02:00
unknown
be551c2c4f Fix for --dirname and --suffix (missed ones)
scripts/make_win_src_distribution.sh:
  Fix for --dirname and --suffix (missed ones)
2003-06-17 14:29:20 -07:00
venu@myvenu.com
75b8cb2036 Fix for --dirname and --suffix (missed ones) 2003-06-17 14:29:20 -07:00
unknown
740024005f Added new HOWTO doc 'INSTALL-WIN-SOURCE' on building 'mysql clients and server' on WINDOWS from BitKeeper as well as from distributed source archive
scripts/make_win_src_distribution.sh:
  Fix for INSTALL-WIN-SOURCE
2003-06-17 12:22:57 -07:00
venu@myvenu.com
b648691535 Added new HOWTO doc 'INSTALL-WIN-SOURCE' on building 'mysql clients and server' on WINDOWS from BitKeeper as well as from distributed source archive 2003-06-17 12:22:57 -07:00
unknown
4cc0cd7b0d - changed "password" to "Password" as suggested by Paul DuBois to be
consistent with the other column names in the table.
2003-06-16 10:32:49 +02:00
lenz@mysql.com
3b7911d367 - changed "password" to "Password" as suggested by Paul DuBois to be
consistent with the other column names in the table.
2003-06-16 10:32:49 +02:00
unknown
ed1d28fdb6 Fixes for make_win_src_distributions
Removed compiler warnings


scripts/make_win_src_distribution.sh:
  Added option --dirname
  Also copy sql-common directory
  Create mysql data files even if mysqld is not installed
scripts/mysql_create_system_tables.sh:
  Update for usage with make_win_src_distribution
scripts/mysql_install_db.sh:
  Update for usage with make_win_src_distribution
sql-common/client.c:
  Portability fix
sql/item_cmpfunc.cc:
  Removed compiler warning
sql/sql_acl.cc:
  Indentation cleanup
  Removed compiler warning
sql/sql_parse.cc:
  Removed compiler warning
sql/sql_select.cc:
  Removed compiler warning
sql/sql_yacc.yy:
  Removed compiler warning
strings/ctype-utf8.c:
  Removed compiler warning
2003-06-15 23:24:37 +03:00
monty@narttu.mysql.fi
e090f2d0cc Fixes for make_win_src_distributions
Removed compiler warnings
2003-06-15 23:24:37 +03:00
unknown
9adfaf1b2f Added option --skip-kill-mysqld to mysqld_safe. This can be useful,
if one is running many mysqlds through mysqld_multi, for example.
Without this option, on Linux one mysqld_safe process may kill
other mysqlds as well, if started using the same binary and path.
2003-06-14 12:29:42 +03:00
jani@rhols221.adsl.netsonic.fi
8a52c2d20b Added option --skip-kill-mysqld to mysqld_safe. This can be useful,
if one is running many mysqlds through mysqld_multi, for example.
Without this option, on Linux one mysqld_safe process may kill
other mysqlds as well, if started using the same binary and path.
2003-06-14 12:29:42 +03:00
unknown
5efaeb958e - applied patch for mysqld_safe from Christian Hammers to be able to
define a different niceness level in my.cnf (Bug #627)


scripts/mysqld_safe.sh:
   - applied patch from Christian Hammers to be able to define a different
     niceness level in my.cnf (Bug #627)
2003-06-12 13:52:24 +02:00
lenz@mysql.com
63df5f7cb7 - applied patch for mysqld_safe from Christian Hammers to be able to
define a different niceness level in my.cnf (Bug #627)
2003-06-12 13:52:24 +02:00
unknown
bcdde9a556 - applied patch to mysql_explain_log.sh provided by Dennis Haney
to accept --socket option (Bug #592)


scripts/mysql_explain_log.sh:
   - applied patch provided by Dennis Haney to accept --socket option
     (Bug #592)
2003-06-11 13:40:20 +02:00
lenz@mysql.com
2daa5643d3 - applied patch to mysql_explain_log.sh provided by Dennis Haney
to accept --socket option (Bug #592)
2003-06-11 13:40:20 +02:00
unknown
824dd7f545 After merge fixes
mysql-test/r/repair_part1.result:
  Rename: mysql-test/r/repair.result -> mysql-test/r/repair_part1.result
mysql-test/t/repair_part1.test:
  Rename: mysql-test/t/repair.test -> mysql-test/t/repair_part1.test
include/sql_common.h:
  Declare not_error_sqlstate
scripts/Makefile.am:
  Added back fill_help_tables.sql
2003-06-05 23:19:56 +03:00
monty@narttu.mysql.fi
059b1e5612 After merge fixes 2003-06-05 23:19:56 +03:00
unknown
ad5e39bf12 merge with public tree
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
include/config-win.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_version.h.in:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/ctype_collate.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysys/default.c:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-06-05 00:12:45 +03:00