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

3113 Commits

Author SHA1 Message Date
unknown
08177508f5 dict0dict.c:
Remove redundant code; parse both the database name and the table name in a FOREIGN KEY constraint with quotes in mind
row0mysql.c, ha_innodb.cc, sql_table.cc:
  Return error message Cannot delete or update a parent row... if we try to drop a table which is referenced by a FOREIGN KEY constraint, and the user has not set foreign_key_checks=0


sql/sql_table.cc:
  Return error message Cannot delete or update a parent row... if we try to drop a table which is referenced by a FOREIGN KEY constraint, and the user has not set foreign_key_checks=0
sql/ha_innodb.cc:
  Return error message Cannot delete or update a parent row... if we try to drop a table which is referenced by a FOREIGN KEY constraint, and the user has not set foreign_key_checks=0
innobase/row/row0mysql.c:
  Return error message Cannot delete or update a parent row... if we try to drop a table which is referenced by a FOREIGN KEY constraint, and the user has not set foreign_key_checks=0
innobase/dict/dict0dict.c:
  Remove redundant code; parse both the database name and the table name in a FOREIGN KEY constraint with quotes in mind
2004-02-02 00:10:45 +02:00
unknown
ef55f2dcdb Fix for bug #2523 '"func_time" test fails on QNX'.
Moved all range checks for TIMESTAMP value to my_gmt_sec().
Also fixed check of upper boundary of TIMESTAMP range (which 
also now will catch datetime values which are too small for
TIMESTAMP in case if time_t is unsigned).  


mysql-test/r/timezone.result:
  Added test which checks if TIMESTAMP range is checked 
  correctly (current time zone is honoured and both upper 
  and lower bounds of TIMESTAMP range are checked).
mysql-test/t/timezone.test:
  Added test which checks if TIMESTAMP range is checked 
  correctly (current time zone is honoured and both upper 
  and lower bounds of TIMESTAMP range are checked).
sql/field.cc:
  Check if datetime value is in TIMESTAMP range has moved to 
  my_gmt_sec() function.
sql/mysql_priv.h:
  Added more constants for checking if datetime is in allowed
  range for TIMESTAMP.
sql/time.cc:
  Check if datetime value is in TIMESTAMP range has moved to 
  my_gmt_sec() function. Fixed check of its return value
  to catch overflows in both directions and also overflows in 
  case of unsigned time_t.
2004-01-30 19:15:11 +03:00
unknown
e95a3e3ce8 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg2464


sql/sql_parse.cc:
  Auto merged
2004-01-30 15:13:54 +03:00
unknown
a96ffb2925 Fix for bugs #1885, #2464, #2539. Proper handling of default
values for TIMESTAMP columns. The solution is not perfect since
we just silently ignoring default value for first TIMESTAMP 
column and properly reflecting this fact in SHOW CREATE TABLE.
We can't give a warning or simply support standard syntax 
(niladic functions as legal value for default) for first field 
since it is 4.0 tree.


mysql-test/r/type_timestamp.result:
  Added test for bugs #1885, #2464, #2539
  (proper support of default values for TIMESTAMP columns)
mysql-test/t/type_timestamp.test:
  Added test for bugs #1885, #2464, #2539
  (proper support of default values for TIMESTAMP columns)
sql/field.cc:
  Enabled copying of defaults for TIMESTAMP fields when we are 
  creating table with CREATE TABLE x (SELECT ...)
sql/field.h:
  Set proper DEFAULT value for non-first TIMESTAMP column.
sql/sql_parse.cc:
  Allowed default values for TIMESTAMP column.
sql/sql_show.cc:
  Enabled printing of default values in SHOW CREATE TABLE and 
  SHOW COLUMNS for all TIMESTAMP columns except first one.
