Commit 25678df9 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents c8a30eb0 dc62c0cb

mysql-test/t/ndb_autodiscover.test

+7 −7
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ insert into t4 values (1, "Automatic"); 
select * from t4;



# Remove the table from NDB

system exec $NDB_TOOLS_DIR/ndb_drop_table -d test t4 > /dev/null ; 

system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t4 > /dev/null ; 



#

# Test that correct error is returned
@@ -230,7 +230,7 @@ select * from t4; 
flush tables;



# Remove the table from NDB

system exec $NDB_TOOLS_DIR/ndb_drop_table -d test t4 > /dev/null ; 

system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t4 > /dev/null ; 



SHOW TABLES;
@@ -264,8 +264,8 @@ insert into t8 values (8, "myisam table 8"); 
insert into t9 values (9);



# Remove t3, t5 from NDB

system exec $NDB_TOOLS_DIR/ndb_drop_table -d test t3 > /dev/null  ;

system exec $NDB_TOOLS_DIR/ndb_drop_table -d test t5 > /dev/null  ;

system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t3 > /dev/null  ;

system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t5 > /dev/null  ;

# Remove t6, t7 from disk

system rm var/master-data/test/t6.frm > /dev/null ; 

system rm var/master-data/test/t7.frm > /dev/null ;
@@ -306,8 +306,8 @@ insert into t8 values (8, "myisam table 8"); 
insert into t9 values (9);



# Remove t3, t5 from NDB

system exec $NDB_TOOLS_DIR/ndb_drop_table -d test t3 > /dev/null  ;

system exec $NDB_TOOLS_DIR/ndb_drop_table -d test t5 > /dev/null  ;

system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t3 > /dev/null  ;

system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t5 > /dev/null  ;

# Remove t6, t7 from disk

system rm var/master-data/test/t6.frm > /dev/null ; 

system rm var/master-data/test/t7.frm > /dev/null ;
@@ -479,4 +479,4 @@ create table t10 ( 


insert into t10 values (1, 'kalle');



--exec $NDB_TOOLS_DIR/ndb_drop_table -d test `$NDB_TOOLS_DIR/ndb_show_tables | grep BLOB` > /dev/null 2>&1 || true
 
--exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test `$NDB_TOOLS_DIR/ndb_show_tables --no-defaults | grep BLOB` > /dev/null 2>&1 || true

strings/uca-dump.c

+13 −4
Original line number Diff line number Diff line
@@ -218,7 +218,6 @@ int main(int ac, char **av) 
      */

      if (ndefs == MY_UCA_NCHARS)

      {

        printf("/* Don't dump w=%d pg=%3X: ndefs=%d */\n",w, page, ndefs);

        continue;

      }

      switch (maxnum)
@@ -263,7 +262,17 @@ int main(int ac, char **av) 
        

        for (i=0; i < maxnum; i++)

        {

          printf("0x%04X",(int)weight[i]);

          /* 

            Invert weights for secondary level to

            sort upper case letters before their

            lower case counter part.

          */

          int tmp= weight[i];

          if (w == 2 && tmp)

            tmp= (int)(0x100 - weight[i]);

          

          

          printf("0x%04X", tmp);

          if ((offs+1 != MY_UCA_NCHARS) || (i+1!=maxnum))

            printf(",");

          nchars++;
@@ -281,7 +290,7 @@ int main(int ac, char **av) 
      printf("};\n\n");

    }



    printf("uchar ucal%s[%d]={\n", pname[w], MY_UCA_NPAGES);

    printf("uchar uca_length%s[%d]={\n", pname[w], MY_UCA_NPAGES);

    for (page=0; page < MY_UCA_NPAGES; page++)

    {

      printf("%d%s%s",pagemaxlen[page],page<MY_UCA_NPAGES-1?",":"",(page+1) % 16 ? "":"\n");
@@ -289,7 +298,7 @@ int main(int ac, char **av) 
    printf("};\n");





    printf("uint16 *ucaw%s[%d]={\n", pname[w], MY_UCA_NPAGES);

    printf("uint16 *uca_weight%s[%d]={\n", pname[w], MY_UCA_NPAGES);

    for (page=0; page < MY_UCA_NPAGES; page++)

    {

      const char *comma= page < MY_UCA_NPAGES-1 ? "," : "";