1
0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Commit Graph

1240 Commits

Author SHA1 Message Date
unknown
6f5b38b9dd fix error in result
mysql-test/r/func_test.result:
  Fixing the error in result
2002-11-21 18:14:27 +02:00
unknown
910849ccd1 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-11-20 22:57:42 +02:00
unknown
9b9546edbc Try to optimize the cache buffer size needed for bulk_insert
Fix for shutdown on Mac OS X


include/my_tree.h:
  Try to optimize the cache buffer size needed for bulk_insert
myisam/mi_write.c:
  Try to optimize the cache buffer size needed for bulk_insert
mysql-test/r/bdb.result:
  Make test repeatable
mysql-test/t/bdb.test:
  Make test repeatable
mysys/tree.c:
  Try to optimize the cache buffer size needed for bulk_insert
sql/mysql_priv.h:
  Small optimization
sql/mysqld.cc:
  Fix for shutdown on Mac OS X
sql/sql_insert.cc:
  Try to optimize the cache buffer size needed for bulk_insert
sql/sql_yacc.yy:
  Call thd->strmake() instead of sql_strmake()
sql/table.cc:
  Try to optimize the cache buffer size needed for bulk_insert
sql/table.h:
  Try to optimize the cache buffer size needed for bulk_insert
2002-11-20 22:56:57 +02:00
unknown
0c3106f964 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-11-20 15:17:57 +01:00
unknown
da6fc28210 bug in _ftb_strstr fixed :) 2002-11-20 15:17:17 +01:00
unknown
e9e8cdf01c Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-11-20 14:22:42 +02:00
unknown
925cd76bc9 Added tests for boolean operators in select part
Redo of changeset I commited, but failed to push


mysql-test/r/bool.result:
  Added tests for boolean operators in select part
mysql-test/t/bool.test:
  Added tests for boolean operators in select part
2002-11-18 13:41:07 +02:00
unknown
971db76533 Merge abelkin@work.mysql.com:/home/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/mysql-4.0
2002-11-17 20:44:16 +02:00
unknown
b463146ac6 new status variable (number of queries deleted because of low memory)
mysql-test/r/query_cache.result:
  test of new status variable
mysql-test/t/query_cache.test:
  test of new status variable