2004-01-30 15:13:19 +03:00
unknown
8ab97bb111 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-01-30 11:31:49 +01:00
unknown
f120273dd2 Fixed parsing of column names and foreign key constraints in Innobase to handle quoted identifiers and identifiers with space. (Bug #1725)
Fix optimizer tuning bug when first used key part was a constant. (Bug #1679)


innobase/dict/dict0dict.c:
  Fixed parsing of column names and foreign key constraints to handle quoted identifiers and identifiers with space. (Bug #1725)
mysql-test/r/innodb.result:
  Test of innodb internal parsing
mysql-test/t/innodb.test:
  Test of innodb internal parsing
sql/sql_class.cc:
  Safety fix for select into outfile and select into dumpfile. Before calling send_error() could cause end_io_cache() to be called several times.
sql/sql_class.h:
  Add path to dumpfile so that we can delete the generated file if something goes wrong.
sql/sql_select.cc:
  Fix optimizer tuning bug when first used key part was a constant.
  Previously all keys that had this key part first was regarded as equal, even if the query used more key parts for some of the keys.
  Now we use the range optimizer results to just limit the number of estimated rows if not all key parts where constants.
  (Bug #1679)
2004-01-30 10:46:30 +01:00
unknown
bbd2adf4ba Fix for BUG#2477 "Slave stop with error after master reboot if use HEAP tables":
when we open the HEAP table for the first time since server restart,
in hp_open(), we set a flag to propagate this info to the handler level
which then writes a DELETE FROM this_heap_table to the binlog.
It is not a perfect solution for the bug, because between the server start and 
the first open of the table, the slave still had old data in his table so
a SELECT on the slave may show wrong content. But if there is a --init-file
to populate the HEAP table on master as startup, then this is a safe fix
(I'll put a note about init-file in the HEAP section of the manual).


heap/hp_info.c:
  new info variable implicit_emptied
heap/hp_open.c:
  If this is the first open of the HEAP table, it means it is empty,
  so we mark it.
include/heap.h:
  new variables implicit_emptied
  (we need one in HEAPINFO for the hp_info() call).
sql/ha_heap.cc:
  report info to upper level
sql/handler.h:
  new info 'implicit_emptied' in the handler level; only HEAP uses it.
sql/sql_base.cc:
  When a HEAP table is opened for the first time, write a DELETE FROM to the binlog,
  for replication and mysqlbinlog|mysql.
  Monty: I added the
  entry->file->implicit_emptied= 0;
2004-01-30 00:05:34 +01:00
unknown
8746a25554 Fix for BUG#2527 "Multi-Table Delete - Not Replication use replicate-wild-do-table"
(as long as replicate-*-table rules were defined, multi-table DELETE was never
replicated by the slave).


sql/sql_parse.cc:
  For a multi-table DELETE, there are two lists of tables:
  - 'tables' contains the tables in the FROM. They have 'updating==0'.
  - 'thd->lex.auxilliary_table_list.first' contains the tables between the DELETE and the FROM. They have 'updating==1'.
  So the bug was that the slave only tests 'tables' and as all its elements have updating==0,
  tables_ok() always returns 0.
  So for a multi DELETE the slave now tests the 2nd list too.
  I started with the other tip of the sausage: I thought of changing multi DELETE to use
  only one list (given that 'updating' can be used to separate it in two when needed)
  (with one list we wouldn't need to change the slave code), but finally hit the unicity
  check in add_table_to_list() which started to return ER_NONUNIQ_TABLE (logical).
2004-01-29 19:22:29 +01:00
unknown
163dffb4d0 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-01-29 15:17:25 +01:00
unknown
b9073593d0 Mark that strings may change on index only reads (for BDB tables).
This fixed problem with index reads on character fields with BDB tables. (Bug #2509)


BitKeeper/etc/ignore:
  added man/*.1
mysql-test/r/bdb.result:
  New test
mysql-test/r/myisam.result:
  More tests
mysql-test/t/bdb.test:
  Test for idnex only read
mysql-test/t/myisam.test:
  More test to verify pushed bug fix
sql/ha_berkeley.h:
  Mark that strings may change on index only reads
sql/item_strfunc.cc:
  Cleanup
sql/table.cc:
  Allow index only reads on binary strings
2004-01-29 15:16:48 +01:00
unknown
f138cd1015 Fix for BUG#2542 "If slave ignores a query it may make the next LOAD DATA INFILE fail":
reset errors (in thd) before executing the event. Otherwise if an event is ignored
because of replicate-*-table rules (error ER_SLAVE_IGNORED_TABLE) this error code
may remain in thd->net and the next event may pick it. 


sql/log_event.cc:
  Reset errors (in thd) before executing the event. Otherwise if an event is ignored
  because of replicate-*-table rules (error ER_SLAVE_IGNORED_TABLE) this error code
  may remain in thd->net and the next event may pick it.
2004-01-28 15:26:01 +01:00
unknown
4db4ffef27 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2298


myisam/mi_search.c:
  Auto merged
2004-01-22 20:35:36 +04:00
unknown
76c7dac801 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2290/mysql-4.0
2004-01-22 20:28:17 +04:00
unknown
8b03b319f5 some ammendments (comments and code style)
mysql-test/t/func_str.test:
  add skipped new line
sql/item_strfunc.cc:
  rewrote some comments for Item_func_elt
2004-01-22 20:20:43 +04:00
unknown
79f6e16d5e a proper fix for the bug #2298 Trailing whitespace inconsistently handled in WHERE clause.
<monty> ramil, in MySQL/MyISAM we should only strip end space, not 'space-like' characters.
<monty> This is according to SQL;  When doing a comparision end space and only end space are ignored.



myisam/mi_key.c:
  a proper fix for the bug #2298 Trailing whitespace inconsistently handled in WHERE clause.
myisam/mi_search.c:
  a proper fix for the bug #2298 Trailing whitespace inconsistently handled in WHERE clause.
mysql-test/r/select.result:
  test case for the bug #2298 Trailing whitespace inconsistently handled in WHERE clause.
mysql-test/t/select.test:
  test case for the bug #2298 Trailing whitespace inconsistently handled in WHERE clause.
sql/sql_string.cc:
  a proper fix for the bug #2298 Trailing whitespace inconsistently handled in WHERE clause.
2004-01-22 18:05:47 +04:00
unknown
24ca1e1edb added test for bug #2290 "output truncated with ELT when using DISTINCT"
sql/item_strfunc.cc:
  fixed bug #2290 "output truncated with ELT when using DISTINCT"
2004-01-21 02:18:51 +04:00
unknown
c9f4333897 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-01-20 15:42:44 -05:00
unknown
c2d849f8bd Fix for BUG#2452 "Empty LOAD DATA INFILE failes with the master in 3.23.x":
do not write the Execute_load_log_event if there was no Create_file_log_event
(empty file).
2004-01-20 15:41:22 -05:00
unknown
fe9647968d Proper fix for bug with BLOB in MIN/MAX
sql/key.cc:
  Change constant to define
2004-01-19 23:44:39 +01:00
unknown
0153488a02 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-01-19 23:10:18 +01:00
unknown
45591dec32 Fixed bug in IN() optimization 2004-01-19 23:10:01 +01:00
unknown
36d82d189a BUG#2428 "--old-rpl-compat is broken":
I remove the --old-rpl-compat which produces broken binlogs readable
neither by 4.0 nor by 3.23.
This option is a leftover of the early replication of 4.0.0, when
it was still partly compatible with 3.23.
I explained this to the user in the bug report. 


sql/mysqld.cc:
  removing --old-rpl-compat
sql/sql_load.cc:
  removing --old-rpl-compat
sql/sql_repl.h:
  removing --old-rpl-compat
2004-01-18 17:51:20 +01:00
unknown
d894ca49bd Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-01-16 15:26:58 +02:00
unknown
3640f7e11b Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-01-13 12:31:51 +01:00
unknown
febc79bb5d BUG#2304 - HANDLER and tables in non-current db 2004-01-13 12:31:25 +01:00
unknown
7e50f03271 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-01-12 16:28:12 +02:00
unknown
e2ab8558e8 opt_sum.cc:
A fix for a bug #3189, pertaining to crashing MySQL server when a query with MIN / MAX on the BLOB column is to be optimised


sql/opt_sum.cc:
  A fix for a bug #3189, pertaining to crashing MySQL server when a query with MIN / MAX on the BLOB column is to be optimised
2004-01-12 16:25:13 +02:00
unknown
9d8bf6980a A fix (bug #2335: Inconsistancy with handling of Years and NOW() function).
The test might fail if one runs it at 23:59:59 Dec 31


mysql-test/r/type_year.result:
  a fix (bug #2335: Inconsistancy with handling of Years and NOW() function)
mysql-test/t/type_year.test:
  a fix (bug #2335: Inconsistancy with handling of Years and NOW() function)
sql/field.h:
  a fix (bug #2335: Inconsistancy with handling of Years and NOW() function)
2004-01-11 14:12:46 +04:00
unknown
3f0d245178 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2231
2004-01-09 11:15:14 +04:00
unknown
aafca9f08d An improvement of the fix for the bug #2231: string column,
INDEX+LIKE, don't take the ESCAPE character. (ver. 2)
2004-01-08 12:24:36 +04:00
unknown
a5edde8823 Completion of fix for BUG#2121 "Inadequate message "check permissions on master.info"":
I had not corrected these languages.
As it has been discussed with the docs team, the new messages will be merged
to 4.1, and then will be translated in 4.1 (they will remain in English
in 4.0).


sql/share/danish/errmsg.txt:
  better error message
sql/share/dutch/errmsg.txt:
  better error message
sql/share/german/errmsg.txt:
  better error message
sql/share/italian/errmsg.txt:
  better error message
sql/share/portuguese/errmsg.txt:
  better error message
sql/share/russian/errmsg.txt:
  better error message
sql/share/spanish/errmsg.txt:
  better error message
sql/share/swedish/errmsg.txt:
  better error message
sql/share/ukrainian/errmsg.txt:
  better error message
2004-01-06 14:01:49 +01:00
unknown
824111e6c4 Fix for the bug #2231: string column, INDEX+LIKE, don't take the ESCAPE character.
(acctually i don't like the fix, any suggestions?)
2003-12-30 19:23:38 +04:00
unknown
b703338d76 Merge
sql/set_var.cc:
  Auto merged
sql/mysqld.cc:
  SCCS merged
2003-12-30 13:16:49 +02:00
unknown
376fb08072 Some small portability fixes.
Added support for lower_case_table_names=2, which is to be used on case insensitive file systems.
This tells MySQL to preserve the used case of filenames and database names to make it esier to move files between cases sensitive can case insensitive file systems (like Windows and Linux)


client/mysqltest.c:
  Indentation cleanup
include/myisam.h:
  Made some pointers 'const'
mysql-test/mysql-test-run.sh:
  Portability fix for OSX
sql/filesort.cc:
  Safety fix (not needed for current code but needed for 5.0)
sql/ha_berkeley.cc:
  More debugging
  Changed 'create' to return error number
sql/ha_berkeley.h:
  Added HA_FILE_BASED
sql/ha_innodb.cc:
  Added missing DBUG_RETURN
sql/ha_isam.cc:
  Changed create to return error number
sql/ha_isam.h:
  Added HA_FILE_BASED
sql/ha_isammrg.h:
  Added HA_FILE_BASED
sql/ha_myisam.cc:
  Changed create to return error number
sql/ha_myisam.h:
  Added HA_FILE_BASED
sql/ha_myisammrg.cc:
  Changed create to return error number
sql/ha_myisammrg.h:
  Added HA_FILE_BASED
sql/handler.cc:
  Ensure that table engines gets table names in lower case even if we are using lower_case_table_names
  Removed test for DB_TYPE_INNODB by ensuring that create method returns error number.
sql/handler.h:
  Added HA_FILE_BASED
  Made some struct entries 'const'
  Added 'alias' for create to be able to create tables in mixed case on case insensitive file systems
sql/mysql_priv.h:
  Support for lower_case_table_names=2
sql/mysqld.cc:
  Support for lower_case_table_names=2
  Moved test of case insenstive file system after all mutex are created
sql/set_var.cc:
  Support for lower_case_table_names=2
sql/sql_class.h:
  Indentation change
sql/sql_db.cc:
  Support for lower_case_table_names=2
sql/sql_insert.cc:
  Indentation change
sql/sql_parse.cc:
  Support for lower_case_table_names=2
sql/sql_rename.cc:
  Support for lower_case_table_names=2
  Added missing 'unpack_filename' to RENAME which may fix a bug in RENAME TABLE on windows
sql/sql_show.cc:
  If lower_case_table_name=2 is given, show original case in SHOW CREATE TABLE
sql/sql_table.cc:
  Support for lower_case_table_names=2 for DROP TABLE, RENAME TABLE, ALTER TABLE and CREATE TABLE
2003-12-30 13:14:21 +02:00
unknown
76a36815df typos fixed 2003-12-22 13:03:23 +01:00
unknown
1f9763c169 Removed some test that was not relevant for MySQL (and which caused problems in MySQL 4.1) 2003-12-21 16:32:32 +02:00
unknown
c9691ab7cc Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2086/mysql-4.0
2003-12-18 18:08:39 -04:00
unknown
115c65f4d7 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2086/mysql-4.0


sql/share/czech/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
2003-12-18 18:07:39 -04:00
unknown
a7d8af9b08 Fixed that lower_case_table_names is set to 1 for case insensitive file systems. 2003-12-18 16:50:01 +02:00
unknown
f562d0c2c3 Removed compiler warning
Fixed not updated test from last changeset


mysql-test/r/auto_increment.result:
  Updated results
sql/mysqld.cc:
  Cleaned up pid file handling (to remove compiler warning)
2003-12-18 15:24:21 +02:00
unknown
15484ba20c Simple cleanups
mysql-test/t/auto_increment.test:
  Fixed wrong comment
sql/opt_range.cc:
  Removed not used variable
sql/sql_select.cc:
  Removed indentation level (This will also make merges into 4.1 easier)
2003-12-18 14:40:19 +02:00
unknown
6b1e06e620 Code cleanup
client/mysql.cc:
  Don't call mysql_close() on not initialized object
sql/field.cc:
  code cleanup
2003-12-18 01:13:52 +02:00
unknown
fd3235dcd3 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/my/mysql-4.0
2003-12-18 01:08:10 +02:00
unknown
fb36199281 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-12-17 23:29:42 +01:00
unknown
f8d7b467b8 Fix for BUG#2145 "mysqld becomes unreliable if unable to create a relay log when replic starts":
release the mutex before exiting the function, or it will be kept forever
(=> START SLAVE, STOP SLAVE, etc will hang).


sql/slave.cc:
  release the mutex before exiting the function, or it will be kept forever
  (=> START SLAVE, STOP SLAVE, etc will hang).
2003-12-17 23:29:11 +01:00
unknown
d6be93aa27 added error message for receiving variable with wrong GLOBAL|LOCAL type
(bug #2086)


include/mysqld_error.h:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
mysql-test/r/variables.result:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
mysql-test/t/variables.test:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/set_var.cc:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/czech/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/danish/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/dutch/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/english/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/estonian/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/french/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/german/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/greek/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/hungarian/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/italian/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/japanese/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/korean/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/norwegian-ny/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/norwegian/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/polish/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/portuguese/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/romanian/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/russian/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/slovak/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/spanish/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/swedish/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
sql/share/ukrainian/errmsg.txt:
  added error message for receiving variable with wrong GLOBAL|LOCAL type
2003-12-17 16:37:47 -04:00
unknown
6f8fbe54ad Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2023/mysql-4.0


sql/field.cc:
  Auto merged
2003-12-17 13:15:57 -04:00
unknown
b8286832fb fixed small error in types in sql/field.cc
(char * -> const char*)


sql/field.cc:
  fixed small error in types (char * -> const char*)
2003-12-17 13:15:01 -04:00
unknown
9f03e48321 Fixed typo. Affected INSERT DELAYED ... SELECT commands 2003-12-17 18:12:59 +01:00
unknown
a8e8a24990 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0


mysql-test/r/rpl_rotate_logs.result:
  Auto merged
2003-12-16 21:53:18 +01:00