Commit graph

170 commits

Author SHA1 Message Date
heikki@hundin.mysql.fi
be6e811f51 ha_innodb.cc:
Fix bug intoduced in 4.0.4 in REPLACE and AUTO_INCREMENT: if replace did an update, then auto-inc counter was left 1 too low
2002-11-15 18:46:23 +02:00
monty@mashka.mysql.fi
7a70332836 Portability fix when using -DBIG_TABLES 2002-11-14 12:21:36 +02:00
heikki@hundin.mysql.fi
648b50660b ha_innodb.cc:
Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE
2002-11-09 18:34:52 +02:00
monty@butch.
890b39bb68 merge 2002-11-07 12:49:01 +02:00
monty@butch.
a2bdf9265f Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes. 2002-11-07 03:54:00 +02:00
heikki@hundin.mysql.fi
db1693101b Many files:
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
2002-11-06 00:41:27 +02:00
bell@sanja.is.com.ua
4307363079 new innodb query cache behaviour (recommit because of problem with 4.1 repository pushing)
fixed bug in quqry cache dbd transaction processing
2002-11-03 10:15:14 +02:00
heikki@hundin.mysql.fi
23657e8c33 srv0start.h, srv0start.c, ha_innodb.cc:
Add check that sizeof(trx_t) is the same in ha_inndob.cc and InnoDB compilation modules
2002-10-31 12:03:34 +02:00
heikki@hundin.mysql.fi
f51bc42cf5 ha_innodb.cc:
Fix bug: mysqld-debug-max failed standard test because a safe mutex size was seen as 24 bytes in the body of ha_innodb.cc, but 64 bytes in read0read.c
2002-10-31 11:32:42 +02:00
heikki@hundin.mysql.fi
ab12784d5f ha_innodb.cc:
Fix bug in MySQL-3.23 ORDER BY from a table with no PRIMARY KEY and where the user had added UNIQUE indexes with CREATE INDEX
2002-10-31 00:26:04 +02:00
heikki@hundin.mysql.fi
9153d88c6b Many files:
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
mysqld.cc:
  Change MySQL default isolation level to REPEATABLE READ; note that InnoDB has always had that default, and BDB and MyISAM always run at SERIALIZABLE level anyway
2002-10-29 23:16:46 +02:00
bar@bar.mysql.r18.ru
95aef91521 BINARY charset is now used instead of binary_flag 2002-10-25 13:58:32 +05:00
monty@hundin.mysql.fi
3476dc8f9e Merge hundin.mysql.fi:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.1 2002-10-16 19:31:22 +03:00
monty@hundin.mysql.fi
fbf6ab4465 merge with 4.0.5 2002-10-16 19:30:24 +03:00
monty@hundin.mysql.fi
a54df74af0 Fixes after last merge.
Ignore changed keyblocks when on does DELETE FROM table_name;
2002-10-16 19:05:10 +03:00
monty@hundin.mysql.fi
67d3cd643b Merge with 3.23.54 2002-10-16 13:11:25 +03:00
monty@narttu.mysql.fi
3c7f6a9835 merge 2002-10-14 12:07:16 +03:00
bar@bar.mysql.r18.ru
50c391538a my_sortcmp -> my_strnncoll 2002-10-09 16:33:35 +05:00
monty@narttu.mysql.fi
da2abaf887 Portability fixes to be able to compile MySQL with VC++ 2002-10-08 22:28:24 +03:00
monty@mashka.mysql.fi
0f39457613 Merge with 4.0.4 2002-10-02 17:55:12 +03:00
monty@mashka.mysql.fi
d69250a969 Fixes and code cleanups after merge with 4.0.3
Warning handling and initial prepared statement handling (last not complete yet)
Changed a lot of functions that returned 0/1 to my_bool type.
GRANT handling now uses read/write locks instead of mutex
Change basic net functions to use THD instead of NET
(needed for 4.1 protocol)
Use my_sprintf instead of sprintf() + strlen()
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()

Note that the following test fails (will be fixed ASAP):
sub_select, union, rpl_rotate_logs and rpl_mystery22
2002-10-02 13:33:08 +03:00
heikki@hundin.mysql.fi
64c3498f82 ha_innodb.cc:
Fix an assertion in btr0pcur.c line 203 when an UPDATE is done inside LOCK TABLES
2002-09-26 14:50:25 +03:00
heikki@hundin.mysql.fi
cfff5b5025 ha_innodb.h, ha_innodb.cc:
Remove the flag HA_NOT_READ_PREFIX_LAST because ORDER BY orders wrong then; also remove the diagnostic print to avoid cluttering the error log
2002-09-25 20:35:12 +03:00
heikki@hundin.mysql.fi
b46d2ca192 ha_innodb.cc, ha_innodb.h:
Move to the right place the flag which bans use of HA_READ_PREFIX_LAST; add diagnostics and remove the assertion on line 2180 of ha_innodb.cc
2002-09-25 19:02:46 +03:00
monty@mashka.mysql.fi
efaaf0b4b8 Updated VC++ project files for 4.0.4
Only write short usage if one starts mysqldump without any options
Added query cache on windows
Added error message if one can't read privilege tables
2002-09-24 17:11:59 +03:00
heikki@hundin.mysql.fi
62b2b08717 row0ins.c, ha_innodb.cc:
Table hash key len in query cache also includes null char at end
2002-09-22 01:38:48 +03:00
heikki@hundin.mysql.fi
1f64f8d07d ha_innodb.cc:
Add return statement
2002-09-21 03:39:27 +03:00
heikki@hundin.mysql.fi
ef8b2fa85f ha_innodb.cc:
Fix typos in last push
  Fix typo