2002-11-17 20:41:25 +02:00
unknown
4589844513 merge::records_in_range and optimizer
sql/sql_select.cc:
  optimizer bug fixed. (what's the difference between s->records ans s->found_records ?)
2002-11-17 18:58:03 +01:00
unknown
bd1c2d65c4 Small improvement to alloc_root
Add support for LIMIT # OFFSET #
Changed lock handling:  Now all locks should be stored in TABLE_LIST instead of passed to functions.
Don't call query_cache_invalidate() twice in some cases
mysql_change_user() now clears states to be equal to close + connect.
Fixed a bug with multi-table-update and multi-table-delete when used with LOCK TABLES
Fixed a bug with replicate-do and UPDATE


BitKeeper/etc/ignore:
  added autom4te.cache/* bdb/dist/autom4te.cache/* innobase/autom4te.cache/*
include/my_alloc.h:
  Small improvement to alloc_root
libmysql/libmysql.c:
  Removed compiler warning
myisam/mi_page.c:
  Better DBUG message
mysql-test/r/multi_update.result:
  Added test with lock tables
mysql-test/r/rpl_replicate_do.result:
  Update results
mysql-test/r/rpl_rotate_logs.result:
  Make test independent of if t1 exists
mysql-test/t/multi_update.test:
  Added test with lock tables
mysql-test/t/rpl_rotate_logs.test:
  Make test independent of if t1 exists
mysys/my_alloc.c:
  Small imprevement to alloc_root
  (Don't free blocks less than ALLOC_MAX_BLOCK_ROOT (4K)
sql/ha_innodb.cc:
  More debug messages
sql/ha_myisam.cc:
  Safety change
sql/lex.h:
  Add support for LIMIT # OFFSET #
sql/lock.cc:
  Added assertion
sql/mysql_priv.h:
  Change of lock handling
sql/mysqld.cc:
  Added function clear_error_messages()
sql/sql_base.cc:
  Change lock handling by open_ltable() and open_and_lock_tables()
sql/sql_class.cc:
  Split THD::THD to two functions
  Move some code from cleanup() to ~THD:THD
  Add THD::change_user()
sql/sql_class.h:
  Prototype changes in class THD
sql/sql_delete.cc:
  Remove locking argument from mysql_delete()
  Locking type is now stored in TABLE_LIST
  Small code change to not call query_cache_invalidate() twice for transactional tables.
sql/sql_insert.cc:
  Remove locking argument from mysql_insert()
  Locking type is now stored in TABLE_LIST
  Small code change to not call query_cache_invalidate() twice for transactional tables.
  Don't use bulk insert if bulk_insert_buff_size is 0
sql/sql_parse.cc:
  Changes to make mysql_change_user() work as close+connect
  Changed command statistics to use statstics_increment to get more speed
  Update code to handle that locks is now stored in TABLE_LIST
sql/sql_update.cc:
  Remove locking argument from mysql_update()
  Locking type is now stored in TABLE_LIST
  Small code change to not call query_cache_invalidate() twice for transactional tables.
sql/sql_yacc.yy:
  Locking type is now stored in TABLE_LIST
  Added support for LIMIT # OFFSET # syntax
  Removed some wrong (never true) checks for SQLCOM_MULTI_UPDATE
mysql-test/t/rpl_replicate_do-slave.opt:
  Changed tables to use t1,t2,...
mysql-test/t/rpl_replicate_do.test:
  Changed tables to use t1,t2,...
2002-11-16 20:19:10 +02:00
unknown
20243b65d7 results updated
mysql-test/r/myisam.result:
  updated
2002-11-14 00:27:14 +01:00
unknown
9f8277f9a4 merged
BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
sql/ha_myisam.cc:
  Auto merged
innobase/row/row0sel.c:
  merged (ul - as 3.23's fix was a backport from 4.0)
mysql-test/r/myisam.result:
  merged - ul
2002-11-13 23:38:19 +01:00
unknown
ffb4dee5a5 optimize table corruption fixed, though more clean fix is desired.
Fix for another optimize bug is undone, as the new one handles both cases.
test added


mysql-test/r/myisam.result:
  updated
mysql-test/t/myisam.test:
  optimize table corruption test
sql/ha_myisam.cc:
  optimize table corruption fixed, though more clean fix is desired.
  Fix for another optimize bug is undone, as the new one handles both cases.
2002-11-13 22:55:32 +01:00
unknown
eae8e515b4 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-11-12 17:43:03 +02:00
unknown
e1c1abd0e1 Extended WEEK() to be able to handle ISO weeks.
unlink socket file if mysqld dies on startup
Some optimization of AND expressions


mysql-test/r/func_time.result:
  Update for new week() handling
mysql-test/t/func_time.test:
  Update for new week() handling
sql/item_cmpfunc.cc:
  Optimization of IF( and-expression,,)
sql/item_cmpfunc.h:
  Optimization of AND expressions
sql/item_timefunc.cc:
  Extended WEEK() to be able to handle ISO weeks.
sql/mysqld.cc:
  unlink socket file if mysqld dies on startup
sql/sql_base.cc:
  Fixed problem with SIGHUP and INSERT DELAYED
tests/Makefile.am:
  Added missing myisam-big-rows.tst file to source distribution
2002-11-12 12:42:42 +02:00
unknown
3165440cde Fixed that NULL and 0 returns 0 instead of NULL
This is coded to not cause a speed impact on top level AND expressions where we don't care if an AND expression returns 0 or NULL


mysql-test/r/bdb.result:
  Fix results after serges last patch
mysql-test/r/innodb.result:
  Fix results after serges last patch
mysql-test/r/null.result:
  Update for new AND handling of NULL
scripts/mysqld_safe.sh:
  Fix 'isroot' test to work even if user is not root
sql/item.h:
  Fixed that NULL and 0 returns 0 instead of NULL
sql/item_cmpfunc.cc:
  Fixed that NULL and 0 returns 0 instead of NULL
sql/item_cmpfunc.h:
  Fixed that NULL and 0 returns 0 instead of NULL
sql/sql_base.cc:
  Fixed that NULL and 0 returns 0 instead of NULL
sql/sql_parse.cc:
  Fixed that NULL and 0 returns 0 instead of NULL
sql/sql_select.cc:
  Fixed that NULL and 0 returns 0 instead of NULL
sql/sql_yacc.yy:
  Fixed that NULL and 0 returns 0 instead of NULL
2002-11-11 15:57:35 +02:00
unknown
dce4b2c958 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-11-09 20:29:22 +01:00
unknown
bb2ceda1b2 results fixed
mysql-test/r/isam.result:
  fixed result for new errmsg
mysql-test/r/select.result:
  fixed result for IGNORE/USE INDEX
2002-11-09 19:57:13 +01:00
unknown
8c14ed4230 IGNORE/USE INDEX now work with HA_EXTRA_KEYREAD
BitKeeper/etc/ignore:
  Added depcomp to the ignore list
2002-11-09 19:15:46 +01:00
unknown
b3a8b8bd19 Fixed bug in MAX() optimization when used with JOIN and ON expressions
sql/item_cmpfunc.cc:
  Create an AND expression from two expressions
sql/item_cmpfunc.h:
  Create an AND expression from two expressions
2002-11-09 09:51:03 +02:00
unknown
125913c3e1 manually merged
sql/field.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
2002-11-07 21:56:24 +01:00
unknown
4060f08307 Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0
sql/field.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2002-11-07 04:03:44 +02:00
unknown
72413e7f81 Put temporary files in binlog cache when using BEGIN/COMMIT
Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
New variables @@rand_seed1 and @@rand_seed2 (used by replication)
DROP TEMPORARY TABLE


mysql-test/r/rpl_log.result:
  Update of results after last replication change
mysql-test/r/variables.result:
  Test of new variables @@rand_seed1 and @@rand_seed2
mysql-test/t/variables.test:
  Test of new variables @@rand_seed1 and @@rand_seed2
sql/field.cc:
  Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
sql/field.h:
  Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
sql/item_func.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/log.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
  More debug information
sql/log_event.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/log_event.h:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/set_var.cc:
  Add system variables @@rand_seed1 and @@rand_seed2
sql/set_var.h:
  Add system variables @@rand_seed1 and @@rand_seed2
sql/slave.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_acl.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_base.cc:
  Store DROP of temporary tables in binlog cache
sql/sql_class.h:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_db.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_delete.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_insert.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_lex.h:
  DROP TEMPORARY TABLE
sql/sql_load.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_parse.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_rename.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_repl.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_repl.h:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_table.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_update.cc:
  Put temporary files in binlog cache when using BEGIN/COMMIT
sql/sql_yacc.yy:
  DROP TEMPORARY
sql/table.cc:
  Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
sql/unireg.cc:
  Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
2002-11-07 04:02:37 +02:00
unknown
c5d4041347 BETWEEN fixed
myisam/ft_nlq_search.c:
  cleanup
mysql-test/r/func_time.result:
  updated
2002-11-06 16:21:41 +01:00
unknown
f9b7e3abc8 Merge
Docs/manual.texi:
  SCCS merged
sql/field.h:
  SCCS merged
sql/ha_innodb.cc:
  SCCS merged
sql/handler.cc:
  SCCS merged
sql/item_cmpfunc.cc:
  SCCS merged
sql/mysqld.cc:
  SCCS merged
2002-11-06 09:52:13 +01:00
unknown
c15f6960bc Merge mysql.com:/home/pz/mysql/mysql-4.0-root
into mysql.com:/home/pz/mysql/mysql-4.0
2002-11-06 10:06:18 +03:00
unknown
23f4865b16 Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0 2002-11-06 00:41:26 +02:00
unknown
2eb2786dcc fixed bdb transaction with query cache bug 2002-11-06 00:41:25 +02:00
unknown
841fa6f694 Removed wrong patch to fix DATE BETWEEN TIMESTAMP1 AND TIMESTAMP2
Some simple optimizations


Docs/manual.texi:
  Updted how binary log works
mysql-test/mysql-test-run.sh:
  Added usage of --port to mysqltest
mysql-test/r/func_test.result:
  Moved test of datetime comparison to func_time
mysql-test/r/func_time.result:
  New test
mysql-test/t/func_test.test:
  Moved test of datetime comparison to func_time
mysql-test/t/func_time.test:
  Test of DATE BETWEEN TIMESTAMPS
sql/field.h:
  Removed wrong patch
sql/item_cmpfunc.cc:
  Removed wrong patch
  (Need to be fixed by taking into account all arguments to between)
sql/lock.cc:
  Removed call to current_thd
sql/set_var.cc:
  Don't show 'socket' variable if sockets are not used
sql/sql_base.cc:
  Simple optimisation
2002-11-05 22:45:42 +02:00
unknown
2f775fca9a Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-11-05 22:00:51 +02:00
unknown
781c7901cb updated test results 2002-11-05 18:38:27 +01:00
unknown
66f4e1b9ac merged
BitKeeper/deleted/.del-compile-pentium-valgrind-max:
  Delete: BUILD/compile-pentium-valgrind-max
Build-tools/Do-compile:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/stacktrace.c:
  Auto merged
2002-11-05 17:10:31 +01:00
unknown
3fbb702946 TEMPORARY MERGE tables are allowed 2002-11-05 00:00:51 +01:00
unknown
4a09aa82eb Merge mysql.com:/home/pz/mysql/mysql-4.0-root
into mysql.com:/home/pz/mysql/mysql-4.0
2002-11-02 17:30:20 +03:00
unknown
646ae53f8a Added test case for the last fix 2002-11-02 16:10:53 +02:00
unknown
e03ca6bda4 Merge mysql.com:/home/pz/mysql/mysql-4.0-root
into mysql.com:/home/pz/mysql/mysql-4.0
2002-10-31 12:57:57 +03:00
unknown
ec952f21f8 Merge
configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
Docs/manual.texi:
  SCCS merged
2002-10-31 10:44:20 +02:00
unknown
7806888465 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
mysql-test/r/innodb.result:
  Auto merged
2002-10-31 10:44:19 +02:00
unknown
35396ec7cd innodb.result:
We changed MySQL default isolation yesterday to REPEATABLE READ


mysql-test/r/innodb.result:
  We changed MySQL default isolation yesterday to REPEATABLE READ
2002-10-30 23:51:12 +02:00
unknown
1c8ca97fd6 A fix for bug when comparing a datetime column with timestamp
values with BETWEEN clause
2002-10-30 22:08:34 +02:00
unknown
60d46b9086 merge
include/my_global.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2002-10-29 23:54:37 +02:00
unknown
31ba88c0c1 Added --skip-safemalloc to mysqltest
Added bug fix from 3.23 for AIX 4.3.3 and gcc 3.x
Small change in EXCHANGE output
Propagate open-files-limit from mysqld_safe -> mysqld
Fixed speed bug in GROUP BY
Added quotes around database name in CREATE DATABASE db_name (for binary log)


BitKeeper/etc/ignore:
  added stamp-h1
Docs/manual.texi:
  Added 4.1 manual section
  Updated changelog
client/mysqltest.c:
  Added --skip-safemalloc
include/my_global.h:
  Added bug fix from 3.23 for AIX 4.3.3 and gcc 3.x
mysql-test/mysql-test-run.sh:
  Start mysqltest with --skip-safemalloc (To get it faster)
mysql-test/r/bdb.result:
  Update for new EXPLAIN output
mysql-test/r/compare.result:
  Update for new EXPLAIN output
mysql-test/r/create.result:
  Update for new EXPLAIN output
mysql-test/r/distinct.result:
  Update for new EXPLAIN output
mysql-test/r/explain.result:
  Update for new EXPLAIN output
mysql-test/r/group_by.result:
  Update for new EXPLAIN output
mysql-test/r/heap.result:
  Update for new EXPLAIN output
mysql-test/r/innodb.result:
  Update for new EXPLAIN output
mysql-test/r/join_outer.result:
  Update for new EXPLAIN output
mysql-test/r/key_diff.result:
  Update for new EXPLAIN output
mysql-test/r/merge.result:
  Update for new EXPLAIN output
mysql-test/r/null_key.result:
  Update for new EXPLAIN output
mysql-test/r/order_by.result:
  Update for new EXPLAIN output
mysql-test/r/select.result:
  Update for new EXPLAIN output
mysql-test/r/temp_table.result:
  Fixed speed bug in GROUP BY
mysql-test/r/type_datetime.result:
  Update for new EXPLAIN output
mysql-test/r/user_var.result:
  Update for new EXPLAIN output
mysql-test/r/variables.result:
  Removed variable safe_show_database
mysql-test/t/temp_table.test:
  Fixed speed bug in GROUP BY
mysql-test/t/variables.test:
  Removed not used variable safe_show_databases
scripts/mysqld_safe.sh:
  Propagate open-files-limit from mysqld_safe -> mysqld
sql/mysqld.cc:
  Removed variable safe_show_database
sql/set_var.cc:
  Removed variable safe_show_database
sql/slave.cc:
  Updated error message
sql/sql_db.cc:
  Added quotes around database name in CREATE DATABASE db_name
sql/sql_select.cc:
  Fixed speed bug in GROUP BY
2002-10-29 22:56:30 +02:00
unknown
ea3ffb9b3e Added back old LARGEFILE handling
Fixed reference to freed memory in acl_init()/grant_init()
Fixed possible memory leak. (Could only happen in very strange circumstances)
Fixed bug in ALTER TABLE with BDB tables
Updated mysql-test for valgrind


Docs/manual.texi:
  ChangeLog
acinclude.m4:
  Added back old LARGEFILE handling.
  (Needed to get MySQL to compile on Solaris 2.9 with gcc 3.x)
configure.in:
  Added back old LARGEFILE handling.
  (Needed to get MySQL to compile on Solaris 2.9 with gcc 3.x)
libmysqld/lib_sql.cc:
  Fixed reference to freed memory
mysql-test/mysql-test-run.sh:
  Added option --valgrind
mysys/Makefile.am:
  Removed warning when doing make
sql/mysqld.cc:
  Free regexp memory on shutdown.
  read 'des' key files from data directory
  Fixed reference to freed memory in grant_init()
sql/slave.cc:
  Fixed wrong printf() argument
sql/sql_acl.cc:
  Fixed reference to freed memory
sql/sql_acl.h:
  Fixed reference to freed memory
sql/sql_base.cc:
  Fixed possible memory leak. (Could only happen in very strange circumstances)
sql/sql_parse.cc:
  Updated arguments to grant_reload()
sql/sql_table.cc:
  Fixed bug in ALTER TABLE with BDB tables
sql/sql_yacc.yy:
  memset -> bzero
2002-10-29 21:59:03 +02:00
unknown
05512a0145 fixed MyISAM crash on dynamic-row tables with huge number of to-be-packed fields 2002-10-28 22:52:02 +01:00
unknown
7cbe573473 Merge mysql.com:/home/pz/mysql/mysql-4.0-root
into mysql.com:/home/pz/mysql/mysql-4.0
2002-10-26 22:27:22 +04:00
unknown
f5563ddad4 merged
BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-skipkeys~53ffbfa7d2fa9fb:
  Delete: BitKeeper/etc/skipkeys
BitKeeper/etc/skipkeys:
  Rename: BitKeeper/deleted/.del-skipkeys~f623848ba4db5c3 -> BitKeeper/etc/skipkeys
Build-tools/Do-compile:
  Auto merged
Docs/manual.texi:
  Auto merged
innobase/pars/lexyy.c:
  Auto merged
innobase/pars/pars0grm.c:
  Auto merged
mysys/my_init.c:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
sql/nt_servc.cc:
  Auto merged
sql/nt_servc.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/t/bdb-crash.test:
  Auto merged
2002-10-25 21:15:52 +00:00
unknown
7a8e330f3b Fixed problem with BDB tables and ALTER TABLE
Docs/manual.texi:
  ChangeLog
mysql-test/t/bdb-crash.test:
  Don't run test if BDB is not configured
sql/sql_base.cc:
  Added free on error
2002-10-24 01:29:29 +03:00
unknown
e85943bde3 Merge mysql.com:/home/pz/mysql/mysql-4.0-root
into mysql.com:/home/pz/mysql/mysql-4.0
2002-10-19 22:37:18 +04:00
unknown
320d4912f4 Fixes after last merge.
Ignore changed keyblocks when on does DELETE FROM table_name;


acinclude.m4:
  Don't give warnings when using openssl installed in /usr/include with gcc 3.x
myisam/mi_delete_all.c:
  Ignore changed keyblocks when on does DELETE FROM table_name;
mysql-test/r/null_key.result:
  Fix null test
sql/ha_innodb.cc:
  Fix bug in last merge
sql/sql_parse.cc:
  Fix bug introduced with merge
2002-10-16 19:05:10 +03:00