Commit 35bfad1e authored by unknown's avatar unknown
Browse files

4.1 -> 5.0 merge 


client/mysql.cc:
  Auto merged
client/sql_string.h:
  Auto merged
configure.in:
  Auto merged
myisam/mi_create.c:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
sql/table.cc:
  Auto merged
parents 316577d6 3c2bdb59

client/mysql.cc

+1 −1
Original line number Diff line number Diff line
@@ -1084,7 +1084,7 @@ static int read_and_execute(bool interactive) 
      (We want to allow help, print and clear anywhere at line start

    */

    if ((named_cmds || glob_buffer.is_empty())

	&& !in_string && (com=find_command(line,0)))

	&& !ml_comment && !in_string && (com=find_command(line,0)))

    {

      if ((*com->func)(&glob_buffer,line) > 0)

	break;

client/mysqldump.c

+13 −10
Original line number Diff line number Diff line
@@ -2239,15 +2239,16 @@ static void dump_table(char *table, char *db) 
      goto err;

    }



    if (opt_disable_keys)

    if (opt_lock)

    {

      fprintf(md_result_file, "\n/*!40000 ALTER TABLE %s DISABLE KEYS */;\n",

              opt_quoted_table);

      fprintf(md_result_file,"LOCK TABLES %s WRITE;\n", opt_quoted_table);

      check_io(md_result_file);

    }

    if (opt_lock)

    /* Moved disable keys to after lock per bug 15977 */

    if (opt_disable_keys)

    {

      fprintf(md_result_file,"LOCK TABLES %s WRITE;\n", opt_quoted_table);

      fprintf(md_result_file, "/*!40000 ALTER TABLE %s DISABLE KEYS */;\n",

	      opt_quoted_table);

      check_io(md_result_file);

    }
@@ -2511,17 +2512,19 @@ static void dump_table(char *table, char *db) 
      error= EX_CONSCHECK;

      goto err;

    }

    if (opt_lock)

    {

      fputs("UNLOCK TABLES;\n", md_result_file);

      check_io(md_result_file);

    }



    /* Moved enable keys to before unlock per bug 15977 */

    if (opt_disable_keys)

    {

      fprintf(md_result_file,"/*!40000 ALTER TABLE %s ENABLE KEYS */;\n",

              opt_quoted_table);

      check_io(md_result_file);

    }

    if (opt_lock)

    {

      fputs("UNLOCK TABLES;\n", md_result_file);

      check_io(md_result_file);

    }

    if (opt_autocommit)

    {

      fprintf(md_result_file, "commit;\n");

mysql-test/include/have_case_sensitive_file_system.inc

0 → 100644
+4 −0
Original line number Diff line number Diff line 
--require r/case_sensitive_file_system.require

--disable_query_log

show variables like "lower_case_file_system";

--enable_query_log

mysql-test/r/case_sensitive_file_system.require

0 → 100644
+2 −0
Original line number Diff line number Diff line 
Variable_name	Value

lower_case_file_system	OFF

mysql-test/r/date_formats.result

+6 −0
Original line number Diff line number Diff line
@@ -564,3 +564,9 @@ TIME_FORMAT("24:00:00", '%l %p') 
SELECT TIME_FORMAT("25:00:00", '%l %p');

TIME_FORMAT("25:00:00", '%l %p')

1 AM

SELECT DATE_FORMAT('%Y-%m-%d %H:%i:%s', 1151414896);

DATE_FORMAT('%Y-%m-%d %H:%i:%s', 1151414896)

NULL

Warnings:

Warning	1292	Truncated incorrect datetime value: '%Y-%m-%d %H:%i:%s'

"End of 4.1 tests"