2002-09-21 03:15:54 +03:00
heikki@hundin.mysql.fi
cff9c1df1e ha_innodb.cc, ha_innodb.h:
Fix assertion when a temporary table is created and used inside LOCK TABLES
2002-09-20 23:26:21 +03:00
heikki@hundin.mysql.fi
9e493e91e9 Many files:
Modifications for query cache + trxs, fix of q.c.+ foreign keys
os0file.c:
  Use unbuffered i/o in Windows
2002-09-20 05:11:08 +03:00
monty@mashka.mysql.fi
c7b6854f70 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-09-16 15:56:55 +03:00
heikki@hundin.mysql.fi
34fe09f08f ha_innodb.h, ha_innodb.cc:
Reverted the change which allowed use of HA_READ_PREFIX_LAST in InnoDB
2002-09-15 02:23:53 +03:00
heikki@hundin.mysql.fi
65297c9c51 ha_innodb.cc:
Add some comments
ha_innodb.h:
  Remove the flag HA_NOT_READ_PREFIX_LAST from ha_innodb.h: InnoDB has supported this from the start, but not tested yet
2002-09-14 03:12:00 +03:00
monty@mashka.mysql.fi
8b7521eb7f Merge with 3.23.53 2002-09-11 14:49:38 +03:00
monty@mashka.mysql.fi
f3a186c905 Portability fixes.
Improve mysql-test to be more robust.
Fix that GRANT doesn't delete SSL options
Change innobase_flush_log_at_trx_commit to uint.
Don't rotate logs if we read a rotate log entry from the master.
2002-09-11 06:40:08 +03:00
monty@rescue.
b0e599629c Fixed typo in Heikkis last push. 2002-09-05 17:10:18 +03:00
heikki@work.mysql.com
a16f3360aa btr0btr.c Add more documentation about B-tree latching
ha_innodb.cc	Remove gaps in auto-inc in multi-row inserts, more space for foreign key listings in SHOW TABLE STATUS, move resetting of active_trx to amore logical place
dict0dict.h	Remove gaps from auto-inc sequence if errors in multi-row insert
dict0dict.c	Remove gaps from auto-inc sequence if errors in multi-row insert
2002-09-04 18:53:48 +02:00
heikki@work.mysql.com
516cc0bd61 ha_innodb.cc Test a new clone 2002-09-04 18:00:58 +02:00
serg@serg.mysql.com
b962da9aab merged 2002-08-31 23:38:10 +00:00
monty@narttu.mysql.fi
7134ffec21 Merge with 4.0.3
Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)
2002-08-30 12:40:40 +03:00
serg@serg.mysql.com
99a954f405 InnoDB support for HANDLER 2002-08-21 20:55:34 +00:00
monty@hundin.mysql.fi
c531b43272 merge with 3.23.52 2002-08-13 02:33:25 +03:00
monty@hundin.mysql.fi
ae1ec6e16a Changed SQL variable delay_key_write to an enum
able delay_key_write as default (as it was in 4.0.2)
2002-08-13 02:18:39 +03:00
monty@hundin.mysql.fi
454339b29c Fixes after last merge 2002-08-12 07:02:08 +03:00
monty@hundin.mysql.fi
3ef9d44edc merge with 3.23.52 2002-08-12 04:04:43 +03:00
monty@hundin.mysql.fi
c99c1fd384 Changed IF(expr, column, NULL) to take type from column
Fixed some windows portability problems and removed some compiler warnings
 Cleaned up QUOTE() function and fixed bug in \0 and \Z handling.
2002-08-12 03:33:46 +03:00
monty@hundin.mysql.fi
77296b3f67 Fix after merge
Updated WEEK() and DATE information in the manual.
2002-08-08 16:41:04 +03:00
monty@hundin.mysql.fi
087261482a merge with 3.23.52 2002-08-08 15:24:47 +03:00
monty@mashka.mysql.fi
2c4fa340cc Lots of code fixes to the replication code (especially the binary logging and index log file handling)
Fixed bugs in my last changeset that made MySQL hard to compile.
Added mutex around some data that could cause table cache corruptions when using OPTIMIZE TABLE / REPAIR TABLE or automatic repair of MyISAM tables.
Added mutex around some data in the slave start/stop code that could cause THD linked list corruptions
Extended my_chsize() to allow one to specify a filler character.
Extend vio_blocking to return the old state (This made some usage of this function much simpler)
Added testing for some functions that they caller have got the required mutexes before calling the function.
Use setrlimit() to ensure that we can write core file if one specifies --core-file.
Added --slave-compressed-protocol
Made 2 the minimum length for ft_min_word_len
Added variables foreign_key_checks & unique_checks.
Less logging from replication code (if not started with --log-warnings)
Changed that SHOW INNODB STATUS requre the SUPER privilege
More DBUG statements and a lot of new code comments
2002-08-08 03:12:02 +03:00
monty@mashka.mysql.fi
bc035c71f1 Merge with 3.23.51
Fixed wrong usage of sprintf() in ha_innodb.cc
2002-07-25 22:46:28 +03:00