database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge with 4.0.20

Browse Source 
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/eval/eval0eval.c:
  Auto merged
innobase/ibuf/ibuf0ibuf.c:
  Auto merged
innobase/include/ut0mem.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/row/row0umod.c:
  Auto merged
innobase/row/row0upd.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/ut/ut0dbg.c:
  Auto merged
innobase/ut/ut0mem.c:
  Auto merged
myisam/mi_dynrec.c:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
innobase/os/os0file.c:
  Merge with 4.0.20
  Ensure that we call F_UNLCK for files on which we call F_WRLCK.
  This is to ensure that this code will be portable accross most platforms.
myisam/ft_boolean_search.c:
  Merge with 4.0.20 (keep original file)
myisam/ft_parser.c:
  Merge with 4.0.20 (keep original file)
myisam/ftdefs.h:
  Merge with 4.0.20 (keep original file)
This commit is contained in:
unknown
2004-05-17 01:52:13 +03:00
parent 8ef62cc1ef fa163d0ba5
commit a495f76c8e
40 changed files with 287 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
innobase/row/row0mysql.c
View File

@ -714,7 +714,7 @@ run_again:
trx_start_if_not_started(trx);
err = lock_table(0, prebuilt->table, prebuilt->select_lock_type, thr);
err = lock_table(0, prebuilt->table, LOCK_AUTO_INC, thr);
trx->error_state = err;
@ -2526,10 +2526,11 @@ row_drop_database_for_mysql(
dict_table_t* table;
char* table_name;
int err = DB_SUCCESS;
ulint namelen = strlen(name);
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
ut_a(name != NULL);
ut_a(name[strlen(name) - 1] == '/');
ut_a(name[namelen - 1] == '/');
trx->op_info = (char *) "dropping database";
@ -2538,7 +2539,7 @@ loop:
row_mysql_lock_data_dictionary(trx);
while ((table_name = dict_get_first_table_name_in_db(name))) {
ut_a(strcmp(table_name, name) == 0);
ut_a(memcmp(table_name, name, namelen) == 0);
table = dict_table_get_low(table_name);